Commit Graph
681 Commits
Author SHA1 Message Date
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
Mumfrey 6e807085d8 Fix for the original fix for #480, which actually fixes #480 2021-04-26 13:04:21 +01:00
Mumfrey 5f51f16bb5 Do not strip checkcasts for local 0 in static methods, fixes #471 2021-04-20 19:15:36 +01:00
Mumfrey 09b23eae8c Better descriptor validation and trap unexpected desc errors, fixes #461 2021-04-21 13:32:05 +01:00
Patrick Hofmann c820b3d2e0 Allows < and > to be written as characters instead of unicode codes 2021-04-17 22:36:56 -05:00
Mumfrey 5c9d20fe22 Detect side using getDist if launch handler name doesn't impl side
Closes #473
2021-04-15 18:29:06 +01:00
Mumfrey 8a5c69134d Add 'quiet' option to AP to silence informational messages 2021-04-15 18:05:10 +01:00
Mumfrey b496c02efe Remap At targets more intelligently, fixes #483 2021-04-15 17:35:08 +01:00
Mumfrey 6f5dce173b Fix for the fix for computing frames which now fixes #481 and fixes #482 2021-04-14 19:31:06 +01:00
Mumfrey 9109a19d5e Fixes for regressions related to selectors, fixes #479, fixes #480 2021-04-13 21:22:35 +01:00
Mumfrey b1cd46c8c4 Remove now-redundant overload for match 2021-03-17 21:21:09 +00:00
Mumfrey 29c6cc03f4 Some refactoring and finalise contract impl of ITargetSelector::next 2021-03-17 02:33:05 +00:00
Mumfrey 088e8bcf61 Fix some deprecations 2021-03-01 23:40:24 +00:00
Mumfrey 4e4c72ee22 Some more minor javadoc improvements, update README 2021-02-25 18:39:06 +00:00
Mumfrey e9f7d752f2 Refactoring so that service impls don't need to camp on transformer pkg 2021-02-24 22:18:08 +00:00
Mumfrey 57055a150e Use correct (configured) selector in BeforeInvoke 2021-02-20 14:40:08 +00:00
Mumfrey b5200b0537 Allow injection points and dynamic selectors to be defined in mixin pkgs
Temp implementation until access control is moved to service in 0.9
2021-02-18 20:47:12 +00:00
Mumfrey 6f35fe1ded Finalise desc selector and javadoc, enhancements to explicit selector 2021-02-14 21:33:06 +00:00
modmuss50 2049942353 Java 17 support/ASM 9.1 2021-02-12 18:33:10 +00:00
modmuss50 1e9b0b9a9e Fix log messages still being logged, update shadow plugin. 2021-02-07 20:34:05 +00:00
Mumfrey c1aec0fb49 Show the javadoc some love and a bit of a facelift, improve some docs
Closes #457, closes #446
2021-02-06 01:14:07 +00:00
modmuss50 b7de0f63ae Java 15/16 support (#44) 2021-02-05 18:04:39 +00:00
modmuss50 f124d71f38 Shutup the AP when building, all this is stuff is usually useless log output. (#45) 2021-02-05 18:04:22 +00:00
Mumfrey ef6422f26e Flesh out Desc selector javadoc and functionality 2021-02-03 20:54:12 +00:00
Mumfrey f9aeec8b05 Bump version to 0.8.3-SNAPSHOT 2021-01-31 23:04:13 +00:00
Mumfrey 21881482ae WIP but mostly working Desc selector functionality 2021-01-31 23:00:25 +00:00
Mumfrey 2ef2417de6 Fix formatting in MixinConfig 2021-01-23 21:33:20 +00:00
LexManos dc3b91512b Introduce refMap Wappers 2021-01-23 21:31:15 +00:00
Mumfrey 08d6c7067d Add support for dynamic and pattern target selectors 2021-01-23 21:19:13 +00:00
Mumfrey 922eacb357 Fix unexpected AIOOBE with empty handler signatures, fixes #411 2020-12-23 19:50:08 +00:00
Mumfrey f87008208c Use staticness of invoker for arg offset, fixes #444 2020-12-23 19:22:15 +00:00
Mumfrey 3ccc611e5e Use full annotation class names when resolving injectors, fixes #443 2020-12-23 18:47:37 +00:00
Mumfrey e8dd9239e0 Ensure that all accessor annotations are correctly decorated, fixes #430 2020-12-23 18:34: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
Mumfrey 4f51eb5571 Strip out-of-bounds shifts from injection point results, fixes #409 2020-10-18 16:15:46 +01:00