From 9ab36fdbc6fc90dc6d3f13d83c0c71b7d0994917 Mon Sep 17 00:00:00 2001 From: gniftygnome Date: Sun, 17 Nov 2024 15:17:19 -0800 Subject: [PATCH] Stable release for 1.21.2/3. - Stable release for 1.21.2/3 - Use stable Biolith release - Clean up tags and tag translations --- .../assets/cinderscapes/lang/en_us.json | 2 - .../data/CinderscapesBiomeTagProvider.java | 36 +- .../data/CinderscapesBlockTagProvider.java | 334 +++++++++--------- .../data/CinderscapesItemTagProvider.java | 179 +++++----- .../tag/CinderscapesBlockTags.java | 3 - .../tag/CinderscapesItemTags.java | 2 - gradle.properties | 2 +- 7 files changed, 285 insertions(+), 273 deletions(-) diff --git a/client/src/main/resources/assets/cinderscapes/lang/en_us.json b/client/src/main/resources/assets/cinderscapes/lang/en_us.json index e7b2a1f..04b6894 100644 --- a/client/src/main/resources/assets/cinderscapes/lang/en_us.json +++ b/client/src/main/resources/assets/cinderscapes/lang/en_us.json @@ -207,8 +207,6 @@ "tag.item.c.quartz": "Quartz", "tag.item.c.quartz_blocks": "Quartz Blocks", "tag.item.c.storage_blocks.sulfur": "Storage Blocks for Sulfur", - "tag.item.c.stripped_logs": "Stripped Logs", - "tag.item.c.stripped_woods": "Stripped Woods", "tag.item.c.sulfur_ores": "Sulfur Ores", "tag.item.c.ores.sulfurs": "Ores of Sulfurs", "tag.item.c.sulfurs": "Sulfurs", diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java index 3440a0a..37f5bbf 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBiomeTagProvider.java @@ -19,39 +19,43 @@ protected CinderscapesBiomeTagProvider(FabricDataOutput output, CompletableFutur @Override public void configure(RegistryWrapper.WrapperLookup registries) { /* - * Vanilla and Conventional biome categories + * Vanilla biome tags */ getOrCreateTagBuilder(BiomeTags.IS_NETHER) - .addOptional(CinderscapesBiomes.ASHY_SHOALS) - .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES) - .addOptional(CinderscapesBiomes.LUMINOUS_GROVE) - .addOptional(CinderscapesBiomes.QUARTZ_CAVERN); + .addOptional(CinderscapesBiomes.ASHY_SHOALS) + .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES) + .addOptional(CinderscapesBiomes.LUMINOUS_GROVE) + .addOptional(CinderscapesBiomes.QUARTZ_CAVERN); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST) - .addOptional(CinderscapesBiomes.LUMINOUS_GROVE); - getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND) - .addOptional(CinderscapesBiomes.ASHY_SHOALS); + /* + * Conventional biome tags + */ + getOrCreateTagBuilder(ConventionalBiomeTags.IS_NETHER_FOREST) + .addOptional(CinderscapesBiomes.LUMINOUS_GROVE); getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE) - .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); + .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); + + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WASTELAND) + .addOptional(CinderscapesBiomes.ASHY_SHOALS); /* * Biome structure generation tags */ getOrCreateTagBuilder(BiomeTags.BASTION_REMNANT_HAS_STRUCTURE) - .addOptional(CinderscapesBiomes.ASHY_SHOALS) - .addOptional(CinderscapesBiomes.LUMINOUS_GROVE); + .addOptional(CinderscapesBiomes.ASHY_SHOALS) + .addOptional(CinderscapesBiomes.LUMINOUS_GROVE); getOrCreateTagBuilder(BiomeTags.NETHER_FORTRESS_HAS_STRUCTURE) - .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); + .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); getOrCreateTagBuilder(BiomeTags.NETHER_FOSSIL_HAS_STRUCTURE) - .addOptional(CinderscapesBiomes.ASHY_SHOALS) - .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); + .addOptional(CinderscapesBiomes.ASHY_SHOALS) + .addOptional(CinderscapesBiomes.BLACKSTONE_SHALES); getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_NETHER_HAS_STRUCTURE) - .addOptional(CinderscapesBiomes.ASHY_SHOALS); + .addOptional(CinderscapesBiomes.ASHY_SHOALS); } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java index 1b3a7e8..583c172 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesBlockTagProvider.java @@ -18,236 +18,244 @@ protected CinderscapesBlockTagProvider(FabricDataOutput output, CompletableFutur @Override public void configure(RegistryWrapper.WrapperLookup registries) { - // basic block tags + /* + * Basic block tags + */ getOrCreateTagBuilder(BlockTags.ENDERMAN_HOLDABLE) - .add(CinderscapesBlocks.NODZOL) - .add(CinderscapesBlocks.UMBRAL_FUNGUS) - .add(CinderscapesBlocks.UMBRAL_NYLIUM); + .add(CinderscapesBlocks.NODZOL) + .add(CinderscapesBlocks.UMBRAL_FUNGUS) + .add(CinderscapesBlocks.UMBRAL_NYLIUM); getOrCreateTagBuilder(BlockTags.FLOWER_POTS) - .add(CinderscapesBlocks.POTTED_CRYSTINIUM) - .add(CinderscapesBlocks.POTTED_LUMINOUS_POD) - .add(CinderscapesBlocks.POTTED_PHOTOFERN) - .add(CinderscapesBlocks.POTTED_POLYPITE_QUARTZ) - .add(CinderscapesBlocks.POTTED_POLYPITE_ROSE_QUARTZ) - .add(CinderscapesBlocks.POTTED_POLYPITE_SMOKY_QUARTZ) - .add(CinderscapesBlocks.POTTED_POLYPITE_SULFUR_QUARTZ) - .add(CinderscapesBlocks.POTTED_PYRACINTH) - .add(CinderscapesBlocks.POTTED_SCORCHED_SHRUB) - .add(CinderscapesBlocks.POTTED_SCORCHED_TENDRILS) - .add(CinderscapesBlocks.POTTED_TWILIGHT_TENDRILS) - .add(CinderscapesBlocks.POTTED_UMBRAL_FUNGUS); + .add(CinderscapesBlocks.POTTED_CRYSTINIUM) + .add(CinderscapesBlocks.POTTED_LUMINOUS_POD) + .add(CinderscapesBlocks.POTTED_PHOTOFERN) + .add(CinderscapesBlocks.POTTED_POLYPITE_QUARTZ) + .add(CinderscapesBlocks.POTTED_POLYPITE_ROSE_QUARTZ) + .add(CinderscapesBlocks.POTTED_POLYPITE_SMOKY_QUARTZ) + .add(CinderscapesBlocks.POTTED_POLYPITE_SULFUR_QUARTZ) + .add(CinderscapesBlocks.POTTED_PYRACINTH) + .add(CinderscapesBlocks.POTTED_SCORCHED_SHRUB) + .add(CinderscapesBlocks.POTTED_SCORCHED_TENDRILS) + .add(CinderscapesBlocks.POTTED_TWILIGHT_TENDRILS) + .add(CinderscapesBlocks.POTTED_UMBRAL_FUNGUS); getOrCreateTagBuilder(BlockTags.INSIDE_STEP_SOUND_BLOCKS) - .add(CinderscapesBlocks.ASH) - .add(CinderscapesBlocks.SCORCHED_SPROUTS) - .add(CinderscapesBlocks.SCORCHED_TENDRILS) - .add(CinderscapesBlocks.TWILIGHT_FESCUES) - .add(CinderscapesBlocks.TWILIGHT_TENDRILS); + .add(CinderscapesBlocks.ASH) + .add(CinderscapesBlocks.SCORCHED_SPROUTS) + .add(CinderscapesBlocks.SCORCHED_TENDRILS) + .add(CinderscapesBlocks.TWILIGHT_FESCUES) + .add(CinderscapesBlocks.TWILIGHT_TENDRILS); getOrCreateTagBuilder(BlockTags.LOGS) - .add(CinderscapesBlocks.SCORCHED_HYPHAE) - .add(CinderscapesBlocks.SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM) - .add(CinderscapesBlocks.UMBRAL_HYPHAE) - .add(CinderscapesBlocks.UMBRAL_STEM); + .add(CinderscapesBlocks.SCORCHED_HYPHAE) + .add(CinderscapesBlocks.SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM) + .add(CinderscapesBlocks.UMBRAL_HYPHAE) + .add(CinderscapesBlocks.UMBRAL_STEM); getOrCreateTagBuilder(BlockTags.MUSHROOM_GROW_BLOCK) - .add(CinderscapesBlocks.NODZOL); + .add(CinderscapesBlocks.NODZOL); getOrCreateTagBuilder(BlockTags.NETHER_CARVER_REPLACEABLES) - .add(CinderscapesBlocks.UMBRAL_NYLIUM) - .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); + .add(CinderscapesBlocks.UMBRAL_NYLIUM) + .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); getOrCreateTagBuilder(BlockTags.NYLIUM) - .add(CinderscapesBlocks.UMBRAL_NYLIUM); + .add(CinderscapesBlocks.UMBRAL_NYLIUM); getOrCreateTagBuilder(BlockTags.PLANKS) - .add(CinderscapesBlocks.UMBRAL_PLANKS) - .add(CinderscapesBlocks.SCORCHED_PLANKS); + .add(CinderscapesBlocks.UMBRAL_PLANKS) + .add(CinderscapesBlocks.SCORCHED_PLANKS); getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS) - .add(CinderscapesBlocks.SCORCHED_HANGING_SIGN) - .add(CinderscapesBlocks.UMBRAL_HANGING_SIGN); + .add(CinderscapesBlocks.SCORCHED_HANGING_SIGN) + .add(CinderscapesBlocks.UMBRAL_HANGING_SIGN); getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS) - .add(CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN) - .add(CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN); + .add(CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN) + .add(CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN); getOrCreateTagBuilder(BlockTags.STANDING_SIGNS) - .add(CinderscapesBlocks.SCORCHED_SIGN) - .add(CinderscapesBlocks.UMBRAL_SIGN); + .add(CinderscapesBlocks.SCORCHED_SIGN) + .add(CinderscapesBlocks.UMBRAL_SIGN); getOrCreateTagBuilder(BlockTags.WALL_SIGNS) - .add(CinderscapesBlocks.SCORCHED_WALL_SIGN) - .add(CinderscapesBlocks.UMBRAL_WALL_SIGN); + .add(CinderscapesBlocks.SCORCHED_WALL_SIGN) + .add(CinderscapesBlocks.UMBRAL_WALL_SIGN); getOrCreateTagBuilder(BlockTags.SLABS) - .add(CinderscapesBlocks.ROSE_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOKY_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB) - .add(CinderscapesBlocks.SULFUR_QUARTZ_SLAB); + .add(CinderscapesBlocks.ROSE_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOKY_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB) + .add(CinderscapesBlocks.SULFUR_QUARTZ_SLAB); getOrCreateTagBuilder(BlockTags.SMALL_FLOWERS) - .add(CinderscapesBlocks.CRYSTINIUM) - .add(CinderscapesBlocks.PYRACINTH) - .add(CinderscapesBlocks.SCORCHED_TENDRILS) - .add(CinderscapesBlocks.TWILIGHT_TENDRILS); + .add(CinderscapesBlocks.CRYSTINIUM) + .add(CinderscapesBlocks.PYRACINTH) + .add(CinderscapesBlocks.SCORCHED_TENDRILS) + .add(CinderscapesBlocks.TWILIGHT_TENDRILS); getOrCreateTagBuilder(BlockTags.STAIRS) - .add(CinderscapesBlocks.ROSE_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS); + .add(CinderscapesBlocks.ROSE_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS); getOrCreateTagBuilder(BlockTags.WART_BLOCKS) - .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); + .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS) - .add(CinderscapesBlocks.SCORCHED_BUTTON) - .add(CinderscapesBlocks.UMBRAL_BUTTON); + .add(CinderscapesBlocks.SCORCHED_BUTTON) + .add(CinderscapesBlocks.UMBRAL_BUTTON); getOrCreateTagBuilder(BlockTags.WOODEN_DOORS) - .add(CinderscapesBlocks.SCORCHED_DOOR) - .add(CinderscapesBlocks.UMBRAL_DOOR); + .add(CinderscapesBlocks.SCORCHED_DOOR) + .add(CinderscapesBlocks.UMBRAL_DOOR); getOrCreateTagBuilder(BlockTags.WOODEN_FENCES) - .add(CinderscapesBlocks.SCORCHED_FENCE) - .add(CinderscapesBlocks.UMBRAL_FENCE); + .add(CinderscapesBlocks.SCORCHED_FENCE) + .add(CinderscapesBlocks.UMBRAL_FENCE); getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES) - .add(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE) - .add(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE); + .add(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE) + .add(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE); getOrCreateTagBuilder(BlockTags.WOODEN_SLABS) - .add(CinderscapesBlocks.SCORCHED_SLAB) - .add(CinderscapesBlocks.UMBRAL_SLAB); + .add(CinderscapesBlocks.SCORCHED_SLAB) + .add(CinderscapesBlocks.UMBRAL_SLAB); getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS) - .add(CinderscapesBlocks.SCORCHED_STAIRS) - .add(CinderscapesBlocks.UMBRAL_STAIRS); + .add(CinderscapesBlocks.SCORCHED_STAIRS) + .add(CinderscapesBlocks.UMBRAL_STAIRS); getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS) - .add(CinderscapesBlocks.SCORCHED_TRAPDOOR) - .add(CinderscapesBlocks.UMBRAL_TRAPDOOR); + .add(CinderscapesBlocks.SCORCHED_TRAPDOOR) + .add(CinderscapesBlocks.UMBRAL_TRAPDOOR); - // tool block tags + /* + * Tool block tags + */ getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) - .add(CinderscapesBlocks.SCORCHED_HYPHAE) - .add(CinderscapesBlocks.SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM) - .add(CinderscapesBlocks.TWILIGHT_VINE_BLOCK) - .add(CinderscapesBlocks.UMBRAL_FUNGUS) - .add(CinderscapesBlocks.UMBRAL_HYPHAE) - .add(CinderscapesBlocks.UMBRAL_STEM); + .add(CinderscapesBlocks.SCORCHED_HYPHAE) + .add(CinderscapesBlocks.SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM) + .add(CinderscapesBlocks.TWILIGHT_VINE_BLOCK) + .add(CinderscapesBlocks.UMBRAL_FUNGUS) + .add(CinderscapesBlocks.UMBRAL_HYPHAE) + .add(CinderscapesBlocks.UMBRAL_STEM); getOrCreateTagBuilder(BlockTags.HOE_MINEABLE) - .add(CinderscapesBlocks.UMBRAL_FLESH_BLOCK) - .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); + .add(CinderscapesBlocks.UMBRAL_FLESH_BLOCK) + .add(CinderscapesBlocks.UMBRAL_WART_BLOCK); getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) - .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK) - .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK) - .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK) - .add(CinderscapesBlocks.CRYSTALLINE_QUARTZ) - .add(CinderscapesBlocks.CRYSTALLINE_ROSE_QUARTZ) - .add(CinderscapesBlocks.CRYSTALLINE_SMOKY_QUARTZ) - .add(CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ) - .add(CinderscapesBlocks.NODZOL) - .add(CinderscapesBlocks.POLYPITE_QUARTZ) - .add(CinderscapesBlocks.POLYPITE_ROSE_QUARTZ) - .add(CinderscapesBlocks.POLYPITE_SMOKY_QUARTZ) - .add(CinderscapesBlocks.POLYPITE_SULFUR_QUARTZ) - .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK) - .add(CinderscapesBlocks.ROSE_QUARTZ_BRICKS) - .add(CinderscapesBlocks.ROSE_QUARTZ_ORE) - .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR) - .add(CinderscapesBlocks.ROSE_QUARTZ_SLAB) - .add(CinderscapesBlocks.ROSE_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) - .add(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS) - .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE) - .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR) - .add(CinderscapesBlocks.SMOKY_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS) - .add(CinderscapesBlocks.SULFUR_ORE) - .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) - .add(CinderscapesBlocks.SULFUR_QUARTZ_BRICKS) - .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE) - .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR) - .add(CinderscapesBlocks.SULFUR_QUARTZ_SLAB) - .add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS) - .add(CinderscapesBlocks.UMBRAL_NYLIUM); + .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK) + .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK) + .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK) + .add(CinderscapesBlocks.CRYSTALLINE_QUARTZ) + .add(CinderscapesBlocks.CRYSTALLINE_ROSE_QUARTZ) + .add(CinderscapesBlocks.CRYSTALLINE_SMOKY_QUARTZ) + .add(CinderscapesBlocks.CRYSTALLINE_SULFUR_QUARTZ) + .add(CinderscapesBlocks.NODZOL) + .add(CinderscapesBlocks.POLYPITE_QUARTZ) + .add(CinderscapesBlocks.POLYPITE_ROSE_QUARTZ) + .add(CinderscapesBlocks.POLYPITE_SMOKY_QUARTZ) + .add(CinderscapesBlocks.POLYPITE_SULFUR_QUARTZ) + .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK) + .add(CinderscapesBlocks.ROSE_QUARTZ_BRICKS) + .add(CinderscapesBlocks.ROSE_QUARTZ_ORE) + .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR) + .add(CinderscapesBlocks.ROSE_QUARTZ_SLAB) + .add(CinderscapesBlocks.ROSE_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK) + .add(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS) + .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE) + .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR) + .add(CinderscapesBlocks.SMOKY_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOKY_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_SLAB) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ_STAIRS) + .add(CinderscapesBlocks.SULFUR_ORE) + .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK) + .add(CinderscapesBlocks.SULFUR_QUARTZ_BRICKS) + .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE) + .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR) + .add(CinderscapesBlocks.SULFUR_QUARTZ_SLAB) + .add(CinderscapesBlocks.SULFUR_QUARTZ_STAIRS) + .add(CinderscapesBlocks.UMBRAL_NYLIUM); getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE) - .add(CinderscapesBlocks.ASH) - .add(CinderscapesBlocks.ASH_BLOCK); + .add(CinderscapesBlocks.ASH) + .add(CinderscapesBlocks.ASH_BLOCK); - // conventional tags + /* + * Conventional block tags + */ getOrCreateTagBuilder(ConventionalBlockTags.ORES) - .add(CinderscapesBlocks.SULFUR_ORE); + .add(CinderscapesBlocks.SULFUR_ORE); getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) - .add(CinderscapesBlocks.ROSE_QUARTZ_ORE) - .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE) - .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE); + .add(CinderscapesBlocks.ROSE_QUARTZ_ORE) + .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE) + .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE); - getOrCreateTagBuilder(CinderscapesBlockTags.STRIPPED_LOGS) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); - getOrCreateTagBuilder(CinderscapesBlockTags.STRIPPED_WOODS) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE); + getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE); - // local block tags + /* + * Local block tags + */ getOrCreateTagBuilder(CinderscapesBlockTags.ASH_PERMEABLE) - .addTag(BlockTags.NYLIUM) - .add(CinderscapesBlocks.ASH) - .add(CinderscapesBlocks.ASH_BLOCK) - .add(Blocks.BASALT) - .add(Blocks.BEDROCK) - .add(Blocks.BLACKSTONE) - .add(Blocks.GLOWSTONE) - .add(Blocks.GRAVEL) - .add(Blocks.LAVA) - .add(Blocks.NETHERRACK) - .add(CinderscapesBlocks.NODZOL) - .add(Blocks.SOUL_SAND) - .add(Blocks.SOUL_SOIL); + .addTag(BlockTags.NYLIUM) + .add(CinderscapesBlocks.ASH) + .add(CinderscapesBlocks.ASH_BLOCK) + .add(Blocks.BASALT) + .add(Blocks.BEDROCK) + .add(Blocks.BLACKSTONE) + .add(Blocks.GLOWSTONE) + .add(Blocks.GRAVEL) + .add(Blocks.LAVA) + .add(Blocks.NETHERRACK) + .add(CinderscapesBlocks.NODZOL) + .add(Blocks.SOUL_SAND) + .add(Blocks.SOUL_SOIL); getOrCreateTagBuilder(CinderscapesBlockTags.SCORCHED_STEMS) - .add(CinderscapesBlocks.SCORCHED_HYPHAE) - .add(CinderscapesBlocks.SCORCHED_STEM) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM); + .add(CinderscapesBlocks.SCORCHED_HYPHAE) + .add(CinderscapesBlocks.SCORCHED_STEM) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM); getOrCreateTagBuilder(CinderscapesBlockTags.UMBRAL_STEMS) - .add(CinderscapesBlocks.UMBRAL_HYPHAE) - .add(CinderscapesBlocks.UMBRAL_STEM) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); + .add(CinderscapesBlocks.UMBRAL_HYPHAE) + .add(CinderscapesBlocks.UMBRAL_STEM) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM); } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java index 01c04f3..8ec4c9b 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/data/CinderscapesItemTagProvider.java @@ -6,6 +6,7 @@ import com.terraformersmc.cinderscapes.tag.CinderscapesItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; import net.minecraft.item.Items; import net.minecraft.registry.RegistryWrapper; @@ -21,47 +22,49 @@ protected CinderscapesItemTagProvider(FabricDataOutput output, CompletableFuture @Override public void configure(RegistryWrapper.WrapperLookup registries) { - // basic block tags + /* + * Vanilla item tags + */ getOrCreateTagBuilder(ItemTags.FOX_FOOD) - .add(CinderscapesItems.BRAMBLE_BERRIES); + .add(CinderscapesItems.BRAMBLE_BERRIES); copy(BlockTags.LOGS, ItemTags.LOGS); getOrCreateTagBuilder(ItemTags.NON_FLAMMABLE_WOOD) - .add(CinderscapesBlocks.SCORCHED_BUTTON.asItem()) - .add(CinderscapesBlocks.SCORCHED_DOOR.asItem()) - .add(CinderscapesBlocks.SCORCHED_FENCE.asItem()) - .add(CinderscapesBlocks.SCORCHED_FENCE_GATE.asItem()) - .add(CinderscapesBlocks.SCORCHED_HANGING_SIGN.asItem()) - .add(CinderscapesBlocks.SCORCHED_HYPHAE.asItem()) - .add(CinderscapesBlocks.SCORCHED_PLANKS.asItem()) - .add(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE.asItem()) - .add(CinderscapesBlocks.SCORCHED_SIGN.asItem()) - .add(CinderscapesBlocks.SCORCHED_SLAB.asItem()) - .add(CinderscapesBlocks.SCORCHED_STAIRS.asItem()) - .add(CinderscapesBlocks.SCORCHED_STEM.asItem()) - .add(CinderscapesBlocks.SCORCHED_TRAPDOOR.asItem()) - .add(CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN.asItem()) - .add(CinderscapesBlocks.SCORCHED_WALL_SIGN.asItem()) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE.asItem()) - .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM.asItem()) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE.asItem()) - .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM.asItem()) - .add(CinderscapesBlocks.UMBRAL_BUTTON.asItem()) - .add(CinderscapesBlocks.UMBRAL_DOOR.asItem()) - .add(CinderscapesBlocks.UMBRAL_FENCE.asItem()) - .add(CinderscapesBlocks.UMBRAL_FENCE_GATE.asItem()) - .add(CinderscapesBlocks.UMBRAL_HANGING_SIGN.asItem()) - .add(CinderscapesBlocks.UMBRAL_HYPHAE.asItem()) - .add(CinderscapesBlocks.UMBRAL_PLANKS.asItem()) - .add(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE.asItem()) - .add(CinderscapesBlocks.UMBRAL_SIGN.asItem()) - .add(CinderscapesBlocks.UMBRAL_SLAB.asItem()) - .add(CinderscapesBlocks.UMBRAL_STAIRS.asItem()) - .add(CinderscapesBlocks.UMBRAL_STEM.asItem()) - .add(CinderscapesBlocks.UMBRAL_TRAPDOOR.asItem()) - .add(CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN.asItem()) - .add(CinderscapesBlocks.UMBRAL_WALL_SIGN.asItem()); + .add(CinderscapesBlocks.SCORCHED_BUTTON.asItem()) + .add(CinderscapesBlocks.SCORCHED_DOOR.asItem()) + .add(CinderscapesBlocks.SCORCHED_FENCE.asItem()) + .add(CinderscapesBlocks.SCORCHED_FENCE_GATE.asItem()) + .add(CinderscapesBlocks.SCORCHED_HANGING_SIGN.asItem()) + .add(CinderscapesBlocks.SCORCHED_HYPHAE.asItem()) + .add(CinderscapesBlocks.SCORCHED_PLANKS.asItem()) + .add(CinderscapesBlocks.SCORCHED_PRESSURE_PLATE.asItem()) + .add(CinderscapesBlocks.SCORCHED_SIGN.asItem()) + .add(CinderscapesBlocks.SCORCHED_SLAB.asItem()) + .add(CinderscapesBlocks.SCORCHED_STAIRS.asItem()) + .add(CinderscapesBlocks.SCORCHED_STEM.asItem()) + .add(CinderscapesBlocks.SCORCHED_TRAPDOOR.asItem()) + .add(CinderscapesBlocks.SCORCHED_WALL_HANGING_SIGN.asItem()) + .add(CinderscapesBlocks.SCORCHED_WALL_SIGN.asItem()) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_HYPHAE.asItem()) + .add(CinderscapesBlocks.STRIPPED_SCORCHED_STEM.asItem()) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_HYPHAE.asItem()) + .add(CinderscapesBlocks.STRIPPED_UMBRAL_STEM.asItem()) + .add(CinderscapesBlocks.UMBRAL_BUTTON.asItem()) + .add(CinderscapesBlocks.UMBRAL_DOOR.asItem()) + .add(CinderscapesBlocks.UMBRAL_FENCE.asItem()) + .add(CinderscapesBlocks.UMBRAL_FENCE_GATE.asItem()) + .add(CinderscapesBlocks.UMBRAL_HANGING_SIGN.asItem()) + .add(CinderscapesBlocks.UMBRAL_HYPHAE.asItem()) + .add(CinderscapesBlocks.UMBRAL_PLANKS.asItem()) + .add(CinderscapesBlocks.UMBRAL_PRESSURE_PLATE.asItem()) + .add(CinderscapesBlocks.UMBRAL_SIGN.asItem()) + .add(CinderscapesBlocks.UMBRAL_SLAB.asItem()) + .add(CinderscapesBlocks.UMBRAL_STAIRS.asItem()) + .add(CinderscapesBlocks.UMBRAL_STEM.asItem()) + .add(CinderscapesBlocks.UMBRAL_TRAPDOOR.asItem()) + .add(CinderscapesBlocks.UMBRAL_WALL_HANGING_SIGN.asItem()) + .add(CinderscapesBlocks.UMBRAL_WALL_SIGN.asItem()); copy(BlockTags.PLANKS, ItemTags.PLANKS); @@ -76,9 +79,9 @@ public void configure(RegistryWrapper.WrapperLookup registries) { copy(BlockTags.STAIRS, ItemTags.STAIRS); getOrCreateTagBuilder(ItemTags.TRIM_MATERIALS) - .add(CinderscapesItems.ROSE_QUARTZ) - .add(CinderscapesItems.SMOKY_QUARTZ) - .add(CinderscapesItems.SULFUR_QUARTZ); + .add(CinderscapesItems.ROSE_QUARTZ) + .add(CinderscapesItems.SMOKY_QUARTZ) + .add(CinderscapesItems.SULFUR_QUARTZ); copy(BlockTags.WART_BLOCKS, ItemTags.WART_BLOCKS); @@ -97,93 +100,97 @@ public void configure(RegistryWrapper.WrapperLookup registries) { copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); - // conventional tags + /* + * Conventional item tags + */ getOrCreateTagBuilder(ConventionalItemTags.BERRY_FOODS) .add(CinderscapesItems.BRAMBLE_BERRIES); getOrCreateTagBuilder(CinderscapesItemTags.DARK_ASHES_DUSTS) - .add(CinderscapesItems.ASH_PILE); + .add(CinderscapesItems.ASH_PILE); getOrCreateTagBuilder(ConventionalItemTags.DUSTS) - .add(CinderscapesItems.ASH_PILE); + .add(CinderscapesItems.ASH_PILE); getOrCreateTagBuilder(ConventionalItemTags.FOODS) - .add(CinderscapesItems.BRAMBLE_BERRIES); + .add(CinderscapesItems.BRAMBLE_BERRIES); getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS) - .add(Items.QUARTZ) - .add(CinderscapesItems.ROSE_QUARTZ) - .add(CinderscapesItems.SMOKY_QUARTZ) - .add(CinderscapesItems.SULFUR_QUARTZ); + .add(Items.QUARTZ) + .add(CinderscapesItems.ROSE_QUARTZ) + .add(CinderscapesItems.SMOKY_QUARTZ) + .add(CinderscapesItems.SULFUR_QUARTZ); getOrCreateTagBuilder(CinderscapesItemTags.QUARTZ_BLOCKS) - .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.ROSE_QUARTZ_BRICKS.asItem()) - .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR.asItem()) - .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ.asItem()) - .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ.asItem()) - .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_BRICKS.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR.asItem()); + .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.ROSE_QUARTZ_BRICKS.asItem()) + .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_BRICKS.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR.asItem()) + .add(CinderscapesBlocks.SMOOTH_ROSE_QUARTZ.asItem()) + .add(CinderscapesBlocks.SMOOTH_SMOKY_QUARTZ.asItem()) + .add(CinderscapesBlocks.SMOOTH_SULFUR_QUARTZ.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_BRICKS.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR.asItem()); getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_ORES) - .add(CinderscapesBlocks.ROSE_QUARTZ_ORE.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE.asItem()); + .add(CinderscapesBlocks.ROSE_QUARTZ_ORE.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_ORE.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_ORE.asItem()); getOrCreateTagBuilder(ConventionalItemTags.STORAGE_BLOCKS) - .add(CinderscapesBlocks.SULFUR_BLOCK.asItem()); + .add(CinderscapesBlocks.SULFUR_BLOCK.asItem()); getOrCreateTagBuilder(CinderscapesItemTags.STORAGE_BLOCKS_SULFUR) - .add(CinderscapesBlocks.SULFUR_BLOCK.asItem()); + .add(CinderscapesBlocks.SULFUR_BLOCK.asItem()); - copy(CinderscapesBlockTags.STRIPPED_LOGS, CinderscapesItemTags.STRIPPED_LOGS); + copy(ConventionalBlockTags.STRIPPED_LOGS, ConventionalItemTags.STRIPPED_LOGS); - copy(CinderscapesBlockTags.STRIPPED_WOODS, CinderscapesItemTags.STRIPPED_WOODS); + copy(ConventionalBlockTags.STRIPPED_WOODS, ConventionalItemTags.STRIPPED_WOODS); getOrCreateTagBuilder(CinderscapesItemTags.SULFURS_ORES) - .add(CinderscapesBlocks.SULFUR_ORE.asItem()); + .add(CinderscapesBlocks.SULFUR_ORE.asItem()); getOrCreateTagBuilder(CinderscapesItemTags.SULFURS) - .add(CinderscapesItems.SULFUR); + .add(CinderscapesItems.SULFUR); - // local item tags + /* + * Local item tags + */ getOrCreateTagBuilder(CinderscapesItemTags.ROSE_QUARTZ_CONVERTIBLES) - .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR.asItem()); + .add(CinderscapesBlocks.CHISELED_ROSE_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.ROSE_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.ROSE_QUARTZ_PILLAR.asItem()); copy(CinderscapesBlockTags.SCORCHED_STEMS, CinderscapesItemTags.SCORCHED_STEMS); getOrCreateTagBuilder(CinderscapesItemTags.SMOKY_QUARTZ_CONVERTIBLES) - .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR.asItem()); + .add(CinderscapesBlocks.CHISELED_SMOKY_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SMOKY_QUARTZ_PILLAR.asItem()); getOrCreateTagBuilder(CinderscapesItemTags.SULFUR_QUARTZ_CONVERTIBLES) - .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK.asItem()) - .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR.asItem()); + .add(CinderscapesBlocks.CHISELED_SULFUR_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_BLOCK.asItem()) + .add(CinderscapesBlocks.SULFUR_QUARTZ_PILLAR.asItem()); copy(CinderscapesBlockTags.UMBRAL_STEMS, CinderscapesItemTags.UMBRAL_STEMS); // TODO: DEPRECATED as of 1.21 getOrCreateTagBuilder(CinderscapesItemTags.QUARTZ) - .add(Items.QUARTZ) - .add(CinderscapesItems.ROSE_QUARTZ) - .add(CinderscapesItems.SMOKY_QUARTZ) - .add(CinderscapesItems.SULFUR_QUARTZ); + .add(Items.QUARTZ) + .add(CinderscapesItems.ROSE_QUARTZ) + .add(CinderscapesItems.SMOKY_QUARTZ) + .add(CinderscapesItems.SULFUR_QUARTZ); getOrCreateTagBuilder(CinderscapesItemTags.SULFUR_ORES) - .add(CinderscapesBlocks.SULFUR_ORE.asItem()); + .add(CinderscapesBlocks.SULFUR_ORE.asItem()); } } diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java index e3b0786..60adeac 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesBlockTags.java @@ -11,9 +11,6 @@ public class CinderscapesBlockTags { public static final TagKey SCORCHED_STEMS = CinderscapesBlockTags.of("scorched_stems"); public static final TagKey UMBRAL_STEMS = CinderscapesBlockTags.of("umbral_stems"); - public static final TagKey STRIPPED_LOGS = CinderscapesBlockTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOODS = CinderscapesBlockTags.of(Identifier.of("c", "stripped_woods")); - @SuppressWarnings("UnnecessaryReturnStatement") private CinderscapesBlockTags() { return; diff --git a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java index 113e20d..c034dee 100644 --- a/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java +++ b/common/src/main/java/com/terraformersmc/cinderscapes/tag/CinderscapesItemTags.java @@ -17,8 +17,6 @@ public class CinderscapesItemTags { public static final TagKey QUARTZ = CinderscapesItemTags.of(Identifier.of("c", "quartz")); public static final TagKey QUARTZ_BLOCKS = CinderscapesItemTags.of(Identifier.of("c", "quartz_blocks")); public static final TagKey STORAGE_BLOCKS_SULFUR = CinderscapesItemTags.of(Identifier.of("c", "storage_blocks/sulfur")); - public static final TagKey STRIPPED_LOGS = CinderscapesItemTags.of(Identifier.of("c", "stripped_logs")); - public static final TagKey STRIPPED_WOODS = CinderscapesItemTags.of(Identifier.of("c", "stripped_woods")); public static final TagKey SULFUR_ORES = CinderscapesItemTags.of(Identifier.of("c", "sulfur_ores")); public static final TagKey SULFURS_ORES = CinderscapesItemTags.of(Identifier.of("c", "ores/sulfurs")); public static final TagKey SULFURS = CinderscapesItemTags.of(Identifier.of("c", "sulfurs")); diff --git a/gradle.properties b/gradle.properties index d8b744a..216728d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ terraform_surfaces_api_version=12.0.0-alpha.2 terraform_wood_api_version=12.0.0-alpha.2 # Biolith for worldgen module and testing -biolith_version=3.1.0-beta.1 +biolith_version=3.1.0 # Other Things clothconfig_version=16.0.141