Commit Graph
903 Commits
Author SHA1 Message Date
makamys bd35b79c99 Bump version 0.12.0_mixin.0.8.5 2023-03-04 19:32:47 +01:00
makamys e1f361a6ea Merge remote-tracking branch 'FabricMC/main' 2023-03-04 19:26:38 +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
makamys 1e2c81f248 Bump version 0.11.9_mixin.0.8.5 2023-02-13 20:08:46 +01:00
makamys f593528beb Revert "Implement fabric-modId decorations for Forge mods"
I'm moving this inside UniMixins instead, to mirror how Fabric keeps the
decoration initialization code inside Fabric loader.

This reverts commit 24c5ac4009.
2023-02-13 19:15:07 +01: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
makamys 49f99c87cc Bump version 0.11.8_mixin.0.8.5 2023-02-12 02:11:05 +01:00
makamys 444feb414e Fix checkstyle violations 2023-02-12 02:06:14 +01:00
makamys 7317ae474f Bump version 2023-02-12 01:52:27 +01:00
makamys 24c5ac4009 Implement fabric-modId decorations for Forge mods 2023-02-12 01:50:53 +01:00
makamys 6f074ea1d9 Implement toString for GlobalProperties$Keys
Fixes the mixin environment config property keys having strange names
(e.g. org.spongepowered.asm.launch.GlobalProperties$Keys@fcd6521.preinit)
2023-02-12 01:50:41 +01:00
makamys fdcec19583 Update javadoc for the reparseable coremod handling
There was a small inaccuracy in the commit message of a8217ef280:
Everything I said about "extra mods" also applies to mod directory
mods (FML treats the two sets as one).
2023-02-11 18:51:19 +01:00
makamys df8fafd78a Bump version 0.11.6_mixin.0.8.5 0.11.6+mixin.0.8.5 0.11.6 2023-02-09 03:12:28 +01:00
makamys a8217ef280 Don't add classpath mods to FML reparseable coremod collection
As proposed in https://github.com/SpongePowered/Mixin/issues/207

Fixes mods on the class path containing mixins not getting loaded as mods in a
1.7.10 development environment.

Background information:

Discovery of Forge mods roughly happens in the following 2 steps:

1. `findClassPathMods`: Discover Forge mods on the class path which are not in
the coremod list or the reparseable coremod list.

2. `findModDirMods`: Discover Forge mods that are in the mod directory, or
specified as *extra mods* using `--mods`.

It appears that the purpose of the reparseable mod list is to prevent a mod from
being discovered in both of the steps. This would happen with extra mods
containing both a coremod and a Forge mod, since they get injected into the
class path during coremod discovery (but since they get marked as reparseable,
this is avoided.)

Mixin needs to make sure the mod gets discovered in exactly one of the steps. We
can achieve this by only adding it to the reparseable list if it's not on the
boot class path. This causes only extra mods to get added.
2023-02-09 02:23:52 +01:00
makamys 5dc0ee5963 Add NPE protection to RemapperAdapter
In 59db546c22, IRemapper's contract was changed
so that mapMethodName and mapFieldName may be called with null arguments,
but RemapperAdapterFML was not changed to be able to handle this, causing a
NPE to happen in this case.

This commit adds an opt-in way for RemapperAdapter implementations to request
that the remapper should immediately no-op when invoked with null arguments,
and makes RemapperAdapterFML use it.
2023-02-08 23:21:38 +01:00
makamys 42f2bd0f2c Reimplement mcp-to-mcp remapping using the remapper chain
This was removed in 59db546c22, which caused
refmaps to get mapped to SRG but not back in 1.7.10 development environments.

This commit reimplements it using the remapper chain API.
2023-02-08 23:21:26 +01:00
makamys 36f9481a39 Bump version 2023-02-04 01:43:42 +01:00
makamys 730fe636ad Merge in GasMix changes 2023-02-04 01:43:36 +01:00
makamys ccfac24f02 Change group to legacymoddingmc 2023-02-03 18:20:16 +01: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