Commit Graph
540 Commits
Author SHA1 Message Date
Ridan Vandenbergh 910d479864 Merge remote-tracking branch 'remotes/upstream/master' into fabric-0.8
# Conflicts:
#	src/main/java/org/spongepowered/asm/util/asm/ASM.java
2019-12-17 00:02:06 +01:00
Mumfrey e72808fd95 Always conform synthetic methods, even if no immediate conflict detected 2019-12-13 17:25:51 +00:00
Mumfrey a5d9b4e512 Allow Debug(export = true) to work even when verbose logging disabled 2019-12-13 14:22:14 +00:00
Mumfrey 27ea2a9555 Copy INVOKEDYNAMIC args array to avoid leaking handle remaps, fixes #373 2019-12-13 14:21:39 +00:00
Mumfrey a1ab1520d2 Adding javadoc is only worthwhile if the brain is enabled, derp 2019-12-06 16:46:52 +00:00
Mumfrey 66bdb7b3b0 Fix staticness check and functionality of ModifyVariable in constructors 2019-12-06 16:43:12 +00:00
Mumfrey c986828aff Remove agent from further handling if hard fail when accepting container 2019-11-21 18:07:07 +00:00
Mumfrey be3f944af1 Improve detection and reporting of ASM version, fixes reporting of ASM7+ 2019-11-21 17:40:14 +00:00
modmuss50 e3b161a6d1 Merge remote-tracking branch 'remotes/upstream/master' into fabric-0.8
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessorStandard.java
2019-11-15 16:26:15 +00:00
Mumfrey 6d9fcfe635 Better wiring for injector annotations, fixes issue w/missed annotations
ModifyVariable and ModifyConstant were previously missing from declared
annotation types. Now delegate to the same registration logic as runtime
2019-11-15 12:58:06 +00:00
Mumfrey eb7a548f92 Some better logging in MixinService initialisation, for science 2019-11-15 12:48:50 +00:00
Mumfrey 3d58719c75 Add missing null check for audit trail in class generator 2019-11-15 12:47:52 +00:00
Mumfrey 6f65e9f043 Add more detail to activity tracking and some better exception messages 2019-11-15 12:45:31 +00:00
modmuss50 3f31fc88d6 Merge remote-tracking branch 'remotes/upstream/master' into fabric-0.8 2019-11-11 13:29:02 +00:00
Mumfrey 0289a40a57 Demote service bootstrap message to debug since this is expected 2019-11-11 12:17:28 +00:00
modmuss50 00dc1035e8 Merge remote-tracking branch 'remotes/upstream/master' into fabric-0.8 2019-11-09 22:23:48 +00:00
Mumfrey 4108c0fe32 Emit more descriptive error message when companion plugin fails to load 2019-11-09 21:58:16 +00:00
modmuss50 e83dc90edc Revert "Rethrow to ensure the whole stack gets printed to console"
This reverts commit ea2310b7
2019-11-09 20:15:53 +00:00
modmuss50 ea2310b7e5 Rethrow to ensure the whole stack gets printed to console 2019-11-09 20:08:52 +00:00
modmuss50 32fe4ab3cf Merge remote-tracking branch 'remotes/upstream/master' into fabric-0.8 2019-11-09 20:07:03 +00:00
Mumfrey 7568a39941 Remove preview suffix from internal version string 2019-11-09 20:03:40 +00:00
modmuss50 b1a5d6e4c7 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	gradle.properties
2019-11-09 19:20:44 +00:00
Mumfrey d4fa032d7d Add audit trail support for ModLauncher 4.2, update checkstyle 2019-11-09 18:38:45 +00:00
Mumfrey 5ada553610 Adding extra mappings back to FG3 service, also fix build on travis 2019-11-04 20:49:38 +00:00
modmuss50 57eefe4e22 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/injection/callback/CallbackInjector.java
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java
2019-11-03 12:11:33 +00:00
Mumfrey f9e19c32f4 More injector refactoring, allow capture target args in ModifyVariable 2019-11-02 15:29:44 +00:00
Mumfrey 4570a8213e Support for INSTANCEOF opcode in Redirect and ModifyConstant injectors
Fixes #336
2019-10-31 19:33:08 +00:00
Mumfrey 9b51cc7923 Use expect/require values for targets, allowing injectors to be optional
Fixes #297
2019-10-24 17:54:29 +01:00
Mumfrey da74418eca Update hotswapper agent for 0.8 2019-10-24 16:28:34 +01:00
Mumfrey 7b37a681ee Overhaul RedirectInjector for more consistent coerce behaviour
Also improve some javadoc. Closes #350
2019-10-23 18:43:23 +01:00
Mumfrey 03e8ad59f0 Refactor some elements of mixin service into new smaller components
The main goal here is to reduce the amount of boilerplate required when
providing out simple implementations of the mixin service. Some mixin
end users are using extremely simple environments and this reduces the
boilerplate code in those implementations.
2019-10-16 17:17:43 +01:00
Mumfrey 22909dcfa2 Detect & report transformer reentrance during config prepare, fixes #333 2019-10-16 16:31:10 +01:00
Mumfrey 7567dec1d8 Continue applying mixins if an optional mixin is invalid, fixes #313 2019-10-15 15:20:22 +01:00
Mumfrey 4120c80a8a Allow Coerce annotation to coerce args to interfaces too. Update README 2019-10-14 17:45:40 +01:00
Mumfrey 5c995b21de Clean CallbackInfo from locals and fix CallbackInjector local args logic
Fixes #337
2019-10-14 17:44:35 +01:00
modmuss50 ef8ae94b06 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8 2019-10-12 19:15:21 +01:00
Mumfrey 08980b28a4 Remove missed debugging statements from previous commit 2019-10-12 18:40:46 +01:00
Mumfrey ac01029add Improve stack and local extension logic for injectors, fixes #368 2019-10-12 16:46:19 +01:00
Mumfrey fa94ab4b31 Detect out-of-date custom injection points and report a useful error 2019-10-11 23:00:23 +01:00
Mumfrey 35778141b9 Merge remote-tracking branch 'origin/pr/328' into 0.8 2019-10-11 22:16:15 +01:00
modmuss50 9581844f0c ASM 7.2 - Java 14 2019-10-11 21:03:13 +01:00
modmuss50 ed1a103051 Merge remote-tracking branch 'remotes/upstream/0.8' into fabric-0.8
# Conflicts:
#	build.gradle
#	src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java
2019-10-11 20:58:42 +01:00
Mumfrey 002e5288e8 Add an ASM detector and support backwards compatibility with ASM 5.x 2019-10-11 19:26:04 +01:00
Mumfrey 22ae7dd1f9 Fix LVT resolution with compressed frames and two related minor bugs 2019-10-11 17:59:53 +01:00
Mumfrey b8638b2340 Add min compat and max compat to service, warn when exceeding max compat 2019-10-11 17:58:17 +01:00
Mumfrey b00992e411 Minor tweaks and fixes 2019-10-11 17:57:08 +01:00
Mumfrey 9d684bacd4 Propagate injection info exceptions correctly 2019-10-11 17:54:40 +01:00
Mumfrey 57d5655f73 Update for ModLauncher 4.0, remove ugly hax, connectors now via manifest 2019-09-29 21:34:42 +01:00
Mumfrey a15897221b Minor tweaks to AP internals 2019-09-19 21:21:15 +01:00
Mumfrey 5ea23f8bb0 Accept needs to be called before init. Propagate exception message.
Closes #360
2019-09-18 19:15:36 +01:00