From 5dc7e64560df3714d234f157052e184b7d955ceb Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 10 Dec 2025 11:40:56 -0700 Subject: [PATCH 1/4] Fix target for mixin extension integration test The test passed when it should not have because it was targeting the wrong class. --- .../extension/mixin/integration/mixins/TargetMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java b/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java index e39a0757..662da85f 100644 --- a/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java +++ b/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java @@ -18,7 +18,7 @@ package net.fabricmc.tinyremapper.extension.mixin.integration.mixins; -import java.lang.annotation.Target; +import net.fabricmc.tinyremapper.extension.mixin.integration.targets.Target; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; From 852702d8160e49866d78a6e86ebcd27d2c23ab3f Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 10 Dec 2025 11:43:33 -0700 Subject: [PATCH 2/4] Apply spotless --- .../extension/mixin/integration/mixins/TargetMixin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java b/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java index 662da85f..d727c94d 100644 --- a/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java +++ b/src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java @@ -18,14 +18,14 @@ package net.fabricmc.tinyremapper.extension.mixin.integration.mixins; -import net.fabricmc.tinyremapper.extension.mixin.integration.targets.Target; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.fabricmc.tinyremapper.extension.mixin.integration.targets.Target; + @Mixin(Target.class) public abstract class TargetMixin { @Inject(method = "*", at = @At(value = "RETURN")) From bc464a6c0849be754aa8fae4d988a8264f167761 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:02:41 -0700 Subject: [PATCH 3/4] Fix #137 regression --- .../tinyremapper/extension/mixin/soft/data/MemberInfo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java index 7f7f2058..184156a0 100644 --- a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java +++ b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java @@ -144,6 +144,12 @@ private String formattedDesc() { return ":" + desc; } + // Wildcards with a name match regardless of descriptor (e.g. `*`) + // But wildcards without a name use the descriptor for matching (e.g. `*()Ljava/lang/String;`) + if (getQuantifier().equals("*") && !getName().isEmpty()) { + return ""; + } + return desc; } } From 9da4e11606e6bfac172e4a86b6945c2bbb5c2ee6 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 10 Dec 2025 12:06:30 -0700 Subject: [PATCH 4/4] Better fix that doesn't break other tests --- .../injection/CommonInjectionAnnotationVisitor.java | 2 +- .../tinyremapper/extension/mixin/soft/data/MemberInfo.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java index d6d6e0f1..762c07f4 100644 --- a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java +++ b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java @@ -191,7 +191,7 @@ public MemberInfo result() { } return collection.stream().findFirst() - .map(pair -> new MemberInfo(data.mapper.asTrRemapper().map(info.getOwner()), pair.first(), info.getQuantifier(), pair.second())) + .map(pair -> new MemberInfo(data.mapper.asTrRemapper().map(info.getOwner()), pair.first(), info.getQuantifier(), info.getDesc().isEmpty() ? "" : pair.second())) .orElse(info); } } diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java index 184156a0..7f7f2058 100644 --- a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java +++ b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/data/MemberInfo.java @@ -144,12 +144,6 @@ private String formattedDesc() { return ":" + desc; } - // Wildcards with a name match regardless of descriptor (e.g. `*`) - // But wildcards without a name use the descriptor for matching (e.g. `*()Ljava/lang/String;`) - if (getQuantifier().equals("*") && !getName().isEmpty()) { - return ""; - } - return desc; } }