Undo bad 1.21 merge changes#4697
Merged
gustovafing merged 83 commits intoGregTechCEu:1.21from Feb 26, 2026
Merged
Conversation
…ble enchants if there aren't any innate enchants)
…amespace (presumably because of a merging mistake?)
…hod for adding 'active' namespaces to them
gustovafing
approved these changes
Feb 26, 2026
Member
|
Build fails. |
…into a separate PR
also because of the GTResourceLocation changes
Contributor
Author
Fixed |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
This PR undoes some 'bad'/otherwise wrong changes & reverts done by the recent 1.20 -> 1.21 merges.
Implementation Details
copy old versions of code, removed a ton of duplicate data components, etc.
Full list of changes is below:
-devsuffix from the production JAR files (output of the gradlejartask). that's there on 1.20 because of obfuscation, but NeoForge deobfuscates Minecraft on startup and thus all mod jars depend on deobfuscated code. No "development" vs "production" differences there anymore.Outcome
Mod should work at least as well on 1.21 as it did before.
For example, equipping nanosuit armor on the latest 1.21 snapshot would spam your log with errors because the new synced key mapping handler wasn't initialized properly. That's fixed now.
How Was This Tested
Launched game after every code change, checked it works. As far as I can tell, it does.
Additional Information
Please put the 'ignore changelogs' label on this PR, it probably shouldn't show up in there.
Potential Compatibility Issues
None that weren't there before AFAIK