From 4f5aabf2719c8b6fe3a54c27104f6d2a07935cf8 Mon Sep 17 00:00:00 2001 From: Eli Gibbs Date: Sun, 7 Jun 2026 17:13:32 -0400 Subject: [PATCH] Added stair, slab, and wall variants of charred terracotta, gypsum stone, gypsum cobblestone, smooth gyspum stone, chiseled gypsum stone, reinforced stone, and chiseled reinforced stone --- .../cmr/jurassicrevived/block/ModBlocks.java | 56 ++++++++++++++++++ .../datagen/ModBlockLootTableProvider.java | 21 +++++++ .../datagen/ModBlockStateProvider.java | 57 ++++++++++++++++++- .../datagen/ModBlockTagProvider.java | 36 ++++++++++-- .../datagen/ModItemModelProvider.java | 7 +++ .../datagen/ModRecipeProvider.java | 28 +++++++++ .../jurassicrevived/item/ModCreativeTabs.java | 36 +++++++++++- .../assets/jurassicrevived/lang/en_us.json | 21 +++++++ gradle.properties | 2 +- 9 files changed, 254 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java b/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java index f4a06e1..5aa6562 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java +++ b/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java @@ -34,6 +34,14 @@ public class ModBlocks { public static final RegistrySupplier CHARRED_TERRACOTTA = registerBlock("charred_terracotta", () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier CHARRED_TERRACOTTA_STAIRS = registerBlock("charred_terracotta_stairs", + () -> new StairBlock(ModBlocks.CHARRED_TERRACOTTA.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHARRED_TERRACOTTA_SLAB = registerBlock("charred_terracotta_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHARRED_TERRACOTTA_WALL = registerBlock("charred_terracotta_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier LIGHT_POST = registerBlock("light_post", () -> new LightPostBlock(BlockBehaviour.Properties.of().noOcclusion().lightLevel(state -> 15))); @@ -177,6 +185,22 @@ public class ModBlocks { public static final RegistrySupplier CHISELED_GYPSUM_STONE = registerBlock("chiseled_gypsum_stone", () -> new Block(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_STONE_STAIRS = registerBlock("gypsum_stone_stairs", + () -> new StairBlock(ModBlocks.GYPSUM_STONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_STONE_SLAB = registerBlock("gypsum_stone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_STONE_WALL = registerBlock("gypsum_stone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + + public static final RegistrySupplier GYPSUM_COBBLESTONE_STAIRS = registerBlock("gypsum_cobblestone_stairs", + () -> new StairBlock(ModBlocks.GYPSUM_COBBLESTONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_COBBLESTONE_SLAB = registerBlock("gypsum_cobblestone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_COBBLESTONE_WALL = registerBlock("gypsum_cobblestone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier GYPSUM_BRICK_STAIRS = registerBlock("gypsum_brick_stairs", () -> new StairBlock(ModBlocks.GYPSUM_STONE_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); @@ -185,6 +209,22 @@ public class ModBlocks { public static final RegistrySupplier GYPSUM_BRICK_WALL = registerBlock("gypsum_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier SMOOTH_GYPSUM_STONE_STAIRS = registerBlock("smooth_gypsum_stone_stairs", + () -> new StairBlock(ModBlocks.SMOOTH_GYPSUM_STONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier SMOOTH_GYPSUM_STONE_SLAB = registerBlock("smooth_gypsum_stone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier SMOOTH_GYPSUM_STONE_WALL = registerBlock("smooth_gypsum_stone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + + public static final RegistrySupplier CHISELED_GYPSUM_STONE_STAIRS = registerBlock("chiseled_gypsum_stone_stairs", + () -> new StairBlock(ModBlocks.CHISELED_GYPSUM_STONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHISELED_GYPSUM_STONE_SLAB = registerBlock("chiseled_gypsum_stone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHISELED_GYPSUM_STONE_WALL = registerBlock("chiseled_gypsum_stone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier FENCE_LIGHT = registerBlock("fence_light", () -> new FenceLightBlock(BlockBehaviour.Properties.of().strength(1.0F).noOcclusion().lightLevel(state -> 15))); @@ -217,6 +257,22 @@ public class ModBlocks { public static final RegistrySupplier CHISELED_REINFORCED_STONE = registerBlock("chiseled_reinforced_stone", () -> new Block(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier REINFORCED_STONE_STAIRS = registerBlock("reinforced_stone_stairs", + () -> new StairBlock(ModBlocks.REINFORCED_STONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier REINFORCED_STONE_SLAB = registerBlock("reinforced_stone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier REINFORCED_STONE_WALL = registerBlock("reinforced_stone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + + public static final RegistrySupplier CHISELED_REINFORCED_STONE_STAIRS = registerBlock("chiseled_reinforced_stone_stairs", + () -> new StairBlock(ModBlocks.CHISELED_REINFORCED_STONE.get().defaultBlockState(), + BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHISELED_REINFORCED_STONE_SLAB = registerBlock("chiseled_reinforced_stone_slab", + () -> new SlabBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier CHISELED_REINFORCED_STONE_WALL = registerBlock("chiseled_reinforced_stone_wall", + () -> new WallBlock(BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); + public static final RegistrySupplier REINFORCED_BRICK_STAIRS = registerBlock("reinforced_brick_stairs", () -> new StairBlock(ModBlocks.REINFORCED_STONE_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.of().strength(4f).requiresCorrectToolForDrops())); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java index 6e3794e..0a38590 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java @@ -29,12 +29,27 @@ public class ModBlockLootTableProvider { helper.dropSelf(ModBlocks.TRASH_CAN.get()); helper.dropSelf(ModBlocks.BENCH.get()); helper.dropSelf(ModBlocks.CHARRED_TERRACOTTA.get()); + helper.dropSelf(ModBlocks.CHARRED_TERRACOTTA_STAIRS.get()); + helper.dropSelf(ModBlocks.CHARRED_TERRACOTTA_SLAB.get()); + helper.dropSelf(ModBlocks.CHARRED_TERRACOTTA_WALL.get()); helper.dropSelf(ModBlocks.FENCE_LIGHT.get()); helper.dropSelf(ModBlocks.LIGHT_POST.get()); helper.dropSelf(ModBlocks.GYPSUM_COBBLESTONE.get()); + helper.dropSelf(ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get()); + helper.dropSelf(ModBlocks.GYPSUM_COBBLESTONE_SLAB.get()); + helper.dropSelf(ModBlocks.GYPSUM_COBBLESTONE_WALL.get()); + helper.dropSelf(ModBlocks.GYPSUM_STONE_STAIRS.get()); + helper.dropSelf(ModBlocks.GYPSUM_STONE_SLAB.get()); + helper.dropSelf(ModBlocks.GYPSUM_STONE_WALL.get()); helper.dropSelf(ModBlocks.GYPSUM_STONE_BRICKS.get()); helper.dropSelf(ModBlocks.SMOOTH_GYPSUM_STONE.get()); + helper.dropSelf(ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get()); + helper.dropSelf(ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get()); + helper.dropSelf(ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get()); helper.dropSelf(ModBlocks.CHISELED_GYPSUM_STONE.get()); + helper.dropSelf(ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get()); + helper.dropSelf(ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get()); + helper.dropSelf(ModBlocks.CHISELED_GYPSUM_STONE_WALL.get()); helper.dropSelf(ModBlocks.GYPSUM_BRICK_STAIRS.get()); helper.dropSelf(ModBlocks.GYPSUM_BRICK_SLAB.get()); helper.dropSelf(ModBlocks.GYPSUM_BRICK_WALL.get()); @@ -58,8 +73,14 @@ public class ModBlockLootTableProvider { helper.createMultipleOreDrops(ModBlocks.PERMAFROST.get(), ModItems.FROZEN_BONE.get(),1, 1)); helper.dropSelf(ModBlocks.REINFORCED_STONE.get()); + helper.dropSelf(ModBlocks.REINFORCED_STONE_STAIRS.get()); + helper.dropSelf(ModBlocks.REINFORCED_STONE_SLAB.get()); + helper.dropSelf(ModBlocks.REINFORCED_STONE_WALL.get()); helper.dropSelf(ModBlocks.REINFORCED_STONE_BRICKS.get()); helper.dropSelf(ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.dropSelf(ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get()); + helper.dropSelf(ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get()); + helper.dropSelf(ModBlocks.CHISELED_REINFORCED_STONE_WALL.get()); helper.dropSelf(ModBlocks.REINFORCED_BRICK_STAIRS.get()); helper.dropSelf(ModBlocks.REINFORCED_BRICK_SLAB.get()); helper.dropSelf(ModBlocks.REINFORCED_BRICK_WALL.get()); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java index cf8cc97..e67791e 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java @@ -67,11 +67,42 @@ public class ModBlockStateProvider { modLoc("block/" + ModBlocks.ONYCHIOPSIS.getId().getPath())); helper.blockWithItem(ModBlocks.GYPSUM_STONE.get()); - helper.blockWithItem(ModBlocks.GYPSUM_COBBLESTONE.get()); + + helper.stairsBlock((StairBlock) ModBlocks.GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.GYPSUM_STONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.GYPSUM_STONE.getId().getPath()), modLoc("block/" + ModBlocks.GYPSUM_STONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.GYPSUM_STONE_WALL.get(), modLoc("block/" + ModBlocks.GYPSUM_STONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.GYPSUM_STONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.GYPSUM_STONE_SLAB.getId().getPath())); + + helper.blockWithItem(ModBlocks.GYPSUM_COBBLESTONE.get()); + + helper.stairsBlock((StairBlock) ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get(), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.GYPSUM_COBBLESTONE_SLAB.get(), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE.getId().getPath()), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.GYPSUM_COBBLESTONE_WALL.get(), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get(), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.GYPSUM_COBBLESTONE_SLAB.get(), modLoc("block/" + ModBlocks.GYPSUM_COBBLESTONE_SLAB.getId().getPath())); + helper.blockWithItem(ModBlocks.GYPSUM_STONE_BRICKS.get()); helper.blockWithItem(ModBlocks.SMOOTH_GYPSUM_STONE.get()); + + helper.stairsBlock((StairBlock) ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE.getId().getPath()), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get(), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.getId().getPath())); + helper.blockWithItem(ModBlocks.CHISELED_GYPSUM_STONE.get()); + helper.stairsBlock((StairBlock) ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE.getId().getPath()), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.CHISELED_GYPSUM_STONE_WALL.get(), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get(), modLoc("block/" + ModBlocks.CHISELED_GYPSUM_STONE_SLAB.getId().getPath())); + helper.randomTextureBlockWithItem(ModBlocks.STONE_FOSSIL.get(), List.of( Constants.rl("block/stone_fossil_egg"), Constants.rl("block/stone_fossil_rib"), @@ -93,10 +124,24 @@ public class ModBlockStateProvider { helper.blockWithItem(ModBlocks.REINFORCED_STONE_BRICKS.get()); helper.blockWithItem(ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.stairsBlock((StairBlock) ModBlocks.REINFORCED_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.REINFORCED_STONE_SLAB.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE.getId().getPath()), modLoc("block/" + ModBlocks.REINFORCED_STONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.REINFORCED_STONE_WALL.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.REINFORCED_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.REINFORCED_STONE_SLAB.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE_SLAB.getId().getPath())); + helper.stairsBlock((StairBlock) ModBlocks.REINFORCED_BRICK_STAIRS.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE_BRICKS.getId().getPath())); helper.slabBlock((SlabBlock) ModBlocks.REINFORCED_BRICK_SLAB.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE_BRICKS.getId().getPath()), modLoc("block/" + ModBlocks.REINFORCED_STONE_BRICKS.getId().getPath())); helper.wallBlock((WallBlock) ModBlocks.REINFORCED_BRICK_WALL.get(), modLoc("block/" + ModBlocks.REINFORCED_STONE_BRICKS.getId().getPath())); + helper.stairsBlock((StairBlock) ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get(), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE.getId().getPath()), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.CHISELED_REINFORCED_STONE_WALL.get(), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get(), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get(), modLoc("block/" + ModBlocks.CHISELED_REINFORCED_STONE_SLAB.getId().getPath())); + helper.simpleBlockItem(ModBlocks.REINFORCED_BRICK_STAIRS.get(), modLoc("block/" + ModBlocks.REINFORCED_BRICK_STAIRS.getId().getPath())); helper.simpleBlockItem(ModBlocks.REINFORCED_BRICK_SLAB.get(), modLoc("block/" + ModBlocks.REINFORCED_BRICK_SLAB.getId().getPath())); @@ -111,7 +156,15 @@ public class ModBlockStateProvider { helper.horizontalFacingWithItem(ModBlocks.TRASH_CAN.get()); helper.horizontalFacingWithItem(ModBlocks.BENCH.get()); helper.blockWithItem(ModBlocks.CHARRED_TERRACOTTA.get()); - helper.horizontalFacingWithItem(ModBlocks.FENCE_LIGHT.get()); + + helper.stairsBlock((StairBlock) ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath())); + helper.slabBlock((SlabBlock) ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath()), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath())); + helper.wallBlock((WallBlock) ModBlocks.CHARRED_TERRACOTTA_WALL.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath())); + + helper.simpleBlockItem(ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA_STAIRS.getId().getPath())); + helper.simpleBlockItem(ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA_SLAB.getId().getPath())); + + helper.horizontalFacingWithItem(ModBlocks.FENCE_LIGHT.get()); helper.horizontalFacingWithItem(ModBlocks.LIGHT_POST.get()); helper.simpleBlockWithExistingModel(ModBlocks.TANK.get(), modLoc("block/tank")); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java index 143ef8e..ac1e028 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java @@ -18,19 +18,40 @@ public class ModBlockTagProvider { ModBlocks.TRASH_CAN.get(), ModBlocks.BENCH.get(), ModBlocks.CHARRED_TERRACOTTA.get(), + ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), + ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), + ModBlocks.CHARRED_TERRACOTTA_WALL.get(), ModBlocks.FENCE_LIGHT.get(), ModBlocks.LIGHT_POST.get(), ModBlocks.GYPSUM_STONE.get(), + ModBlocks.GYPSUM_STONE_STAIRS.get(), + ModBlocks.GYPSUM_STONE_SLAB.get(), + ModBlocks.GYPSUM_STONE_WALL.get(), ModBlocks.GYPSUM_COBBLESTONE.get(), + ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get(), + ModBlocks.GYPSUM_COBBLESTONE_SLAB.get(), + ModBlocks.GYPSUM_COBBLESTONE_WALL.get(), ModBlocks.GYPSUM_STONE_BRICKS.get(), + ModBlocks.GYPSUM_BRICK_STAIRS.get(), + ModBlocks.GYPSUM_BRICK_SLAB.get(), + ModBlocks.GYPSUM_BRICK_WALL.get(), ModBlocks.SMOOTH_GYPSUM_STONE.get(), + ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get(), + ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get(), + ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get(), ModBlocks.CHISELED_GYPSUM_STONE.get(), - ModBlocks.GYPSUM_BRICK_STAIRS.get(), - ModBlocks.GYPSUM_BRICK_SLAB.get(), - ModBlocks.GYPSUM_BRICK_WALL.get(), + ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get(), + ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get(), + ModBlocks.CHISELED_GYPSUM_STONE_WALL.get(), ModBlocks.REINFORCED_STONE.get(), - ModBlocks.REINFORCED_STONE_BRICKS.get(), + ModBlocks.REINFORCED_STONE_STAIRS.get(), + ModBlocks.REINFORCED_STONE_SLAB.get(), + ModBlocks.REINFORCED_STONE_WALL.get(), ModBlocks.CHISELED_REINFORCED_STONE.get(), + ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get(), + ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get(), + ModBlocks.CHISELED_REINFORCED_STONE_WALL.get(), + ModBlocks.REINFORCED_STONE_BRICKS.get(), ModBlocks.REINFORCED_BRICK_STAIRS.get(), ModBlocks.REINFORCED_BRICK_SLAB.get(), ModBlocks.REINFORCED_BRICK_WALL.get(), @@ -181,7 +202,14 @@ public class ModBlockTagProvider { ); helper.tag(BlockTags.WALLS, + ModBlocks.GYPSUM_STONE_WALL.get(), + ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get(), + ModBlocks.CHISELED_GYPSUM_STONE_WALL.get(), + ModBlocks.GYPSUM_COBBLESTONE_WALL.get(), ModBlocks.GYPSUM_BRICK_WALL.get(), + ModBlocks.CHARRED_TERRACOTTA_WALL.get(), + ModBlocks.CHISELED_REINFORCED_STONE_WALL.get(), + ModBlocks.REINFORCED_STONE_WALL.get(), ModBlocks.REINFORCED_BRICK_WALL.get() ); } diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModItemModelProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModItemModelProvider.java index f472228..06bb203 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModItemModelProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModItemModelProvider.java @@ -599,6 +599,13 @@ public class ModItemModelProvider { helper.wallItem(ModBlocks.GYPSUM_BRICK_WALL.get(), ModBlocks.GYPSUM_STONE_BRICKS.get()); helper.wallItem(ModBlocks.REINFORCED_BRICK_WALL.get(), ModBlocks.REINFORCED_STONE_BRICKS.get()); + helper.wallItem(ModBlocks.CHARRED_TERRACOTTA_WALL.get(), ModBlocks.CHARRED_TERRACOTTA.get()); + helper.wallItem(ModBlocks.CHISELED_GYPSUM_STONE_WALL.get(), ModBlocks.CHISELED_GYPSUM_STONE.get()); + helper.wallItem(ModBlocks.CHISELED_REINFORCED_STONE_WALL.get(), ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.wallItem(ModBlocks.GYPSUM_COBBLESTONE_WALL.get(), ModBlocks.GYPSUM_COBBLESTONE.get()); + helper.wallItem(ModBlocks.GYPSUM_STONE_WALL.get(), ModBlocks.GYPSUM_STONE.get()); + helper.wallItem(ModBlocks.REINFORCED_STONE_WALL.get(), ModBlocks.REINFORCED_STONE.get()); + helper.wallItem(ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get(), ModBlocks.SMOOTH_GYPSUM_STONE.get()); helper.simpleBlockItemModel(ModBlocks.INCUBATED_BRACHIOSAURUS_EGG.get()); helper.simpleBlockItemModel(ModBlocks.INCUBATED_CERATOSAURUS_EGG.get()); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java index de3be9e..13591b3 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java @@ -60,6 +60,34 @@ public class ModRecipeProvider { helper.buildShaped(RecipeCategory.MISC, ModBlocks.REINFORCED_BRICK_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.REINFORCED_STONE_BRICKS.get()); helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_REINFORCED_STONE.get(), 1, new String[]{"A", "A"}, 'A', ModBlocks.REINFORCED_BRICK_SLAB.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.CHARRED_TERRACOTTA.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.CHARRED_TERRACOTTA.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHARRED_TERRACOTTA_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.CHARRED_TERRACOTTA.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_STONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_STONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_STONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.GYPSUM_STONE.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.GYPSUM_COBBLESTONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_COBBLESTONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.GYPSUM_COBBLESTONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.GYPSUM_COBBLESTONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.GYPSUM_COBBLESTONE.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.SMOOTH_GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.SMOOTH_GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.SMOOTH_GYPSUM_STONE.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.CHISELED_GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.CHISELED_GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_GYPSUM_STONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.CHISELED_GYPSUM_STONE.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.REINFORCED_STONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.REINFORCED_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.REINFORCED_STONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.REINFORCED_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.REINFORCED_STONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.REINFORCED_STONE.get()); + + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get(), 4, new String[]{"A ", "AA ", "AAA"}, 'A', ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get(), 6, new String[]{"AAA"}, 'A', ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_REINFORCED_STONE_WALL.get(), 6, new String[]{"AAA", "AAA"}, 'A', ModBlocks.CHISELED_REINFORCED_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.TRASH_CAN.get(), 1, new String[]{"AAA", "A A", "AAA"}, 'A', Items.IRON_INGOT); helper.buildShaped(RecipeCategory.MISC, ModBlocks.BENCH.get(), 1, new String[]{"A ", "AAA", "BBB"}, 'A', ItemTags.PLANKS, 'B', ModBlocks.REINFORCED_STONE_BRICKS.get()); helper.buildShaped(RecipeCategory.MISC, ModBlocks.FENCE_LIGHT.get(), 1, new String[]{"A", "B"}, 'A', Blocks.GLOWSTONE, 'B', Items.IRON_INGOT); diff --git a/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java b/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java index 58c2c65..473c9d5 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java +++ b/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java @@ -47,25 +47,55 @@ public class ModCreativeTabs { output.accept(ModBlocks.CAT_PLUSHIE.get()); output.accept(ModBlocks.TRASH_CAN.get()); output.accept(ModBlocks.BENCH.get()); + output.accept(ModBlocks.CHARRED_TERRACOTTA.get()); + output.accept(ModBlocks.CHARRED_TERRACOTTA_STAIRS.get()); + output.accept(ModBlocks.CHARRED_TERRACOTTA_SLAB.get()); + output.accept(ModBlocks.CHARRED_TERRACOTTA_WALL.get()); + output.accept(ModBlocks.FENCE_LIGHT.get()); output.accept(ModBlocks.LIGHT_POST.get()); + output.accept(ModBlocks.GYPSUM_STONE.get()); + output.accept(ModBlocks.GYPSUM_STONE_STAIRS.get()); + output.accept(ModBlocks.GYPSUM_STONE_SLAB.get()); + output.accept(ModBlocks.GYPSUM_STONE_WALL.get()); + output.accept(ModBlocks.GYPSUM_COBBLESTONE.get()); + output.accept(ModBlocks.GYPSUM_COBBLESTONE_STAIRS.get()); + output.accept(ModBlocks.GYPSUM_COBBLESTONE_SLAB.get()); + output.accept(ModBlocks.GYPSUM_COBBLESTONE_WALL.get()); + output.accept(ModBlocks.GYPSUM_STONE_BRICKS.get()); - output.accept(ModBlocks.SMOOTH_GYPSUM_STONE.get()); - output.accept(ModBlocks.CHISELED_GYPSUM_STONE.get()); output.accept(ModBlocks.GYPSUM_BRICK_STAIRS.get()); output.accept(ModBlocks.GYPSUM_BRICK_SLAB.get()); output.accept(ModBlocks.GYPSUM_BRICK_WALL.get()); + output.accept(ModBlocks.SMOOTH_GYPSUM_STONE.get()); + output.accept(ModBlocks.SMOOTH_GYPSUM_STONE_STAIRS.get()); + output.accept(ModBlocks.SMOOTH_GYPSUM_STONE_SLAB.get()); + output.accept(ModBlocks.SMOOTH_GYPSUM_STONE_WALL.get()); + + output.accept(ModBlocks.CHISELED_GYPSUM_STONE.get()); + output.accept(ModBlocks.CHISELED_GYPSUM_STONE_STAIRS.get()); + output.accept(ModBlocks.CHISELED_GYPSUM_STONE_SLAB.get()); + output.accept(ModBlocks.CHISELED_GYPSUM_STONE_WALL.get()); + output.accept(ModBlocks.REINFORCED_STONE.get()); + output.accept(ModBlocks.REINFORCED_STONE_STAIRS.get()); + output.accept(ModBlocks.REINFORCED_STONE_SLAB.get()); + output.accept(ModBlocks.REINFORCED_STONE_WALL.get()); + output.accept(ModBlocks.REINFORCED_STONE_BRICKS.get()); - output.accept(ModBlocks.CHISELED_REINFORCED_STONE.get()); output.accept(ModBlocks.REINFORCED_BRICK_STAIRS.get()); output.accept(ModBlocks.REINFORCED_BRICK_SLAB.get()); output.accept(ModBlocks.REINFORCED_BRICK_WALL.get()); + output.accept(ModBlocks.CHISELED_REINFORCED_STONE.get()); + output.accept(ModBlocks.CHISELED_REINFORCED_STONE_STAIRS.get()); + output.accept(ModBlocks.CHISELED_REINFORCED_STONE_SLAB.get()); + output.accept(ModBlocks.CHISELED_REINFORCED_STONE_WALL.get()); + output.accept(ModBlocks.LOW_SECURITY_FENCE_POLE.get()); output.accept(ModBlocks.LOW_SECURITY_FENCE_WIRE.get()); output.accept(ModBlocks.MEDIUM_SECURITY_FENCE_POLE.get()); diff --git a/common/src/main/resources/assets/jurassicrevived/lang/en_us.json b/common/src/main/resources/assets/jurassicrevived/lang/en_us.json index 536bbc8..db2a248 100755 --- a/common/src/main/resources/assets/jurassicrevived/lang/en_us.json +++ b/common/src/main/resources/assets/jurassicrevived/lang/en_us.json @@ -180,6 +180,27 @@ "block.jurassicrevived.gypsum_brick_stairs": "Gypsum Brick Stairs", "block.jurassicrevived.gypsum_brick_slab": "Gypsum Brick Slab", "block.jurassicrevived.gypsum_brick_wall": "Gypsum Brick Wall", + "block.jurassicrevived.charred_terracotta_stairs": "Charred Terracotta Stairs", + "block.jurassicrevived.charred_terracotta_slab": "Charred Terracotta Slab", + "block.jurassicrevived.charred_terracotta_wall": "Charred Terracotta Wall", + "block.jurassicrevived.chiseled_gypsum_stone_stairs": "Chiseled Gypsum Stone Stairs", + "block.jurassicrevived.chiseled_gypsum_stone_slab": "Chiseled Gypsum Stone Slab", + "block.jurassicrevived.chiseled_gypsum_stone_wall": "Chiseled Gypsum Stone Wall", + "block.jurassicrevived.chiseled_reinforced_stone_stairs": "Chiseled Reinforced Stone Stairs", + "block.jurassicrevived.chiseled_reinforced_stone_slab": "Chiseled Reinforced Stone Slab", + "block.jurassicrevived.chiseled_reinforced_stone_wall": "Chiseled Reinforced Stone Wall", + "block.jurassicrevived.gypsum_cobblestone_stairs": "Gypsum Cobblestone Stairs", + "block.jurassicrevived.gypsum_cobblestone_slab": "Gypsum Cobblestone Slab", + "block.jurassicrevived.gypsum_cobblestone_wall": "Gypsum Cobblestone Wall", + "block.jurassicrevived.gypsum_stone_stairs": "Gypsum Stone Stairs", + "block.jurassicrevived.gypsum_stone_slab": "Gypsum Stone Slab", + "block.jurassicrevived.gypsum_stone_wall": "Gypsum Stone Wall", + "block.jurassicrevived.reinforced_stone_stairs": "Reinforced Stone Stairs", + "block.jurassicrevived.reinforced_stone_slab": "Reinforced Stone Slab", + "block.jurassicrevived.reinforced_stone_wall": "Reinforced Stone Wall", + "block.jurassicrevived.smooth_gypsum_stone_stairs": "Smooth Gypsum Stone Stairs", + "block.jurassicrevived.smooth_gypsum_stone_slab": "Smooth Gypsum Stone Slab", + "block.jurassicrevived.smooth_gypsum_stone_wall": "Smooth Gypsum Stone Wall", "block.jurassicrevived.reinforced_stone": "Reinforced Stone", "block.jurassicrevived.reinforced_stone_bricks": "Reinforced Stone Bricks", diff --git a/gradle.properties b/gradle.properties index 293d22c..eb92d21 100755 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ fabric.loom.multiProjectOptimisation=true mod.name=Jurassic Revived mod.id=jurassicrevived mod.group=net.cmr.jurassicrevived -mod.version=0.222.0 +mod.version=0.223.0 mod.author=CMR Team, Eli Gibbs mod.description=A Minecraft mod that brings dinosaurs back to life using ancient DNA and modern technology\nBreed, study, and build your own prehistoric park with a wide variety of creatures... mod.license=CC-BY-ND-4.0