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

Refactor field migration into a more generalized migrator + add metho… #209

Merged
merged 3 commits into from
May 7, 2024

Conversation

shedaniel
Copy link
Member

@shedaniel shedaniel commented May 1, 2024

…d inheritance migrator

Closes #206

This PR offers a different solution to the conflicting mappings issue, instead of changing the namespaces that Loom remaps from, this PR fixes the mapping by dropping conflicting names.

As with the field migrator fix, the fix does not radioactively change the remapped jar, but requires a complete refresh by the user, but this should be fine considering that there should be no current setups with the corresponding NeoForge versions.

The reason for this method instead is how much Loom relies on the intermediary namespace, and that it might cause issues that are tricky to debug or fix.

The PR currently 1. refactors field migrator that it becomes one of the migrators, 2. add a new method inheritance migrator

While this PR is significantly larger in diff, it is mostly in archloom-specific classes

Copy link
Member

@Juuxel Juuxel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks generally fine, didn't take a look at the details of the method inheritance migrator

@Kneelawk
Copy link

Kneelawk commented May 3, 2024

Just tested this in my project. Worked without any issues.

@shedaniel shedaniel merged commit 52b59fe into dev/1.6 May 7, 2024
206 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NeoForge Merges Mojmap Methods Causing Intermediary Mapping Conflicts
3 participants