-
-
Notifications
You must be signed in to change notification settings - Fork 187
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
Tag cleanup and additions for 1.21 #1030
Tag cleanup and additions for 1.21 #1030
Conversation
Closes neoforged#993 Closes neoforged#919
Last commit published: 9763f8c50ce8a3d12362598c96dffe616eaefa87. PR PublishingThe artifacts published by this PR:
Repository DeclarationIn order to use the artifacts published by the PR, add the following repository to your buildscript: repositories {
maven {
name 'Maven for PR #1030' // https://github.com/neoforged/NeoForge/pull/1030
url 'https://prmaven.neoforged.net/NeoForge/pr1030'
content {
includeModule('net.neoforged', 'neoforge')
includeModule('net.neoforged', 'testframework')
}
}
} MDK installationIn order to setup a MDK using the latest PR version, run the following commands in a terminal. mkdir NeoForge-pr1030
cd NeoForge-pr1030
curl -L https://prmaven.neoforged.net/NeoForge/pr1030/net/neoforged/neoforge/21.0.35-beta-pr-1030-TagAdjustments1.21/mdk-pr1030.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip To test a production environment, you can download the installer from here. |
@TelepathicGrunt is it possible to add |
@Spinoscythe There's a bit more to that tag than just existing. If added, and a modder adds to the tag, nothing happens. So every modder adding to that tag has to override the wolf variant files to point to the tag. Which is a bit weird for a modloaders to force modders to do. So instead, adding wolf variant tags means modloaders would need to override the wolf variant files to point to the new c tags. The datapackers would use the same tag and they would be overriding the wolf variant files themselves. But modders wouldn't need to do the overriding. However, the question becomes, is this vanilla behavior change something Neoforge and Fabric want to do? Well, behavior change that it points to a new tag that uses the same content as the old tag. The in-game behavior would be same by default |
also, what's stopping us from doing this in 20.6? |
I would love to see more discussions on this. |
removing/replacing tags (this this PR is doing) that both loaders should be sharing is a bit better to do with new mc version imo. And wolf variant tags would require messing with vanilla files so that could break people's expectations. Also, 1.21 is coming pretty soon too so seems better to plan for it and give time for people to discuss their stances and options |
Tool tags were misspelled. so instead of |
Closes neoforged#993 Closes neoforged#919
@Technici4n Apologies. Had forgot to add the 1.21 music discs when I updated this to 1.21 branch. Ready to merge now with your approval |
* Fix new tags not being plural Fixes #3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
* Fix new tags not being plural Fixes FabricMC/fabric#3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
* Fix new tags not being plural Fixes FabricMC/fabric#3807 Matches neoforged/NeoForge#1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <[email protected]> * regen data --------- Co-authored-by: haykam821 <[email protected]>
With 1.21 shaping up to be another large breaking change for many modders, we can use this for our advantage to do some tag cleanup work. This is paired up with this PR: FabricMC/fabric#3807
The changes includes:
Adding a
c:music_discs
tag since vanilla is removingminecraft:music_discs
in 1.21. A log warning was added for this so people know they can migrate over to the c tag for music disc stuff that should not be reliant on the JUKEBOX_PLAYABLE item component.raw_blocks
item tags are removed because thestorage_blocks
tag for the raw blocks already exist and is the same. Log warning added for this migration cleanup. The removal of these tags should reduce confusion in this area for modders.Removed Eroded Badlands from Sparse Vegetation Overworld since the biome has no trees at all and that normal badllands and desert isn't in the tag in first place.
Tool tags were misspelled. So instead of
c:tools/bows
, it should had beenc:tools/bow
because tools is the noun to be plural and bow is the adjective. So it would read as Bow Tools instead of the awkward Bows Tools.Added Shulker Boxes item tag, Glazed Terracotta block/item tag, Concrete block/item tag, Concrete Powder item tag.
Please comment here if there's any change here that you dislike or love! Or if you have suggestions of new tags to add, to sync from other loader, or should also be removed/adjusted.
See the below issue reports for more details and reasoning for each of this PR's changes:
Closes #993
Closes #919