Commit Graph
715 Commits
Author SHA1 Message Date
Chocohead ed00253bda Fix annotating fields with @Unique (#64)
* Fix annotating fields with unique

Whilst other mixins are taken into account for making methods unique, fields previously did not

* Still compiling to Java 6
2021-09-08 12:39:11 +01:00
Chocohead 65d0d66a93 Allow shadow fields in interfaces (#63)
* Allow shadow fields in interfaces

A bit of a niche use case but apparently one people want

* Missed a tab
2021-09-08 12:39:04 +01:00
modmuss50 24faba3496 Work around #518 (#65) 2021-09-08 11:32:46 +01:00
modmuss50 b7c9b81b04 Merge remote-tracking branch 'SpongePowered/0.8.4'
# Conflicts:
#	build.gradle
#	gradle.properties
2021-09-07 21:59:34 +01:00
Mumfrey 2accda5000 Mixin 0.8.4 RELEASE 2021-09-07 18:49:11 +01:00
Mumfrey c9586f548e Use static module requires because JPMS is just awful 2021-09-06 18:27:28 +01:00
Mumfrey e10ac704e1 Numbers are hard, typing version numbers doubly so... apparently. 2021-09-06 18:27:02 +01:00
zml 87b36f6707 Adjust modularity build configuration to avoid duplicate sources
This allows the shadow task to apply its own merging logic for
resources that are validly duplicated, in this case service files

The checkstyle exclusion for module-info is moved from the
buildscript to checkstyle.xml, for application within IDEs, not just
Gradle.

A small fix to PrettyPrinter is included as well, based on a line
incorrectly converted from log4j2.
2021-08-30 22:53:08 -07:00
modmuss50 dde1ad33a6 Merge remote-tracking branch 'SpongePowered/0.8.4' 2021-08-25 21:25:15 +01:00
Mumfrey 4c7beea14c Separate Profiler instances for things which can operate concurrently 2021-08-25 18:32:27 +01:00
Player 7ce573df03 Emulate 0.9.2 behavior as needed for compatibility 2021-08-22 22:06:29 +00:00
Playerandshedaniel 6bb09f835e Expose mod id in errors
Co-authored-by: shedaniel <[email protected]>
2021-08-22 22:06:29 +00:00
modmuss50 a5743a740a Merge remote-tracking branch 'SpongePowered/0.8.4' 2021-08-20 21:14:56 +01:00
Mumfrey b79b42a460 Make logger adapters more better, do the thing with the vararg throwable 2021-08-19 18:57:30 +01:00
modmuss50 913050a85e Merge remote-tracking branch 'sponge/0.8.4'
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/refmap/RemappingReferenceMapper.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
2021-08-18 21:24:16 +01:00
Mumfrey 212d5d1b35 This isn't even used, appears to be vestigial. Closes #512 2021-08-18 20:45:46 +01:00
Mumfrey d7fc059059 Add missing javadoc to ILogger and clean up javadoc comments from log4j2 2021-08-18 19:17:18 +01:00
Mumfrey 72d0812084 Delegate all logging to service, removing core dependency on log4j2 2021-08-18 18:51:58 +01:00
modmuss50 b78ceb024a Shade guava and gson, remap log4j usage. Update to gradle 7 (#53) 2021-08-16 15:51:40 +01:00
modmuss50 c58c928513 Revert fabric's changes to MixinEnvironment.java 2021-08-14 15:14:10 +01:00
modmuss50 26365db833 Post merge compile fixes. 2021-08-14 14:56:28 +01:00
modmuss50 45917bee6b Merge remote-tracking branch 'sponge/master'
# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
2021-08-14 14:45:50 +01:00
Mumfrey bc06e8bca6 Fix for some locals regressions from 0.8.3 and formalise locals strategy 2021-08-13 19:23:57 +01:00
Mumfrey 89ecec1b48 Updates for newer ASM, support for nesting 2021-08-11 20:47:09 +01:00
Mumfrey 0ad070ad02 Update to gradle 7, ASM 9.2, ModLauncher 9.0.7 add JPMS 2021-08-12 12:46:01 +01:00
LogicFan 75e3e39a83 fix bug on lambda inside interface (#58) 2021-07-17 14:23:03 +01:00
Mumfrey 581c381672 This is not a useful behaviour, ignore missing names in SignaturePrinter 2021-07-13 19:33:34 +01:00
Mumfrey b0cd24bd63 Use more accurate coordinates for ModifyVariable context decorations
Fixes #511
2021-07-13 19:28:04 +01:00
Mumfrey fb0da4dba1 Bump version to 0.8.4-SNAPSHOT 2021-07-13 19:27:57 +01:00
modmuss50 cf0d6242cd Merge remote-tracking branch 'SpongePowered/0.8.3'
# Conflicts:
#	gradle.properties
#	src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java
2021-07-01 19:08:42 +01:00
Mumfrey dfa5a70fc3 Support current fernflower and forgeflower with this one simple trick 2021-06-30 19:12:12 +01:00
Mumfrey 828f9943f5 Use service ClassProvider instead of Class.forName for refmap wrappers 2021-06-30 19:12:12 +01:00
Mumfrey dcc124d487 Don't crash when config package is null, for empty common parent configs 2021-06-30 19:12:12 +01:00
Mumfrey 4827207f64 Make compat warnings less spammy but more verbose. Add MAX_SUPPORTED. 2021-06-30 19:12:12 +01:00
modmuss50 4cd3d1de40 Merge remote-tracking branch 'origin/main' into upstream_merge
# Conflicts:
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java
#	src/main/java/org/spongepowered/asm/mixin/gen/AccessorGenerator.java
#	src/main/java/org/spongepowered/asm/mixin/gen/AccessorGeneratorMethodProxy.java
#	src/main/java/org/spongepowered/asm/mixin/struct/MemberRef.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorInterface.java
2021-06-28 18:15:10 +01:00
Chocohead ef14a841ac Avoid creating CallbackInfos where they are unused (#52)
* Skip passing CallbackInfos to handlers which don't use them

Allegedly can cause measurable differences in hot code

* Fix simple injectors

When only taking a CallbackInfo(Returnable) the slot is unrelated to the target
2021-06-28 17:54:30 +01:00
Chocohead 38825f7bd9 Allow interface Mixins (#51)
* Allow mixining interfaces

Reapplies #13
Fixes #34
Includes (a form of) SpongePowered/Mixin#413 and SpongePowered/Mixin#415

* Fix mods using static vagueness

Whilst SpongePowered/Mixin#415 is generating things more correctly, there are mods (such as Better End) which rely on the current behaviour

* Fix lambdas in interface Mixins

Fixes #43
2021-06-28 17:54:19 +01:00
modmuss50 0ce2d4f8c4 Merge remote-tracking branch 'SpongePowered/0.8.3' into upstream_merge
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java
2021-06-27 10:55:25 +01:00
Mumfrey 07d2c8caea Merge remote-tracking branch 'origin/pr/502' 2021-06-25 18:02:48 +01:00
Mumfrey 40229848d6 Merge remote-tracking branch 'origin/pr/489' 2021-06-25 18:02:27 +01:00
Mumfrey 0dc21a78ee Fix some version checks to properly respect *major* class version 2021-06-25 18:01:27 +01:00
Mumfrey 33c1d2ee0d Fix valid signatures being reported as invalid when using ASM 5 2021-06-25 13:10:01 +01:00
Mumfrey 65b4f9d55a Pass the correct (mutable) targets set to plugins, fixes #485 2021-06-24 20:22:28 +01:00
Mumfrey 4517718cc6 Smarter handling of required compatibility level via heuristic, fix #496 2021-06-22 23:50:49 +01:00
SizableShrimp dd1f1ceff6 Fix TSRGv2 parsing 2021-06-16 18:46:52 -05:00
modmuss50 cf6c9a2e5a Revert part of 11ec11c5f1
We can fix the spam this causes in loader.
2021-06-12 19:49:25 +01:00
Mumfrey b947316d46 Correctly match NULL in BeforeConstant 2021-06-05 16:08:19 +01:00
Mumfrey 99a51998c0 Avoid cross-contaminating injector-added locals by when capturing locals
Fixes #493

Adds a preinject pass to local-capturing injectors so they see only
valid locals. Also decorate mixin-added locals to safeguard against
accidental leakage.
2021-06-05 15:55:17 +01:00
modmuss50 11ec11c5f1 Tweak some log levels 2021-05-28 12:50:46 +01:00
Mumfrey 6994e81622 Use correct class key for lookup into refmap 2021-04-27 13:28:12 +01:00