Closer process to Forge Gradle's #86
Closed
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
…re done, merge Jars properly
…rg for merge step, fix patching order issues
|
Closed as #87 basically does this but better |
|
Thanks for this PR btw, it kind of inspired mine 😄 I had been planning a rework to |
|
Glad to help! I thought of adding an additional step to the provider to optionally split the Jars to support single Jar and split Jars, but I thought it would've been out of scope for the PR and just rewriting the provider like you did is a much better way of going about that lol |
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.
This revamps the process of merging and patching by using the userdev and mcp configs more instead of assuming where everything is. This also uses the official userdev patches instead of getting them from the installer jar.
I also changed the userdev classifier to userdev3 for versions lower than 1.13, which can with the rest of the changes allow 1.12.2 or any other legacy FG3 versions to work.
Tested with:
1.12.2 with MCP(with a bit of extra configuring on the mod's part)
1.14.4 with MCP, Mojmaps
1.16.5 with MCP, Mojmaps
1.18.2 with Mojmaps
One side effect of this is now the Forge merged Jars use Forge's annotations, which shouldn't effect anything, but if that's not reasonable then I could post process the merged Jar to replace the annotations with fabric's.
(Note: this also does what #10 does, as I was unable to use MCP mappings for most versions without it.)