[Loom 1.6] Fix NeoForge mapping issues with NeoForge interfaces #207
Conversation
This file contains 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
Jab125
changed the title
|
I would like to add that the test I added only works on Java 21+, and when running on a version lower than Java 21, the test effectively skips itself. |
|
Does this have any impact on the name that vanilla lambdas get assigned? |
Juuxel
requested changes
Apr 23, 2024
src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
Outdated
Show resolved
Hide resolved
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MergedMinecraftProvider.java
Show resolved
Hide resolved
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/SplitMinecraftProvider.java
Show resolved
Hide resolved
.../fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
Outdated
Show resolved
Hide resolved
...et/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
Show resolved
Hide resolved
src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1205Test.groovy
Outdated
Show resolved
Hide resolved
src/test/groovy/net/fabricmc/loom/test/integration/neoforge/NeoForge1205Test.groovy
Outdated
Show resolved
Hide resolved
Lambdas appear to get intermediary names, such as |
|
The test may need to be special cased to only run on Java 21. |
Co-authored-by: Juuz <[email protected]>
desht
added a commit
to FTBTeam/FTB-Library
that referenced
this pull request
Apr 30, 2024
Compiles and runs, not heavily tested yet ItemStack "NBT" editing still works, even with components; component data is serialized to NBT for the NBT editor, and deserialized back to the stack if changes are made Arch FluidStack.empty() currently broken (returning null, causes crashes in fluid selection screens) Won't work with NeoForge 20.6.3-beta or later due to arch/neoforge mappings issues (see architectury/architectury-loom#207) No MinecraftForge support at all yet
|
Superseded by #209 |
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.
Closes #206
This pull request fixes any issues introduced with neoforged/NeoForge#835, due to
ClientCommonPacketListenerImpl#sendandServerCommonPacketListenerImpl#sendhaving differentintermediaryandofficialnames by skipping theintermediaryandofficialremaps entirely, instead remapping straight frommojangtonamed.If an alternate mapping set has the same names for both
net.minecraft.class_8673.method_52787andnet.minecraft.class_8609.method_14364, which Yarn does (sendPacket), then the remapper will be able to successfully apply the name change to the interface and everything just works.The decompiled output might be slightly off at times, but everything will compile fine.