Commit Graph
557 Commits
Author SHA1 Message Date
modmuss50 b7de0f63ae Java 15/16 support (#44) 2021-02-05 18:04:39 +00:00
536170a946 Allowing injecting in constructor's (#30 #40)
* Allowing injecting in constructor

It is bad to assume that everyone does business logic outside of constructor. We don't want redirect conflict hell

* This should work

Signed-off-by: liach <[email protected]>

* Add notes for easy portin in the future

Signed-off-by: liach <[email protected]>

* Restore build number

* Adopt new versioning scheme

Signed-off-by: liach <[email protected]>

Co-authored-by: liach <[email protected]>
Co-authored-by: liach <[email protected]>
2020-10-26 20:07:59 +00:00
modmuss50 279f1e6957 Merge remote-tracking branch 'remotes/sponge/master' into fabric-0.8
# Conflicts:
#	gradle.properties
2020-10-05 18:59:57 +01:00
Chocohead 01618ecfd0 Fix static shadows for good (#39)
* Experimental fix for SpongePowered/Mixin#431
2020-10-05 18:53:28 +01:00
Mumfrey 4585277f9f Mixin 0.8.2 RELEASE 2020-10-04 21:33:37 +01:00
Mumfrey 9f5191d100 Update to ModLauncher 7.0 - Fixes #439 2020-09-17 11:36:23 +01:00
modmuss50 48833b3c32 Partly revert https://github.com/FabricMC/Mixin/commit/ec491e3b5d131b657bd095652f0d5195cd33a7cf to fix #28 (#33) 2020-08-06 19:33:51 +01:00
modmuss50 e3dedef625 Merge remote-tracking branch 'remotes/SpongePowered/master' into fabric-0.8
# Conflicts:
#	gradle.properties
2020-07-16 23:34:59 +01:00
Mumfrey 1252714215 Properly transform (ignore) method descriptors for primitive array types
Fixes #383
2020-01-24 18:39:23 +00:00
Mumfrey f5536fb5ee Improve logging implicit match failures for ModifyVariable, fixes #382
Also add some scaffolding for adding the same capability to other
injectors
2020-01-23 22:38:36 +00:00
modmuss50 5442b78e67 Merge remote-tracking branch 'remotes/sponge/master' into fabric-0.8
# Conflicts:
#	build.gradle
#	gradle.properties
2020-01-13 17:20:03 +00:00
Mumfrey e32a38e60e Update version to 0.8.1-SNAPSHOT for development 2020-01-10 20:57:26 +00:00
Mumfrey c338f0c7a4 Update build with POM exclusions for older builds and maven repo switch 2020-01-10 18:08:17 +00:00
Mumfrey bd4076714d Provide more useful info when mixin classload is prohibited, closes #376 2020-01-08 21:20:04 +00:00
Mumfrey 8cdc32d1fa Support for Mutable on setter accessors for final fields, closes #378 2020-01-04 16:44:00 +00:00
Jordin cf5a44020a Strip the FINAL flag from all targets 2020-01-03 22:49:36 -04:00
Gabriel Harris-Rouquette b43aaeb356 In retrospect, we can all agree that 1 in fact does not equal 3.
After a lot of scientific consideration, and general consensus, our math
was being managed by the 19th department of the 84th district of
Orwell's General Assertion Testing Authority of Consulate of
Administration. We can in fact clear up the mess after the previous
issues with 2 + 2 being in fact 4, and not 5.

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2020-01-02 17:20:46 -08:00
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