Skip to content

Commit b28ed58

Browse files
authored
Fix wildcard remapping regression (#154)
* Fix target for mixin extension integration test The test passed when it should not have because it was targeting the wrong class. * Apply spotless * Fix #137 regression * Better fix that doesn't break other tests
1 parent 49ae7c1 commit b28ed58

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public MemberInfo result() {
191191
}
192192

193193
return collection.stream().findFirst()
194-
.map(pair -> new MemberInfo(data.mapper.asTrRemapper().map(info.getOwner()), pair.first(), info.getQuantifier(), pair.second()))
194+
.map(pair -> new MemberInfo(data.mapper.asTrRemapper().map(info.getOwner()), pair.first(), info.getQuantifier(), info.getDesc().isEmpty() ? "" : pair.second()))
195195
.orElse(info);
196196
}
197197
}

src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/mixins/TargetMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
package net.fabricmc.tinyremapper.extension.mixin.integration.mixins;
2020

21-
import java.lang.annotation.Target;
22-
2321
import org.spongepowered.asm.mixin.Mixin;
2422
import org.spongepowered.asm.mixin.injection.At;
2523
import org.spongepowered.asm.mixin.injection.Inject;
2624
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2725
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
2826

27+
import net.fabricmc.tinyremapper.extension.mixin.integration.targets.Target;
28+
2929
@Mixin(Target.class)
3030
public abstract class TargetMixin {
3131
@Inject(method = "<init>*", at = @At(value = "RETURN"))

0 commit comments

Comments
 (0)