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.

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

Merged
merged 38 commits into from
Feb 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
38 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
6ab5800
backport adjustments and egg PR
TelepathicGrunt Feb 16, 2025
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
Prev Previous commit
Next Next commit
Added nether stars tag
TelepathicGrunt committed Oct 13, 2024

Verified

This commit was signed with the committer’s verified signature.
vitalvas Vitaliy Vasylenko
commit c4af34a6d96fb7f9f2ef650b07ed558b38c61d89
Original file line number Diff line number Diff line change
@@ -376,6 +376,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalItemTags.FEATHERS, "Feathers");
translationBuilder.add(ConventionalItemTags.GUNPOWDERS, "Gunpowders");
translationBuilder.add(ConventionalItemTags.MUSHROOMS, "Mushrooms");
translationBuilder.add(ConventionalItemTags.NETHER_STARS, "Nether Stars");
translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs");
translationBuilder.add(ConventionalItemTags.RODS, "Rods");
translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods");
Original file line number Diff line number Diff line change
@@ -771,6 +771,9 @@ private void generateOtherTags() {
.add(Items.RED_MUSHROOM)
.add(Items.BROWN_MUSHROOM);

getOrCreateTagBuilder(ConventionalItemTags.NETHER_STARS)
.add(Items.NETHER_STAR);

getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS)
.add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR,
Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD,
Original file line number Diff line number Diff line change
@@ -370,6 +370,7 @@ private ConventionalItemTags() {
* Small mushroom items. Not the full block forms.
*/
public static final TagKey<Item> MUSHROOMS = register("mushrooms");
public static final TagKey<Item> NETHER_STARS = register("nether_stars");
/**
* For music disc-like materials to be used in recipes.
* A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag.