Skip to content

Commit

Permalink
[~+] Finished Ladders. Loot tables, recipes, recipe advancements, blo…
Browse files Browse the repository at this point in the history
…ckstates, etc.
  • Loading branch information
crispytwig committed Feb 7, 2024
1 parent e12a024 commit 3da555d
Show file tree
Hide file tree
Showing 202 changed files with 3,186 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,17 @@ private static void registerBlockRenderLayers() {
FoundationBlocks.ROPE,
FoundationBlocks.BRAZIER,
FoundationBlocks.URN,
FoundationBlocks.OAK_LADDER
FoundationBlocks.OAK_LADDER,
FoundationBlocks.SPRUCE_LADDER,
FoundationBlocks.BIRCH_LADDER,
FoundationBlocks.JUNGLE_LADDER,
FoundationBlocks.ACACIA_LADDER,
FoundationBlocks.DARK_OAK_LADDER,
FoundationBlocks.CRIMSON_LADDER,
FoundationBlocks.WARPED_LADDER,
FoundationBlocks.MANGROVE_LADDER,
FoundationBlocks.BAMBOO_LADDER,
FoundationBlocks.CHERRY_LADDER
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

public class FoundationBlockStateProperties {
// public static final EnumProperty<WoodStyle> STYLE = EnumProperty.create("style", WoodStyle.class);
public static final IntegerProperty STYLE = IntegerProperty.create("style", 1, 11);
public static final IntegerProperty STYLE = IntegerProperty.create("style", 1, 10);
public static final EnumProperty<FrameStickDirection> FRAME_CENTER = EnumProperty.create("center", FrameStickDirection.class);
public static final EnumProperty<ColumnType> COLUMN_TYPE = EnumProperty.create("type", ColumnType.class);
public static final EnumProperty<TallDoorHalf> HALVES = EnumProperty.create("type", TallDoorHalf.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ public enum WoodStyle implements StringRepresentable {
ACACIA("acacia"),
DARK_OAK("dark_oak"),
MANGROVE("mangrove"),
BAMBOO("bamboo"),
CHERRY("cherry"),
CRIMSON("crimson"),
WARPED("warped");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ public void appendHoverText(ItemStack stack, Level level, List<Component> toolti
tooltip.add(Component.literal("[").withStyle(ChatFormatting.DARK_GRAY).append(Component.translatable("key.keyboard.left.shift").withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC)).append(Component.literal("]").withStyle(ChatFormatting.DARK_GRAY)));
}

else if (stack.is(FoundationTags.FoundationItemTags.LADDERS)) {
if (Screen.hasShiftDown()) {
tooltip.add(Component.translatable("description.foundation.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.foundation.ladder1").withStyle(ChatFormatting.GRAY)));
tooltip.add(Component.translatable("description.foundation.ladder2").withStyle(ChatFormatting.GRAY));
} else
tooltip.add(Component.literal("[").withStyle(ChatFormatting.DARK_GRAY).append(Component.translatable("key.keyboard.left.shift").withStyle(ChatFormatting.GRAY, ChatFormatting.ITALIC)).append(Component.literal("]").withStyle(ChatFormatting.DARK_GRAY)));
}

else if (stack.is(FoundationTags.FoundationItemTags.COLUMNS)) {
if (Screen.hasShiftDown()) {
tooltip.add(Component.translatable("description.foundation.pencil").withStyle(ChatFormatting.BLUE).append(Component.translatable("description.foundation.column1").withStyle(ChatFormatting.GRAY)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
public class FoundationBlocks {

public static final Block OAK_LADDER = register("oak_ladder", new FoundationLadderBlock(1, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block SPRUCE_LADDER = register("spruce_ladder", new FoundationLadderBlock(2, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block BIRCH_LADDER = register("birch_ladder", new FoundationLadderBlock(3, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block JUNGLE_LADDER = register("jungle_ladder", new FoundationLadderBlock(4, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block ACACIA_LADDER = register("acacia_ladder", new FoundationLadderBlock(5, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block DARK_OAK_LADDER = register("dark_oak_ladder", new FoundationLadderBlock(6, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block CRIMSON_LADDER = register("crimson_ladder", new FoundationLadderBlock(7, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block WARPED_LADDER = register("warped_ladder", new FoundationLadderBlock(8, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block MANGROVE_LADDER = register("mangrove_ladder", new FoundationLadderBlock(9, BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block BAMBOO_LADDER = register("bamboo_ladder", new LadderBlock(BlockBehaviour.Properties.copy(Blocks.LADDER)));
public static final Block CHERRY_LADDER = register("cherry_ladder", new FoundationLadderBlock(10, BlockBehaviour.Properties.copy(Blocks.LADDER)));


// region LAYERS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ public class FoundationCreativeModeTab {
output.accept(HAMMER);

output.accept(OAK_LADDER);
output.accept(SPRUCE_LADDER);
output.accept(BIRCH_LADDER);
output.accept(JUNGLE_LADDER);
output.accept(ACACIA_LADDER);
output.accept(DARK_OAK_LADDER);
output.accept(CRIMSON_LADDER);
output.accept(WARPED_LADDER);
output.accept(MANGROVE_LADDER);
output.accept(BAMBOO_LADDER);
output.accept(CHERRY_LADDER);

output.accept(POLISHED_STONE);
output.accept(POLISHED_STONE_STAIRS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,17 @@ public class FoundationItems {
// endregion


public static final Item OAK_LADDER = register("oak_ladder", new BlockItem(FoundationBlocks.OAK_LADDER, new FabricItemSettings()));
public static final Item OAK_LADDER = register("oak_ladder", new DescriptionBlockItem(FoundationBlocks.OAK_LADDER, new FabricItemSettings()));
public static final Item SPRUCE_LADDER = register("spruce_ladder", new DescriptionBlockItem(FoundationBlocks.SPRUCE_LADDER, new FabricItemSettings()));
public static final Item BIRCH_LADDER = register("birch_ladder", new DescriptionBlockItem(FoundationBlocks.BIRCH_LADDER, new FabricItemSettings()));
public static final Item JUNGLE_LADDER = register("jungle_ladder", new DescriptionBlockItem(FoundationBlocks.JUNGLE_LADDER, new FabricItemSettings()));
public static final Item ACACIA_LADDER = register("acacia_ladder", new DescriptionBlockItem(FoundationBlocks.ACACIA_LADDER, new FabricItemSettings()));
public static final Item DARK_OAK_LADDER = register("dark_oak_ladder", new DescriptionBlockItem(FoundationBlocks.DARK_OAK_LADDER, new FabricItemSettings()));
public static final Item CRIMSON_LADDER = register("crimson_ladder", new DescriptionBlockItem(FoundationBlocks.CRIMSON_LADDER, new FabricItemSettings()));
public static final Item WARPED_LADDER = register("warped_ladder", new DescriptionBlockItem(FoundationBlocks.WARPED_LADDER, new FabricItemSettings()));
public static final Item MANGROVE_LADDER = register("mangrove_ladder", new DescriptionBlockItem(FoundationBlocks.MANGROVE_LADDER, new FabricItemSettings()));
public static final Item BAMBOO_LADDER = register("bamboo_ladder", new DescriptionBlockItem(FoundationBlocks.BAMBOO_LADDER, new FabricItemSettings()));
public static final Item CHERRY_LADDER = register("cherry_ladder", new DescriptionBlockItem(FoundationBlocks.CHERRY_LADDER, new FabricItemSettings()));


public static final Item POLISHED_STONE = register("polished_stone", new BlockItem(FoundationBlocks.POLISHED_STONE, new FabricItemSettings()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ interface FoundationItemTags {
TagKey<Item> PALLETS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "pallets"));
TagKey<Item> COLUMNS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "columns"));
TagKey<Item> LAYERS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "layers"));
TagKey<Item> LADDERS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "ladders"));
TagKey<Item> HAMMERS = TagKey.create(Registries.ITEM, new ResourceLocation(MOD_ID, "hammers"));
}

Expand Down
154 changes: 154 additions & 0 deletions src/main/resources/assets/foundation/blockstates/acacia_ladder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
{
"variants": {
"facing=north,style=1": {
"model": "foundation:block/ladder/acacia/oak"
},
"facing=east,style=1": {
"model": "foundation:block/ladder/acacia/oak",
"y": 90
},
"facing=south,style=1": {
"model": "foundation:block/ladder/acacia/oak",
"y": 180
},
"facing=west,style=1": {
"model": "foundation:block/ladder/acacia/oak",
"y": 270
},
"facing=north,style=2": {
"model": "foundation:block/ladder/acacia/spruce"
},
"facing=east,style=2": {
"model": "foundation:block/ladder/acacia/spruce",
"y": 90
},
"facing=south,style=2": {
"model": "foundation:block/ladder/acacia/spruce",
"y": 180
},
"facing=west,style=2": {
"model": "foundation:block/ladder/acacia/spruce",
"y": 270
},
"facing=north,style=3": {
"model": "foundation:block/ladder/acacia/birch"
},
"facing=east,style=3": {
"model": "foundation:block/ladder/acacia/birch",
"y": 90
},
"facing=south,style=3": {
"model": "foundation:block/ladder/acacia/birch",
"y": 180
},
"facing=west,style=3": {
"model": "foundation:block/ladder/acacia/birch",
"y": 270
},
"facing=north,style=4": {
"model": "foundation:block/ladder/acacia/jungle"
},
"facing=east,style=4": {
"model": "foundation:block/ladder/acacia/jungle",
"y": 90
},
"facing=south,style=4": {
"model": "foundation:block/ladder/acacia/jungle",
"y": 180
},
"facing=west,style=4": {
"model": "foundation:block/ladder/acacia/jungle",
"y": 270
},
"facing=north,style=5": {
"model": "foundation:block/ladder/acacia/acacia"
},
"facing=east,style=5": {
"model": "foundation:block/ladder/acacia/acacia",
"y": 90
},
"facing=south,style=5": {
"model": "foundation:block/ladder/acacia/acacia",
"y": 180
},
"facing=west,style=5": {
"model": "foundation:block/ladder/acacia/acacia",
"y": 270
},
"facing=north,style=6": {
"model": "foundation:block/ladder/acacia/dark_oak"
},
"facing=east,style=6": {
"model": "foundation:block/ladder/acacia/dark_oak",
"y": 90
},
"facing=south,style=6": {
"model": "foundation:block/ladder/acacia/dark_oak",
"y": 180
},
"facing=west,style=6": {
"model": "foundation:block/ladder/acacia/dark_oak",
"y": 270
},
"facing=north,style=7": {
"model": "foundation:block/ladder/acacia/crimson"
},
"facing=east,style=7": {
"model": "foundation:block/ladder/acacia/crimson",
"y": 90
},
"facing=south,style=7": {
"model": "foundation:block/ladder/acacia/crimson",
"y": 180
},
"facing=west,style=7": {
"model": "foundation:block/ladder/acacia/crimson",
"y": 270
},
"facing=north,style=8": {
"model": "foundation:block/ladder/acacia/warped"
},
"facing=east,style=8": {
"model": "foundation:block/ladder/acacia/warped",
"y": 90
},
"facing=south,style=8": {
"model": "foundation:block/ladder/acacia/warped",
"y": 180
},
"facing=west,style=8": {
"model": "foundation:block/ladder/acacia/warped",
"y": 270
},
"facing=north,style=9": {
"model": "foundation:block/ladder/acacia/mangrove"
},
"facing=east,style=9": {
"model": "foundation:block/ladder/acacia/mangrove",
"y": 90
},
"facing=south,style=9": {
"model": "foundation:block/ladder/acacia/mangrove",
"y": 180
},
"facing=west,style=9": {
"model": "foundation:block/ladder/acacia/mangrove",
"y": 270
},
"facing=north,style=10": {
"model": "foundation:block/ladder/acacia/cherry"
},
"facing=east,style=10": {
"model": "foundation:block/ladder/acacia/cherry",
"y": 90
},
"facing=south,style=10": {
"model": "foundation:block/ladder/acacia/cherry",
"y": 180
},
"facing=west,style=10": {
"model": "foundation:block/ladder/acacia/cherry",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=east": {
"model": "foundation:block/ladder/bamboo",
"y": 90
},
"facing=north": {
"model": "foundation:block/ladder/bamboo"
},
"facing=south": {
"model": "foundation:block/ladder/bamboo",
"y": 180
},
"facing=west": {
"model": "foundation:block/ladder/bamboo",
"y": 270
}
}
}
Loading

0 comments on commit 3da555d

Please sign in to comment.