Commit Graph
896 Commits
Author SHA1 Message Date
modmuss50 d7eda8d709 Bump version 2024-03-03 16:34:52 +00:00
LlamaLad7 e70693a79a New: Allow injection point specifiers anywhere. (#129)
Takes the relevant changes from https://github.com/SpongePowered/Mixin/commit/e02f4cae3fe51d6bd83de5e020956587ead8087c.
2024-03-03 16:34:02 +00:00
LlamaLad7 3eb5281d66 Fix/modifyarg(s) after redirect (#128)
* Fix: Resolve `@Redirect`s breaking `@ModifyArg`.

* Fix: Resolve `@Redirect`s breaking `@ModifyArgs`.
2024-03-03 16:33:50 +00:00
modmuss a57c4fbb43 Publish to maven central (#127) 2024-03-03 16:33:34 +00:00
Matyrobbrt 8caaaaa62d Include the Gson module deps in the module-info (#126)
* Include the Gson module deps in the module-info

* Fully fix modularity

* Update PatternCompiler.java
2024-03-03 16:33:19 +00:00
modmuss 8bb4cfe1a4 Define newer Java versions (#124) 2024-03-03 16:33:04 +00:00
modmuss50 921353610d Bump version 2023-05-04 09:17:50 +01:00
LlamaLad7 cac3570399 Fix: Add a LVT entry for the marshal var in CallbackInjector if necessary.
If the callbackInfo has one already then that's fine since nothing can inject before the duped return value gets replaced by the callbackInfo.
2023-05-04 09:16:43 +01:00
Juuz 1cf8a409f4 proguard.conf: Keep module-info
It's not referenced by other classes, so it gets deleted by default.
See https://stackoverflow.com/a/50541568.
2023-05-04 09:16:34 +01:00
LlamaLad7 755462cd1e Fix: Resolve method references not being correctly remapped in initializers. 2023-05-04 09:16:24 +01:00
modmuss50 4d326c55ae Bump version 2023-02-24 23:18:29 +00:00
LlamaLad7 ccfb5ee089 AP: Fix and simplify checking of factory invoker return types.
We no longer use mirror. The generics are irrelevant in the first place because Mixin does not check them at runtime.
2023-02-24 23:17:57 +00:00
LlamaLad7 7f7dbc1f37 AP: Improve validation of mixin superclasses.
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.
2023-02-24 10:09:18 +00:00
modmuss50 6d715f2f58 Bump version 2023-02-18 13:43:02 +00:00
Chocohead eb8de75e32 Fix adding fields to classes with more than one constructor (#105)
* Fix adding fields to classes with more than one constructor

Got to be careful reusing `Label`s when calculating frames

* Reduce changes relative to upstream

`LabelNode#clone` does the equivalent to `labels.get` anyway, so might as well make it simpler
2023-02-18 13:42:36 +00:00
modmuss50 2e653b3604 Bump version 2023-02-16 20:55:11 +00:00
LlamaLad7 0fb3116c4f AP: Skip superclass validation for imaginary and simulated targets. 2023-02-16 20:54:20 +00:00
modmuss50 45376c2dd2 Bump version 2023-02-16 15:32:52 +00:00
Chocohead d4b07c0e31 Fix implicit accessors and invokers
They get given the handler's name to guess the target field/method, no good if it guessing with the mod suffix too
2023-02-16 15:32:15 +00:00
modmuss50 67997b1a0d Bump version 2023-02-15 22:17:37 +00:00
LlamaLad7 c902985015 Fix resolution of upper bounds of intersection types. 2023-02-15 22:16:19 +00:00
LlamaLad7 e5d9db491a AP: Fix several cases of ASM TypeHandles breaking code that relies on Mirror. 2023-02-15 22:16:19 +00:00
LlamaLad7 c33a48ba5e Prioritise TypeHandleASM when it is available.
Fixes remapping of synthetic members in resolvable classes.
2023-02-15 22:16:19 +00:00
modmuss50 42a2c0ac3a Ensure that the refmap json is reproducible (#100) 2023-02-13 15:17:43 +00:00
0x22 da8566a7d7 Fix InnerClassGenerator not remapping fields. (#98)
* Fix InnerClassGenerator not remapping fields.

* Fix InnerClassGenerator case-insensitive class owner name comparison.
2023-02-13 15:17:14 +00:00
LlamaLad7 9a2b44a675 Allow array creations and jumps in field initializers. (#90) 2023-02-13 15:16:58 +00:00
Chocohead 734e5828f8 Fix package-private unique fields (#94) 2023-02-13 15:16:39 +00:00
Chocohead 57bcdf6119 Fix package-private mixin inheritance some more (#91)
Fixed this for `childSplit` in 974a7599b4cfafa51f49433a7d3456ae0eddd9cf, but not the line immediately below
2023-02-13 15:16:16 +00:00
Chocohead e2c9aa449c Fix unique fields conflicting where they shouldn't (#92)
* Fix unique fields crashing when staticness mismatches an existing field

Fixes SpongePowered/Mixin#576

* Fix mismatching mixin fields silently being dropped

Allowing them to be included will throw a VerifyError
2023-02-13 15:15:56 +00:00
Chocohead f466542370 Auto-prefix mod handlers & unique annotated methods (#97)
Aims to avoid double prefixing where a mod has correctly prefixed already
2023-02-13 15:15:29 +00:00
Chocohead 3bb4cbfaf8 Fix injectors without groups being retained (#99)
Avoids leaking memory after a mixin has been applied
2023-02-13 15:15:00 +00:00
modmuss50 515e6a2d74 Bump the correct version.
Previous build was removed from maven.
2022-05-03 19:15:05 +01:00
modmuss50 455666deb7 Bump version. 2022-05-03 19:09:21 +01:00
Jared 350bf5adcb Rename mixin target mapid system property to fix clashes (#88)
Fabric mixin stores data in a different format than Sponge mixin expects, leading to clashes when both try to read and write to the same file.
2022-05-03 19:08:45 +01:00
Player 20b3cd9036 Bump version 2022-04-01 13:20:04 +02:00
Player 599fd57a15 Add system properties to bypass ServiceLoader mixin service discovery.
Workaround for https://github.com/SpongePowered/Mixin/issues/569
2022-04-01 11:19:31 +00:00
Player a699d81c1e Generalize mod context printing to cover more cases 2022-04-01 11:19:20 +00:00
modmuss50 59d5af0ee7 Bump version. 2022-02-11 16:47:42 +00:00
Player a7ea7a5b35 Fix invalid cross-mixin interaction in interface applicator preparation. (#83)
The previous implementation gathers InjectionInfos for all annotated
methods in the target class, which after a previous injection means that
it'll see injected methods from unrelated mixins if they happen to
target the same class. This caused it to analyze foreign injections
without the proper refmap and mixin association.
2022-02-11 16:47:21 +00:00
modmuss50andshedaniel 0e1bace9a8 Work around https://github.com/SpongePowered/Mixin/issues/560
Co-authored-by: shedaniel <[email protected]>
2022-01-31 20:15:34 +00:00
modmuss50 a9b3e66eea Bump version 2022-01-28 14:32:36 +00:00
modmuss50 63837a0952 Update gradle 2022-01-28 14:14:49 +00:00
shedaniel 345e73663c Fix FabricMC/Mixin#80 2022-01-18 19:50:56 +00:00
modmuss50 03b0b8f571 Merge remote-tracking branch 'SpongePowered/0.8.5'
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java
#	src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationEnvironment.java
#	src/ap/java/org/spongepowered/tools/obfuscation/ReferenceManager.java
#	src/ap/java/org/spongepowered/tools/obfuscation/mapping/common/MappingWriter.java
#	src/ap/java/org/spongepowered/tools/obfuscation/service/ObfuscationServices.java
#	src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java
2021-12-13 16:18:54 +00:00
Mumfrey 155314e6e9 Mixin 0.8.5 RELEASE 2021-12-01 20:33:17 +00:00
Mumfrey a396db8cd1 Update checkstyle 2021-12-01 20:25:07 +00:00
Mumfrey a40e4bc59a Move potemkin generator to buildSrc and switch to groovy 2021-12-01 19:30:51 +00:00
Mumfrey b47627fd01 Merge remote-tracking branch 'origin/pr/538' into 0.8.5 2021-12-01 18:23:59 +00:00
zml 8cd66d8241 build: Synthesize modules to link with multiple versions of libraries
Gson and Guava are both used in pre- and post-modular versions in
environments where Mixin is used on the module path, so we have to be
able to link against both in the compile-time module descriptor.
2021-12-01 08:15:18 -08:00
Player f81f94c3a7 Bump version 2021-11-30 12:39:04 +01:00