Merge/0.8.6 #141
Merged
Merge/0.8.6 #141
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
Fixes remapping of synthetic members in resolvable classes. (cherry picked from commit c33a48b)
… Mirror. (cherry picked from commit e5d9db4)
(cherry picked from commit c902985)
(cherry picked from commit 0fb3116)
Extending an already-compiled mixin no longer results in an error, and extending (a mixin that targets) your target class does result in an error. (cherry picked from commit 7f7dbc1)
We no longer use mirror. The generics are irrelevant in the first place because Mixin does not check them at runtime. (cherry picked from commit ccfb5ee)
…onment rather than on the Package specification version, since that version is unavailable in two scenarios: 1) ML loaded as a JPMS module and 2) ML added to the classpath using a folder rather than JAR-file.
Chocohead
reviewed
May 19, 2024
|
I've asked Mumfrey to make one other change to support MixinExtras, will wait for his response before doing it here. |
…nd un-deprecate it. The only reason MixinExtras uses this method is to match Redirect's behaviour, so I would like it to be kept in line with that. Additionally, there is nothing wrong with not checking the desc as long as you've definitely found the right `NEW` insn, which the injection point handles itself.
|
Pulled said changes in early here. |
|
The fix to |
modmuss50
approved these changes
Jun 2, 2024
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.
Also pulls in 1 commit from the upcoming 0.8.7 since Mumfrey accidentally broke MixinExtras.
A couple of our changes were reverted to ease the merge of their upstream equivalents.
Generally I tried to reduce the diff where possible.
Works fine in the latest AOF7.
Requires changes in loader to support the new compatibility version.