Skip to content

Commit

Permalink
Add additional 'c' tags (#4186)
Browse files Browse the repository at this point in the history 
* Add more chest tags

* adjust temperate biome tag

* More Cobblestone tags

* end stones tag

* Gravels tag

* Netherracks tag

* Add all ores tags for consistency

* Ore rates, ore in ground, and ore bearing tags added

* Added sands tags

* added bones tag

* Added eggs tag

* Added feathers tag

* Added gunpowders tag

* Added mushrooms tag

* Added nether stars tag

* Added seeds tags

* Added fence and fence gate tags

* Added nether and end empty category tags

* Added lush biome tag

* Added magical tag

* Added rare biome tag

* Added plateau tag

* added spooky biome tag

* Added sandy tag

* Fixed checkstyle issues

* Run datagen

* more javadoc and fixed biomes in temperature tag

* fixed typo in biome temperature tag javadoc

* attempt at potion tag javadoc

* Add bottled potion subtag

* Datagen bottled potion and biome temperature fix

* Improved potion javadoc more

* Changed potion verb to noun

* Improve potion javadoc to mention data component

* special exception for certain biome tag

* checkstyle

* added more docs and tagging of pale garden

* checkstyle

* Alias fence, fence gate, and ore tags

* Checkkstyle

* Tag alias match c format now

* Add missing nether stripped stems/hyphae to stripped tags

* Bottled Potions display name

* improve javadoc to be clear on tag name for ore bearing and or in tags

* Trigger Build
  • Loading branch information
@TelepathicGrunt
TelepathicGrunt authored Dec 24, 2024
1 parent d70d2c0 commit cbf6036
Show file tree
Hide file tree
Showing 149 changed files with 1,848 additions and 107 deletions.
91 changes: 74 additions & 17 deletions ...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java
View file
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 @@ -169,27 +175,36 @@ 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.PALE_GARDEN)
.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.PALE_GARDEN)
.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 @@ -201,16 +216,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 @@ -221,8 +239,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 @@ -257,8 +279,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 @@ -272,25 +298,56 @@ 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)
.add(BiomeKeys.GROVE);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE)
.add(BiomeKeys.FOREST)
.add(BiomeKeys.WINDSWEPT_FOREST)
.add(BiomeKeys.FLOWER_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
.add(BiomeKeys.DARK_FOREST)
.add(BiomeKeys.PALE_GARDEN)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
.add(BiomeKeys.WINDSWEPT_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE)
.addOptionalTag(ConventionalBiomeTags.IS_JUNGLE);
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)
.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.PALE_GARDEN)
.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.PALE_GARDEN)
.add(BiomeKeys.DEEP_DARK);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_FLORAL)
.add(BiomeKeys.SUNFLOWER_PLAINS)
.add(BiomeKeys.MEADOW)
Expand Down
Loading

0 comments on commit cbf6036

Please sign in to comment.