Remove mergetool api from libraries #4
Merged
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.
Removes the mergetool api from MCPConfig libraries, because it's not used anywhere.
The mergetool runtime used during setup already includes the api, and 1.11 forge ships the side api classes as well.
By removing this dependency, we also fix 2 issues related to FG runs:
Mergetool api classes conflicting with forge
If mergetool's
Sideclass is loaded first, it will crashNetworkRegistrywhich only expectsCLIENTandSERVERsides to exist, while this version also containsBUKKIT.Mod discoverer
IllegalArgumentExceptionMergetool api depends on ASM 6, which contains a module descriptor. If FML tries to scan that module descriptor with its older version of ASM, it will throw an exception.