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.

Sign up for GitHub

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

Jump to bottom

Merge/0.8.7 #151

Merged
merged 28 commits into from
Jul 9, 2024
Merged

Merge/0.8.7 #151

merged 28 commits into from
Jul 9, 2024

Conversation

LlamaLad7
Copy link
Collaborator

  • Requires loader changes to support the new overload of IClassBytecodeProvider#getClassNode.
  • Reverts some changes in favour of their upstream equivalents.
  • The runtime produces an acceptable .mixin.out diff relative to 0.8.6 in AOF7
  • The AP builds a working FAPI 1.21

Mumfrey and others added 28 commits May 14, 2024 20:34
@Mumfrey
Bump version to 0.8.7-SNAPSHOT
a95dcd9
@Mumfrey
Restore old findInitNodeFor used by MixinExtras, mark as deprecated
902c343
@Mumfrey
Convert EXPAND_FRAMES ClassReader flag to tunable, default to 0
a13f0c0
@Mumfrey
Replace zip-based ML legacy VirtualJar shim with inline SecureJar shim
e212511
@Mumfrey
Don't create logger in MixinServiceAbstract ctor, updates SpongePower…
54f3644 
…ed#569
@Mumfrey
Propagate argument offsets when applying Redirect, closes SpongePower…
b04e6d6 
…ed#544
@Mumfrey
Really only linear offsets are supported with base assumption
0816867
@Mumfrey
Apply injectors in discrete phases, ensure Redirects always go last(ish)
a2751aa
@Mumfrey
Run all preinject operations before starting any actual injections
1f34ee9
@LlamaLad7
Change: Add stack checking to old Target#findInitNodeFor overload a…
02bf3d2 
…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.
@Mumfrey
Allow authors to specify order on injector annotations
02d7470
@Mumfrey
Merge remote-tracking branch 'origin/pr/667'
1bae530
@Mumfrey
Fix bug with option flags from previous commit
2d14c78
@Mumfrey
Fix AP file writer issue with non-file outputs, fixed SpongePowered#622
a362aad
@Mumfrey
Add fuzz and skip options to AfterInvoke, closes SpongePowered#653
8f0bb79
@Mumfrey
Display correct node type in printLocals
d2105c6
@Mumfrey
Propagate local context through compounds via decoration, closes Spon…
017eecf 
…gePowered#532
@Mumfrey
Use ClassReader flags tunable for metadata ClassNodes too, updates Sp…
96e81bb 
…ongePowered#671
@Mumfrey
Handle offset arg window correctly for ModifyArg injector, updates Sp…
0239904 
…ongePowered#544
@Mumfrey
Handle offset arg window correctly for ModifyArgs injector, updates S…
0c79de4 
…pongePowered#544
@Mumfrey
Use InjectorOrder.DEFAULT for field, fixes third-party injector order
c8be3ca
@Mumfrey
Properly handle empty args window and report name of the original method
7d7d4dc
@Mumfrey
Mixin 0.8.7 RELEASE
4053421
@LlamaLad7
Revert "Use 0 as class reader flags in Modlauncher bytecode provider (#…
60aa12f 
…137)"

This reverts commit e779303.
@LlamaLad7
Revert "Fix: Check the staticness of the original call not the curren…
b20b9b3 
…t one. (#132)"

This reverts commit 8c8ece2.
@LlamaLad7
Revert "Fix/modifyarg(s) after redirect (#128)"
96b758d 
This reverts commit 3eb5281
@LlamaLad7
Merge branch 'refs/heads/0.8.7' into merge/0.8.7
55670f2 
# Conflicts:
#	gradle.properties
#	src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java
@LlamaLad7
Build: Bump version.
7f00ee3
@LlamaLad7 LlamaLad7 requested a review from sfPlayer1 July 9, 2024 15:12
@modmuss50 modmuss50 merged commit 9aca17d into main Jul 9, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@modmuss50 modmuss50 modmuss50 approved these changes

@sfPlayer1 sfPlayer1 Awaiting requested review from sfPlayer1

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LlamaLad7 @modmuss50 @Mumfrey