Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21.1] Sync remaining c tags with NeoForge #4161

Open
wants to merge 37 commits into
base: 1.21.1
Choose a base branch
from
Open

[1.21.1] Sync remaining c tags with NeoForge #4161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3cb6741
Add more chest tags
TelepathicGrunt Oct 13, 2024
d85d74f
adjust temperate biome tag
TelepathicGrunt Oct 13, 2024
9485c05
More Cobblestone tags
TelepathicGrunt Oct 13, 2024
87cd331
end stones tag
TelepathicGrunt Oct 13, 2024
6f58e17
Gravels tag
TelepathicGrunt Oct 13, 2024
832dc06
Netherracks tag
TelepathicGrunt Oct 13, 2024
07b096d
Add all ores tags for consistency
TelepathicGrunt Oct 13, 2024
a07ebd6
Ore rates, ore in ground, and ore bearing tags added
TelepathicGrunt Oct 13, 2024
cff626f
Added sands tags
TelepathicGrunt Oct 13, 2024
2f6001a
added bones tag
TelepathicGrunt Oct 13, 2024
62e1be5
Added eggs tag
TelepathicGrunt Oct 13, 2024
1508cc6
Added feathers tag
TelepathicGrunt Oct 13, 2024
117c8ca
Added gunpowders tag
TelepathicGrunt Oct 13, 2024
710fec6
Added mushrooms tag
TelepathicGrunt Oct 13, 2024
c4af34a
Added nether stars tag
TelepathicGrunt Oct 13, 2024
43c6198
Added seeds tags
TelepathicGrunt Oct 13, 2024
d5f8cfb
Added fence and fence gate tags
TelepathicGrunt Oct 13, 2024
88e8adc
Added nether and end empty category tags
TelepathicGrunt Oct 13, 2024
b708729
Added lush biome tag
TelepathicGrunt Oct 13, 2024
1994820
Added magical tag
TelepathicGrunt Oct 13, 2024
025acf8
Added rare biome tag
TelepathicGrunt Oct 13, 2024
2fcd4d7
Added plateau tag
TelepathicGrunt Oct 13, 2024
38efc6b
added spooky biome tag
TelepathicGrunt Oct 13, 2024
7653b61
Added sandy tag
TelepathicGrunt Oct 13, 2024
60a6414
Fixed checkstyle issues
TelepathicGrunt Oct 13, 2024
611b66e
Run datagen
TelepathicGrunt Oct 13, 2024
5236d2d
more javadoc and fixed biomes in temperature tag
TelepathicGrunt Oct 14, 2024
63f469c
fixed typo in biome temperature tag javadoc
TelepathicGrunt Oct 14, 2024
5d0a7ae
attempt at potion tag javadoc
TelepathicGrunt Oct 14, 2024
b98b9b3
Add bottled potion subtag
TelepathicGrunt Oct 14, 2024
ef27c6c
Datagen bottled potion and biome temperature fix
TelepathicGrunt Oct 14, 2024
f006a2b
Improved potion javadoc more
TelepathicGrunt Oct 14, 2024
7af6e54
Changed potion verb to noun
TelepathicGrunt Oct 14, 2024
ffb18fa
Improve potion javadoc to mention data component
TelepathicGrunt Oct 14, 2024
a4941f9
Merge branch '1.21.1' into SyncWithNeoforgeTag
TelepathicGrunt Oct 15, 2024
3477bd7
special exception for certain biome tag
TelepathicGrunt Oct 25, 2024
207fd19
checkstyle
TelepathicGrunt Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 69 additions & 14 deletions ...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ private void generateCategoryTags() {
.add(BiomeKeys.FROZEN_RIVER)
.add(BiomeKeys.DEEP_FROZEN_OCEAN)
.add(BiomeKeys.FROZEN_OCEAN);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_SANDY)
.add(BiomeKeys.DESERT)
.add(BiomeKeys.BADLANDS)
.add(BiomeKeys.WOODED_BADLANDS)
.add(BiomeKeys.ERODED_BADLANDS)
.add(BiomeKeys.BEACH);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY)
.add(BiomeKeys.SNOWY_BEACH)
.add(BiomeKeys.SNOWY_PLAINS)
Expand Down Expand Up @@ -166,26 +172,35 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.END_MIDLANDS)
.add(BiomeKeys.END_HIGHLANDS)
.add(BiomeKeys.END_BARRENS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_NETHER);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD)
.addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD);
.addTag(ConventionalBiomeTags.IS_COLD_OVERWORLD)
.addTag(ConventionalBiomeTags.IS_COLD_NETHER)
.addTag(ConventionalBiomeTags.IS_COLD_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD)
.add(BiomeKeys.FOREST)
.add(BiomeKeys.PLAINS)
.add(BiomeKeys.SUNFLOWER_PLAINS)
.add(BiomeKeys.SWAMP)
.add(BiomeKeys.STONY_SHORE)
.add(BiomeKeys.DARK_FOREST)
.add(BiomeKeys.WINDSWEPT_FOREST)
.add(BiomeKeys.FOREST)
.add(BiomeKeys.FLOWER_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
.add(BiomeKeys.DARK_FOREST)
.add(BiomeKeys.CHERRY_GROVE)
.add(BiomeKeys.MEADOW)
.add(BiomeKeys.PLAINS);
.add(BiomeKeys.SWAMP)
.add(BiomeKeys.MANGROVE_SWAMP)
.add(BiomeKeys.BEACH)
.add(BiomeKeys.OCEAN)
.add(BiomeKeys.DEEP_OCEAN);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_NETHER);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_END);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE)
.addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD);
.addTag(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD)
.addTag(ConventionalBiomeTags.IS_TEMPERATE_NETHER)
.addTag(ConventionalBiomeTags.IS_TEMPERATE_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD)
.add(BiomeKeys.SWAMP)
.add(BiomeKeys.MANGROVE_SWAMP)
.add(BiomeKeys.JUNGLE)
.add(BiomeKeys.BAMBOO_JUNGLE)
.add(BiomeKeys.SPARSE_JUNGLE)
Expand All @@ -197,16 +212,19 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.SAVANNA_PLATEAU)
.add(BiomeKeys.WINDSWEPT_SAVANNA)
.add(BiomeKeys.STONY_PEAKS)
.add(BiomeKeys.MUSHROOM_FIELDS)
.add(BiomeKeys.WARM_OCEAN);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_NETHER)
.add(BiomeKeys.NETHER_WASTES)
.add(BiomeKeys.CRIMSON_FOREST)
.add(BiomeKeys.WARPED_FOREST)
.add(BiomeKeys.SOUL_SAND_VALLEY)
.add(BiomeKeys.BASALT_DELTAS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_END);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT)
.addTag(ConventionalBiomeTags.IS_HOT_OVERWORLD)
.addTag(ConventionalBiomeTags.IS_HOT_NETHER);
.addTag(ConventionalBiomeTags.IS_HOT_NETHER)
.addTag(ConventionalBiomeTags.IS_HOT_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_OVERWORLD)
.add(BiomeKeys.SWAMP)
Expand All @@ -217,8 +235,12 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.BEACH)
.add(BiomeKeys.LUSH_CAVES)
.add(BiomeKeys.DRIPSTONE_CAVES);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_NETHER);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET_END);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_WET)
.addTag(ConventionalBiomeTags.IS_WET_OVERWORLD);
.addTag(ConventionalBiomeTags.IS_WET_OVERWORLD)
.addTag(ConventionalBiomeTags.IS_WET_NETHER)
.addTag(ConventionalBiomeTags.IS_WET_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_DRY_OVERWORLD)
.add(BiomeKeys.DESERT)
Expand Down Expand Up @@ -252,8 +274,12 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.JUNGLE)
.add(BiomeKeys.BAMBOO_JUNGLE)
.add(BiomeKeys.MANGROVE_SWAMP);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_END);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD);
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_NETHER)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_DENSE_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD)
.add(BiomeKeys.WOODED_BADLANDS)
Expand All @@ -267,8 +293,12 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.SNOWY_SLOPES)
.add(BiomeKeys.JAGGED_PEAKS)
.add(BiomeKeys.FROZEN_PEAKS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_END);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD);
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_NETHER)
.addOptionalTag(ConventionalBiomeTags.IS_VEGETATION_SPARSE_END);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE)
.addOptionalTag(ConventionalBiomeTags.IS_TAIGA)
Expand All @@ -285,6 +315,31 @@ private void generateClimateAndVegetationTags() {
getOrCreateTagBuilder(ConventionalBiomeTags.IS_SAVANNA_TREE)
.addOptionalTag(ConventionalBiomeTags.IS_SAVANNA);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_LUSH)
.add(BiomeKeys.LUSH_CAVES);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_MAGICAL);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_RARE)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im not sure about the rare biomes or the ore rates, as they have nothing to do with the tags. You could have a another datapack that invalidates these. Whats a use case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much like storage block tags that can be invalidated by datapacks, it is on the modpack maker to adjust any relevant tags when they are customizing their modpacks so personally, that angle, I think is fine.

For biome rarity, some mods seems to target these biomes for uncommon ores or mobs. Not many but a few. Like Alex's Mobs seems to add Mungus to these rare tagged biomes. There's Create Arcane Engineering that adds Aurum, Ferrum, and other ores to rare biomes. Resourceful Bees spawns their easter egg Oreo Bee in rare biomes. Ice and Fire spawns their Pixie Village in rare biomes as well. So there's some use cases for targeting biome that are infrequent/difficult to find by default. And then if pack makers make a biome more or less common, they would adjust the is_rare tag to reflect the new change,

For ore_rates, I had the same thought as you of who even uses this. Turns out Tinker's uses it quite a bit. I'll ping @KnightMiner to come talk about his usages for that. RCXcrafter said he should be using ore rates tag but haven't done so yet. If packs changes the rates, they should adjust the tags too.

.add(BiomeKeys.SUNFLOWER_PLAINS)
.add(BiomeKeys.FLOWER_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA)
.add(BiomeKeys.BAMBOO_JUNGLE)
.add(BiomeKeys.SPARSE_JUNGLE)
.add(BiomeKeys.ERODED_BADLANDS)
.add(BiomeKeys.SAVANNA_PLATEAU)
.add(BiomeKeys.WINDSWEPT_SAVANNA)
.add(BiomeKeys.ICE_SPIKES)
.add(BiomeKeys.WINDSWEPT_GRAVELLY_HILLS)
.add(BiomeKeys.MUSHROOM_FIELDS)
.add(BiomeKeys.DEEP_DARK);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLATEAU)
.add(BiomeKeys.WOODED_BADLANDS)
.add(BiomeKeys.SAVANNA_PLATEAU)
.add(BiomeKeys.CHERRY_GROVE)
.add(BiomeKeys.MEADOW);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_SPOOKY)
.add(BiomeKeys.DARK_FOREST)
.add(BiomeKeys.DEEP_DARK);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL)
.add(BiomeKeys.SUNFLOWER_PLAINS)
.add(BiomeKeys.MEADOW)
Expand Down
159 changes: 144 additions & 15 deletions ...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,25 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
.add(Blocks.GRANITE)
.add(Blocks.TUFF)
.add(Blocks.DEEPSLATE);
getOrCreateTagBuilder(ConventionalBlockTags.COBBLESTONES)
.add(Blocks.COBBLESTONE)
.add(Blocks.MOSSY_COBBLESTONE)
.add(Blocks.COBBLED_DEEPSLATE)
getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_COBBLESTONES)
.add(Blocks.COBBLESTONE);
getOrCreateTagBuilder(ConventionalBlockTags.MOSSY_COBBLESTONES)
.add(Blocks.MOSSY_COBBLESTONE);
getOrCreateTagBuilder(ConventionalBlockTags.INFESTED_COBBLESTONES)
.add(Blocks.INFESTED_COBBLESTONE);
getOrCreateTagBuilder(ConventionalBlockTags.DEEPSLATE_COBBLESTONES)
.add(Blocks.COBBLED_DEEPSLATE);
getOrCreateTagBuilder(ConventionalBlockTags.COBBLESTONES)
.addOptionalTag(ConventionalBlockTags.NORMAL_COBBLESTONES)
.addOptionalTag(ConventionalBlockTags.MOSSY_COBBLESTONES)
.addOptionalTag(ConventionalBlockTags.INFESTED_COBBLESTONES)
.addOptionalTag(ConventionalBlockTags.DEEPSLATE_COBBLESTONES);
getOrCreateTagBuilder(ConventionalBlockTags.NETHERRACKS)
.add(Blocks.NETHERRACK);
getOrCreateTagBuilder(ConventionalBlockTags.END_STONES)
.add(Blocks.END_STONE);
getOrCreateTagBuilder(ConventionalBlockTags.GRAVELS)
.add(Blocks.GRAVEL);
getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_OBSIDIANS)
.add(Blocks.OBSIDIAN);
getOrCreateTagBuilder(ConventionalBlockTags.CRYING_OBSIDIANS)
Expand All @@ -76,28 +90,99 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
.addOptionalTag(ConventionalBlockTags.NORMAL_OBSIDIANS)
.addOptionalTag(ConventionalBlockTags.CRYING_OBSIDIANS);

getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES)
.add(Blocks.NETHER_QUARTZ_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.COAL_ORES)
.addOptionalTag(BlockTags.COAL_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.COPPER_ORES)
.addOptionalTag(BlockTags.COPPER_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.DIAMOND_ORES)
.addOptionalTag(BlockTags.DIAMOND_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.EMERALD_ORES)
.addOptionalTag(BlockTags.EMERALD_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.GOLD_ORES)
.addOptionalTag(BlockTags.GOLD_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.IRON_ORES)
.addOptionalTag(BlockTags.IRON_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.LAPIS_ORES)
.addOptionalTag(BlockTags.LAPIS_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.NETHERITE_SCRAP_ORES)
.add(Blocks.ANCIENT_DEBRIS);
getOrCreateTagBuilder(ConventionalBlockTags.REDSTONE_ORES)
.addOptionalTag(BlockTags.REDSTONE_ORES);
getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES)
.add(Blocks.NETHER_QUARTZ_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORES)
.addOptionalTag(BlockTags.COAL_ORES)
.addOptionalTag(BlockTags.COPPER_ORES)
.addOptionalTag(BlockTags.DIAMOND_ORES)
.addOptionalTag(BlockTags.EMERALD_ORES)
.addOptionalTag(BlockTags.GOLD_ORES)
.addOptionalTag(BlockTags.IRON_ORES)
.addOptionalTag(BlockTags.LAPIS_ORES)
.addOptionalTag(ConventionalBlockTags.COAL_ORES)
.addOptionalTag(ConventionalBlockTags.COPPER_ORES)
.addOptionalTag(ConventionalBlockTags.DIAMOND_ORES)
.addOptionalTag(ConventionalBlockTags.EMERALD_ORES)
.addOptionalTag(ConventionalBlockTags.GOLD_ORES)
.addOptionalTag(ConventionalBlockTags.IRON_ORES)
.addOptionalTag(ConventionalBlockTags.LAPIS_ORES)
.addOptionalTag(ConventionalBlockTags.NETHERITE_SCRAP_ORES)
.addOptionalTag(BlockTags.REDSTONE_ORES)
.addOptionalTag(ConventionalBlockTags.REDSTONE_ORES)
.addOptionalTag(ConventionalBlockTags.QUARTZ_ORES);

getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_DEEPSLATE)
.add(Blocks.DEEPSLATE);
getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_NETHERRACK)
.add(Blocks.NETHERRACK);
getOrCreateTagBuilder(ConventionalBlockTags.ORE_BEARING_GROUND_STONE)
.add(Blocks.STONE);
getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_DENSE)
.add(Blocks.COPPER_ORE)
.add(Blocks.DEEPSLATE_COPPER_ORE)
.add(Blocks.DEEPSLATE_LAPIS_ORE)
.add(Blocks.DEEPSLATE_REDSTONE_ORE)
.add(Blocks.LAPIS_ORE)
.add(Blocks.REDSTONE_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_SINGULAR)
.add(Blocks.ANCIENT_DEBRIS)
.add(Blocks.COAL_ORE)
.add(Blocks.DEEPSLATE_COAL_ORE)
.add(Blocks.DEEPSLATE_DIAMOND_ORE)
.add(Blocks.DEEPSLATE_EMERALD_ORE)
.add(Blocks.DEEPSLATE_GOLD_ORE)
.add(Blocks.DEEPSLATE_IRON_ORE)
.add(Blocks.DIAMOND_ORE)
.add(Blocks.EMERALD_ORE)
.add(Blocks.GOLD_ORE)
.add(Blocks.IRON_ORE)
.add(Blocks.NETHER_QUARTZ_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORE_RATES_SPARSE)
.add(Blocks.NETHER_GOLD_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_DEEPSLATE)
.add(Blocks.DEEPSLATE_COAL_ORE)
.add(Blocks.DEEPSLATE_COPPER_ORE)
.add(Blocks.DEEPSLATE_DIAMOND_ORE)
.add(Blocks.DEEPSLATE_EMERALD_ORE)
.add(Blocks.DEEPSLATE_GOLD_ORE)
.add(Blocks.DEEPSLATE_IRON_ORE)
.add(Blocks.DEEPSLATE_LAPIS_ORE)
.add(Blocks.DEEPSLATE_REDSTONE_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_NETHERRACK)
.add(Blocks.NETHER_GOLD_ORE)
.add(Blocks.NETHER_QUARTZ_ORE);
getOrCreateTagBuilder(ConventionalBlockTags.ORES_IN_GROUND_STONE)
.add(Blocks.COAL_ORE)
.add(Blocks.COPPER_ORE)
.add(Blocks.DIAMOND_ORE)
.add(Blocks.EMERALD_ORE)
.add(Blocks.GOLD_ORE)
.add(Blocks.IRON_ORE)
.add(Blocks.LAPIS_ORE)
.add(Blocks.REDSTONE_ORE);

getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_CHESTS)
.add(Blocks.CHEST)
.add(Blocks.TRAPPED_CHEST);
getOrCreateTagBuilder(ConventionalBlockTags.TRAPPED_CHESTS)
.add(Blocks.TRAPPED_CHEST);
getOrCreateTagBuilder(ConventionalBlockTags.ENDER_CHESTS)
.add(Blocks.ENDER_CHEST);
getOrCreateTagBuilder(ConventionalBlockTags.CHESTS)
.addTag(ConventionalBlockTags.WOODEN_CHESTS)
.add(Blocks.ENDER_CHEST);
.addTag(ConventionalBlockTags.TRAPPED_CHESTS)
.addTag(ConventionalBlockTags.ENDER_CHESTS);
getOrCreateTagBuilder(ConventionalBlockTags.BOOKSHELVES)
.add(Blocks.BOOKSHELF);
generateGlassTags();
Expand All @@ -112,6 +197,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {

generateSandstoneTags();

generateFenceAndFenceGateTags();

generateDyedTags();

generateStorageTags();
Expand Down Expand Up @@ -143,7 +230,49 @@ private void generateMiscTags() {
getOrCreateTagBuilder(ConventionalBlockTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
}

private void generateFenceAndFenceGateTags() {
getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_FENCES)
.add(Blocks.OAK_FENCE)
.add(Blocks.SPRUCE_FENCE)
.add(Blocks.BIRCH_FENCE)
.add(Blocks.JUNGLE_FENCE)
.add(Blocks.ACACIA_FENCE)
.add(Blocks.DARK_OAK_FENCE)
.add(Blocks.CRIMSON_FENCE)
.add(Blocks.WARPED_FENCE)
.add(Blocks.MANGROVE_FENCE)
.add(Blocks.BAMBOO_FENCE)
.add(Blocks.CHERRY_FENCE);
getOrCreateTagBuilder(ConventionalBlockTags.NETHER_BRICK_FENCES)
.add(Blocks.NETHER_BRICK_FENCE);
getOrCreateTagBuilder(ConventionalBlockTags.FENCES)
.addOptionalTag(ConventionalBlockTags.WOODEN_FENCES)
.addOptionalTag(ConventionalBlockTags.NETHER_BRICK_FENCES);
getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_FENCE_GATES)
.add(Blocks.OAK_FENCE_GATE)
.add(Blocks.SPRUCE_FENCE_GATE)
.add(Blocks.BIRCH_FENCE_GATE)
.add(Blocks.JUNGLE_FENCE_GATE)
.add(Blocks.ACACIA_FENCE_GATE)
.add(Blocks.DARK_OAK_FENCE_GATE)
.add(Blocks.CRIMSON_FENCE_GATE)
.add(Blocks.WARPED_FENCE_GATE)
.add(Blocks.MANGROVE_FENCE_GATE)
.add(Blocks.BAMBOO_FENCE_GATE)
.add(Blocks.CHERRY_FENCE_GATE);
getOrCreateTagBuilder(ConventionalBlockTags.FENCE_GATES)
.addOptionalTag(ConventionalBlockTags.WOODEN_FENCE_GATES);
}

private void generateSandstoneTags() {
getOrCreateTagBuilder(ConventionalBlockTags.COLORLESS_SANDS)
.add(Blocks.SAND);
getOrCreateTagBuilder(ConventionalBlockTags.RED_SANDS)
.add(Blocks.RED_SAND);
getOrCreateTagBuilder(ConventionalBlockTags.SANDS)
.addOptionalTag(ConventionalBlockTags.COLORLESS_SANDS)
.addOptionalTag(ConventionalBlockTags.RED_SANDS);

getOrCreateTagBuilder(ConventionalBlockTags.SANDSTONE_BLOCKS)
.addOptionalTag(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS)
.addOptionalTag(ConventionalBlockTags.RED_SANDSTONE_BLOCKS);
Expand Down
Loading
Loading