Adapt SrgMerger into ForgeMappingsMerger #169
Merged
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
Juuxel
requested changes
Nov 14, 2023
src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java
Outdated
Show resolved
Hide resolved
src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java
Outdated
Show resolved
Hide resolved
src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java
Outdated
Show resolved
Hide resolved
Juuxel
approved these changes
Nov 15, 2023
Juuxel
added a commit
that referenced
this pull request
Nov 17, 2023
* Initial plumbing for NeoForge support * Fix checkstyle * Add ModPlatform.id * Use NeoForge-specific cache * Use NeoForge-specific dependency configuration This is only for the "(neo)forge" configuration exposed as API. The other configurations remain the same. * Add test for basic NeoForge 1.20.2 projects * Implement hacky fast track for NeoForge field migration In other works, we skip field migrating for now. * Disable patched decompilation task on Neo * Disable mixin AP for building on NeoForge * Many changes related to NeoForge mappings and remapping * Code style and related fixes * McpExecutor: Add support for downloading deps via Gradle Also adds support for downloading a file without a repo for NeoForm functions. * Fix wrong configurations being used on NeoForge * Fix mixin version detection on NeoForge * Rename MinecraftPatchedProvider jar paths on NeoForge * Test NeoForge against a client-only MC jar * Add DFU for codecs, support NeoForge run config templates * Centralise userdev config reading, support missing SAS * Set up Shadow for bundling DFU * Use correct name for NeoForm in cache files * RemapJarTask: Fix check using isForgeLike for Forge * MojangMappingsMerger: Complete and reorder mappings * Fix SRG being used on NeoForge * Fix SRG being used on NeoForge for ATs * Use client pipeline for merged to avoid patch issues on Neo * Update to architectury-loom-runtime 2.0 * Fix Minecraft jar name on Neo * Fix MojangMappingsMerger having incomplete names * Fix NeoForge mod dependency remapping using wrong mappings * Quiet down MojangMappingsMerger * Fix (Neo)Forge builtin coremods not being remapped Fixes #146. * Disable deprecated data generation API on NeoForge * Use release version of the forge runtime * Revert "Set up Shadow for bundling DFU" This reverts commit 2bb8166. * Make NeoForge Field Migration work * NeoForge shouldn't try to get datagen mods * Fix checkstyle * Remove mojang maven * Split Forge and NeoForge extensions * SimpleNeoForgeTest: Bump Neo version and fix Yarn version * Remove resolved TODOs * Re-enable joined NeoForm pipeline * MPP: Rename srg -> intermediate jars * Reintroduce namespace filtering for mapping trees Should be a simple optimisation to avoid reading an additional ns. * ForgeRunTemplateTest: Fix code format * Adapt SrgMerger into ForgeMappingsMerger (#169) * Fix crash with NeoForge ext creation * Adapt SrgMerger into ForgeMappingsMerger * Update tiny-remapper * Fix spotless * Resolve reviews * Fix checkstyle * Remap ASMAPI.redirectFieldToMethod (#171) * Remap ASMAPI.redirectFieldToMethod * Move lastClassName outside the if * Fix missing template variables in tests using forge/simple * Add Java version to forge/simple test variables * Disable naming service dependency on Neo * Fix changing patch version not affecting mapped game jars Fixes #167. * Rename configuration: neoforge -> neoForge --------- Co-authored-by: shedaniel <[email protected]>
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.
Should fix mappings conflicts caused by merging Mojang ns.
Generalising the SrgMerger to support both srg and mojang works here.