diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/GenerationsBlocks.java b/common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/GenerationsBlocks.java index dbfac0c03..3480c3726 100644 --- a/common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/GenerationsBlocks.java +++ b/common/src/main/java/generations/gg/generations/core/generationscore/world/level/block/GenerationsBlocks.java @@ -572,36 +572,13 @@ public class GenerationsBlocks { /** * Floor */ - public static final RegistrySupplier FLOOR_1 = registerBlockItem("floor_1", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier FLOOR_1_STAIRS = registerBlockItem("floor_1_stairs", () -> new StairBlock(FLOOR_1.get().defaultBlockState(), BlockBehaviour.Properties.copy(FLOOR_1.get()))); - public static final RegistrySupplier FLOOR_1_SLAB = registerBlockItem("floor_1_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(FLOOR_1.get()))); - public static final RegistrySupplier FLOOR_1_WALL = registerBlockItem("floor_1_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(FLOOR_1.get()))); - public static final RegistrySupplier FLOOR_2 = registerBlockItem("floor_2", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier FLOOR_2_STAIRS = registerBlockItem("floor_2_stairs", () -> new StairBlock(FLOOR_2.get().defaultBlockState(), BlockBehaviour.Properties.copy(FLOOR_2.get()))); - public static final RegistrySupplier FLOOR_2_SLAB = registerBlockItem("floor_2_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(FLOOR_2.get()))); - public static final RegistrySupplier FLOOR_2_WALL = registerBlockItem("floor_2_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(FLOOR_2.get()))); - public static final RegistrySupplier FLOOR_3 = registerBlockItem("floor_3", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier FLOOR_3_STAIRS = registerBlockItem("floor_3_stairs", () -> new StairBlock(FLOOR_3.get().defaultBlockState(), BlockBehaviour.Properties.copy(FLOOR_3.get()))); - public static final RegistrySupplier FLOOR_3_SLAB = registerBlockItem("floor_3_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(FLOOR_3.get()))); - public static final RegistrySupplier FLOOR_3_WALL = registerBlockItem("floor_3_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(FLOOR_3.get()))); - public static final RegistrySupplier FLOOR_4 = registerBlockItem("floor_4", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier FLOOR_4_STAIRS = registerBlockItem("floor_4_stairs", () -> new StairBlock(FLOOR_4.get().defaultBlockState(), BlockBehaviour.Properties.copy(FLOOR_4.get()))); - public static final RegistrySupplier FLOOR_4_SLAB = registerBlockItem("floor_4_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(FLOOR_4.get()))); - public static final RegistrySupplier FLOOR_4_WALL = registerBlockItem("floor_4_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(FLOOR_4.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_1 = registerBlockItem("mirrored_floor_1", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier MIRRORED_FLOOR_1_STAIRS = registerBlockItem("mirrored_floor_1_stairs", () -> new StairBlock(MIRRORED_FLOOR_1.get().defaultBlockState(), BlockBehaviour.Properties.copy(MIRRORED_FLOOR_1.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_1_SLAB = registerBlockItem("mirrored_floor_1_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_1.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_1_WALL = registerBlockItem("mirrored_floor_1_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_1.get()))); - - public static final RegistrySupplier MIRRORED_FLOOR_2 = registerBlockItem("mirrored_floor_2", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier MIRRORED_FLOOR_2_STAIRS = registerBlockItem("mirrored_floor_2_stairs", () -> new StairBlock(MIRRORED_FLOOR_2.get().defaultBlockState(), BlockBehaviour.Properties.copy(MIRRORED_FLOOR_2.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_2_SLAB = registerBlockItem("mirrored_floor_2_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_2.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_2_WALL = registerBlockItem("mirrored_floor_2_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_2.get()))); - - public static final RegistrySupplier MIRRORED_FLOOR_3 = registerBlockItem("mirrored_floor_3", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); - public static final RegistrySupplier MIRRORED_FLOOR_3_STAIRS = registerBlockItem("mirrored_floor_3_stairs", () -> new StairBlock(MIRRORED_FLOOR_3.get().defaultBlockState(), BlockBehaviour.Properties.copy(MIRRORED_FLOOR_3.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_3_SLAB = registerBlockItem("mirrored_floor_3_slab", () -> new SlabBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_3.get()))); - public static final RegistrySupplier MIRRORED_FLOOR_3_WALL = registerBlockItem("mirrored_floor_3_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(MIRRORED_FLOOR_3.get()))); + public static final GenerationsBlockSet FLOOR_1_SET = new GenerationsBlockSet("floor_1", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet FLOOR_2_SET = new GenerationsBlockSet("floor_2", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet FLOOR_3_SET = new GenerationsBlockSet("floor_3", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet FLOOR_4_SET = new GenerationsBlockSet("floor_4", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet MIRROR_FLOOR_1_SET = new GenerationsBlockSet("mirror_floor_1", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet MIRROR_FLOOR_2_SET = new GenerationsBlockSet("mirror_floor_2", BlockBehaviour.Properties.copy(Blocks.STONE)); + public static final GenerationsBlockSet MIRROR_FLOOR_3_SET = new GenerationsBlockSet("mirror_floor_3", BlockBehaviour.Properties.copy(Blocks.STONE)); public static final RegistrySupplier ENCHANTED_OBSIDIAN = registerBlockItem("enchanted_obsidian", () -> new EnchantedObsidianBlock(BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); public static final RegistrySupplier ENCHANTED_OBSIDIAN_STAIRS = registerBlockItem("enchanted_obsidian_stairs", () -> new StairBlock(Blocks.OBSIDIAN.defaultBlockState(), BlockBehaviour.Properties.copy(Blocks.OBSIDIAN))); diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/data/families/GenerationsBlockFamilies.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/data/families/GenerationsBlockFamilies.java index d857a7049..f36e46602 100644 --- a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/data/families/GenerationsBlockFamilies.java +++ b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/data/families/GenerationsBlockFamilies.java @@ -103,13 +103,6 @@ public class GenerationsBlockFamilies extends BlockFamilies { public static final BlockFamily SUBWAY_FLOOR_PLAIN = familyBuilder(GenerationsBlocks.SUBWAY_FLOOR_PLAIN.get()).slab(GenerationsBlocks.SUBWAY_FLOOR_PLAIN_SLAB.get()).stairs(GenerationsBlocks.SUBWAY_FLOOR_PLAIN_STAIRS.get()).wall(GenerationsBlocks.SUBWAY_FLOOR_PLAIN_WALL.get()).recipeGroupPrefix("subway_floor_plain").recipeUnlockedBy("has_subway_floor_plain").getFamily(); public static final BlockFamily SUBWAY_WALL = familyBuilder(GenerationsBlocks.SUBWAY_WALL.get()).slab(GenerationsBlocks.SUBWAY_WALL_SLAB.get()).stairs(GenerationsBlocks.SUBWAY_WALL_STAIRS.get()).recipeGroupPrefix("subway_wall").recipeUnlockedBy("has_subway_wall").getFamily(); public static final BlockFamily SUBWAY_WALL_2 = familyBuilder(GenerationsBlocks.SUBWAY_WALL_2.get()).slab(GenerationsBlocks.SUBWAY_WALL_2_SLAB.get()).stairs(GenerationsBlocks.SUBWAY_WALL_2_STAIRS.get()).recipeGroupPrefix("subway_wall_2").recipeUnlockedBy("has_subway_wall_2").getFamily(); - public static final BlockFamily FLOOR_1 = familyBuilder(GenerationsBlocks.FLOOR_1.get()).slab(GenerationsBlocks.FLOOR_1_SLAB.get()).stairs(GenerationsBlocks.FLOOR_1_STAIRS.get()).wall(GenerationsBlocks.FLOOR_1_WALL.get()).recipeGroupPrefix("floor_1").recipeUnlockedBy("has_floor_1").getFamily(); - public static final BlockFamily FLOOR_2 = familyBuilder(GenerationsBlocks.FLOOR_2.get()).slab(GenerationsBlocks.FLOOR_2_SLAB.get()).stairs(GenerationsBlocks.FLOOR_2_STAIRS.get()).wall(GenerationsBlocks.FLOOR_2_WALL.get()).recipeGroupPrefix("floor_2").recipeUnlockedBy("has_floor_2").getFamily(); - public static final BlockFamily FLOOR_3 = familyBuilder(GenerationsBlocks.FLOOR_3.get()).slab(GenerationsBlocks.FLOOR_3_SLAB.get()).stairs(GenerationsBlocks.FLOOR_3_STAIRS.get()).wall(GenerationsBlocks.FLOOR_3_WALL.get()).recipeGroupPrefix("floor_3").recipeUnlockedBy("has_floor_3").getFamily(); - public static final BlockFamily FLOOR_4 = familyBuilder(GenerationsBlocks.FLOOR_4.get()).slab(GenerationsBlocks.FLOOR_4_SLAB.get()).stairs(GenerationsBlocks.FLOOR_4_STAIRS.get()).wall(GenerationsBlocks.FLOOR_4_WALL.get()).recipeGroupPrefix("floor_4").recipeUnlockedBy("has_floor_4").getFamily(); - public static final BlockFamily MIRRORED_FLOOR_1 = familyBuilder(GenerationsBlocks.MIRRORED_FLOOR_1.get()).slab(GenerationsBlocks.MIRRORED_FLOOR_1_SLAB.get()).stairs(GenerationsBlocks.MIRRORED_FLOOR_1_STAIRS.get()).wall(GenerationsBlocks.MIRRORED_FLOOR_1_WALL.get()).recipeGroupPrefix("mirrored_floor_1").recipeUnlockedBy("has_mirrored_floor_1").getFamily(); - public static final BlockFamily MIRRORED_FLOOR_2 = familyBuilder(GenerationsBlocks.MIRRORED_FLOOR_2.get()).slab(GenerationsBlocks.MIRRORED_FLOOR_2_SLAB.get()).stairs(GenerationsBlocks.MIRRORED_FLOOR_2_STAIRS.get()).wall(GenerationsBlocks.MIRRORED_FLOOR_2_WALL.get()).recipeGroupPrefix("mirrored_floor_2").recipeUnlockedBy("has_mirrored_floor_2").getFamily(); - public static final BlockFamily MIRRORED_FLOOR_3 = familyBuilder(GenerationsBlocks.MIRRORED_FLOOR_3.get()).slab(GenerationsBlocks.MIRRORED_FLOOR_3_SLAB.get()).stairs(GenerationsBlocks.MIRRORED_FLOOR_3_STAIRS.get()).wall(GenerationsBlocks.MIRRORED_FLOOR_3_WALL.get()).recipeGroupPrefix("mirrored_floor_3").recipeUnlockedBy("has_mirrored_floor_3").getFamily(); public static final BlockFamily ENCHANTED_OBSIDIAN = familyBuilder(GenerationsBlocks.ENCHANTED_OBSIDIAN.get()).slab(GenerationsBlocks.ENCHANTED_OBSIDIAN_SLAB.get()).stairs(GenerationsBlocks.ENCHANTED_OBSIDIAN_STAIRS.get()).wall(GenerationsBlocks.ENCHANTED_OBSIDIAN_WALL.get()).pressurePlate(GenerationsBlocks.ENCHANTED_OBSIDIAN_PRESSURE_PLATE.get()).button(GenerationsBlocks.ENCHANTED_OBSIDIAN_BUTTON.get()).recipeGroupPrefix("enchanted_obsidian").recipeUnlockedBy("has_enchanted_obsidian").getFamily(); public static final BlockFamily ULTRA_SANDSTONE = familyBuilder(GenerationsBlocks.ULTRA_SANDSTONE.get()).slab(GenerationsBlocks.ULTRA_SANDSTONE_SLAB.get()).stairs(GenerationsBlocks.ULTRA_SANDSTONE_STAIRS.get()).wall(GenerationsBlocks.ULTRA_SANDSTONE_WALL.get()).recipeGroupPrefix("ultra_sandstone").recipeUnlockedBy("has_ultra_sandstone").getFamily(); public static final BlockFamily ULTRA_SMOOTH_SANDSTONE = familyBuilder(GenerationsBlocks.ULTRA_SMOOTH_SANDSTONE.get()).slab(GenerationsBlocks.ULTRA_SMOOTH_SANDSTONE_SLAB.get()).stairs(GenerationsBlocks.ULTRA_SMOOTH_SANDSTONE_STAIRS.get()).wall(GenerationsBlocks.ULTRA_SMOOTH_SANDSTONE_WALL.get()).recipeGroupPrefix("ultra_smooth_sandstone").recipeUnlockedBy("has_ultra_smooth_sandstone").dontGenerateModel().getFamily(); diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.java index ce77d945a..7b4fa78d9 100644 --- a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.java +++ b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/blocks/BlockDatagen.java @@ -149,16 +149,6 @@ public void registerStatesAndModels() { registerBlockItem(GenerationsBlocks.GOLDEN_TEMPLE_SAND); - - //floor - registerPallet(GenerationsBlocks.FLOOR_1, GenerationsBlocks.FLOOR_1_SLAB, GenerationsBlocks.FLOOR_1_STAIRS, GenerationsBlocks.FLOOR_1_WALL, null, null, true); - registerPallet(GenerationsBlocks.FLOOR_2, GenerationsBlocks.FLOOR_2_SLAB, GenerationsBlocks.FLOOR_2_STAIRS, GenerationsBlocks.FLOOR_2_WALL, null, null, true); - registerPallet(GenerationsBlocks.FLOOR_3, GenerationsBlocks.FLOOR_3_SLAB, GenerationsBlocks.FLOOR_3_STAIRS, GenerationsBlocks.FLOOR_3_WALL, null, null, true); - registerPallet(GenerationsBlocks.FLOOR_4, GenerationsBlocks.FLOOR_4_SLAB, GenerationsBlocks.FLOOR_4_STAIRS, GenerationsBlocks.FLOOR_4_WALL, null, null, true); - registerPallet(GenerationsBlocks.MIRRORED_FLOOR_1, GenerationsBlocks.MIRRORED_FLOOR_1_SLAB, GenerationsBlocks.MIRRORED_FLOOR_1_STAIRS, GenerationsBlocks.MIRRORED_FLOOR_1_WALL, null, null, true); - registerPallet(GenerationsBlocks.MIRRORED_FLOOR_2, GenerationsBlocks.MIRRORED_FLOOR_2_SLAB, GenerationsBlocks.MIRRORED_FLOOR_2_STAIRS, GenerationsBlocks.MIRRORED_FLOOR_2_WALL, null, null, true); - registerPallet(GenerationsBlocks.MIRRORED_FLOOR_3, GenerationsBlocks.MIRRORED_FLOOR_3_SLAB, GenerationsBlocks.MIRRORED_FLOOR_3_STAIRS, GenerationsBlocks.MIRRORED_FLOOR_3_WALL, null, null, true); - registerBlockItem(GenerationsBlocks.RAW_ALUMINUM_BLOCK); registerBlockItem(GenerationsBlocks.ALUMINUM_BLOCK); registerPallet(GenerationsBlocks.RUBY_BLOCK, GenerationsBlocks.RUBY_SLAB, GenerationsBlocks.RUBY_STAIRS, GenerationsBlocks.RUBY_WALL, null, null, true);