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.4] Sync remaining c tags with NeoForge #4186

Open
wants to merge 46 commits into
base: 1.21.4
Choose a base branch
from
Open

[1.21.4] Sync remaining c tags with NeoForge #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
8195195
Add more chest tags
TelepathicGrunt Oct 13, 2024
6647efc
adjust temperate biome tag
TelepathicGrunt Oct 13, 2024
14604eb
More Cobblestone tags
TelepathicGrunt Oct 13, 2024
0a194ff
end stones tag
TelepathicGrunt Oct 13, 2024
46cf6a9
Gravels tag
TelepathicGrunt Oct 13, 2024
0e2979b
Netherracks tag
TelepathicGrunt Oct 13, 2024
b6d72a9
Add all ores tags for consistency
TelepathicGrunt Oct 13, 2024
7f25335
Ore rates, ore in ground, and ore bearing tags added
TelepathicGrunt Oct 13, 2024
ba8d903
Added sands tags
TelepathicGrunt Oct 13, 2024
7a73791
added bones tag
TelepathicGrunt Oct 13, 2024
f1b76d3
Added eggs tag
TelepathicGrunt Oct 13, 2024
b013b52
Added feathers tag
TelepathicGrunt Oct 13, 2024
0ca15aa
Added gunpowders tag
TelepathicGrunt Oct 13, 2024
e95bfa8
Added mushrooms tag
TelepathicGrunt Oct 13, 2024
2902951
Added nether stars tag
TelepathicGrunt Oct 13, 2024
16cfdc5
Added seeds tags
TelepathicGrunt Oct 13, 2024
beac77f
Added fence and fence gate tags
TelepathicGrunt Oct 13, 2024
cbfb7b0
Added nether and end empty category tags
TelepathicGrunt Oct 13, 2024
883dfe9
Added lush biome tag
TelepathicGrunt Oct 13, 2024
ad7ff14
Added magical tag
TelepathicGrunt Oct 13, 2024
f303543
Added rare biome tag
TelepathicGrunt Oct 13, 2024
a91b876
Added plateau tag
TelepathicGrunt Oct 13, 2024
42c2e72
added spooky biome tag
TelepathicGrunt Oct 13, 2024
4dedf3c
Added sandy tag
TelepathicGrunt Oct 13, 2024
f7fa0e7
Fixed checkstyle issues
TelepathicGrunt Oct 13, 2024
415a2ef
Run datagen
TelepathicGrunt Oct 13, 2024
f84b21c
more javadoc and fixed biomes in temperature tag
TelepathicGrunt Oct 14, 2024
6420a1e
fixed typo in biome temperature tag javadoc
TelepathicGrunt Oct 14, 2024
4f80e0c
attempt at potion tag javadoc
TelepathicGrunt Oct 14, 2024
65b24fa
Add bottled potion subtag
TelepathicGrunt Oct 14, 2024
24be95a
Datagen bottled potion and biome temperature fix
TelepathicGrunt Oct 14, 2024
48b287f
Improved potion javadoc more
TelepathicGrunt Oct 14, 2024
cb3d54d
Changed potion verb to noun
TelepathicGrunt Oct 14, 2024
5e0b19e
Improve potion javadoc to mention data component
TelepathicGrunt Oct 14, 2024
bfdd3ae
special exception for certain biome tag
TelepathicGrunt Oct 25, 2024
5abcc68
checkstyle
TelepathicGrunt Oct 25, 2024
95d06e0
Merge branch '1.21.4' into SyncWithNeoforge2
TelepathicGrunt Dec 12, 2024
9e224a8
added more docs and tagging of pale garden
TelepathicGrunt Dec 13, 2024
c2e9d58
checkstyle
TelepathicGrunt Dec 13, 2024
dd01fb4
Alias fence, fence gate, and ore tags
TelepathicGrunt Dec 13, 2024
52e3a9b
Checkkstyle
TelepathicGrunt Dec 13, 2024
9639490
Tag alias match c format now
TelepathicGrunt Dec 13, 2024
e28c761
Add missing nether stripped stems/hyphae to stripped tags
TelepathicGrunt Dec 13, 2024
a1e9d72
Bottled Potions display name
TelepathicGrunt Dec 13, 2024
4625aaa
improve javadoc to be clear on tag name for ore bearing and or in tags
TelepathicGrunt Dec 15, 2024
a42942c
Trigger Build
TelepathicGrunt Dec 15, 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
91 changes: 74 additions & 17 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 @@ -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