diff --git a/gradle.properties b/gradle.properties index 0fc458be..e88e86b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.4.14 +buildVersion=0.4.15 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index d2f4d560..6257d7c0 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -318,7 +318,7 @@ class AnnotatedMixin { if (this.targets.contains(type)) { continue; } - this.targets.add(type); + this.addTarget(type); if (primaryTarget == null) { primaryTarget = type; } @@ -343,7 +343,7 @@ class AnnotatedMixin { this.mixins.printMessage(Kind.ERROR, "Mixin target " + privateTarget + " is public and must be specified in value", this); return null; } - this.targets.add(type); + this.addSoftTarget(type, privateTarget); if (primaryTarget == null) { primaryTarget = type; } @@ -358,7 +358,20 @@ class AnnotatedMixin { return primaryTarget; } + + private void addSoftTarget(TypeHandle type, String reference) { + ObfuscationData obfClassData = this.mixins.getObfClass(type); + if (!obfClassData.isEmpty()) { + this.mixins.addClassMapping(this.classRef, reference, obfClassData); + } + + this.addTarget(type); + } + private void addTarget(TypeHandle type) { + this.targets.add(type); + } + @Override public String toString() { return this.mixin.getSimpleName().toString(); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index af4dae7f..71751044 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -396,6 +396,13 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp return data; } + /** + * Get an obfuscation mapping for a class + */ + public ObfuscationData getObfClass(TypeHandle type) { + return this.getObfClass(type.getName()); + } + /** * Get an obfuscation mapping for a class */ @@ -446,6 +453,15 @@ class AnnotatedMixins implements Messager, ITokenProvider, IOptionProvider, ITyp } } + void addClassMapping(String className, String reference, ObfuscationData obfClassData) { + for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { + String remapped = obfClassData.get(targetEnv.getType()); + if (remapped != null) { + targetEnv.addMapping(className, reference, remapped); + } + } + } + /** * Get the reference mapper */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index 036209b9..d210de57 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.4.14"; + public static final String VERSION = "0.4.15"; /** * Blackboard key where the subsystem version will be stored to indicate diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java index 1b5b0261..9a32bfe0 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinConfig.java @@ -487,6 +487,14 @@ class MixinConfig implements Comparable, IMixinConfig { return this.refMapper; } + String remapClassName(String className, String reference) { +// String remapped = this.plugin != null ? this.plugin.remap(className, reference) : null; +// if (remapped != null) { +// return remapped; +// } + return this.getReferenceMapper().remap(className, reference); + } + /* (non-Javadoc) * @see org.spongepowered.asm.mixin.transformer.IMixinConfig#getPlugin() */ @@ -626,4 +634,5 @@ class MixinConfig implements Comparable, IMixinConfig { throw new IllegalArgumentException(String.format("The specified configuration file '%s' was invalid or could not be read", configFile)); } } + } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index dc5a90c8..1737e0da 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -327,7 +327,12 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { } if (privateTargets != null) { - this.readTargets(targets, privateTargets, suppressPlugin, true); + this.readTargets(targets, Lists.transform(privateTargets, new Function() { + @Override + public String apply(String input) { + return MixinInfo.this.getParent().remapClassName(MixinInfo.this.getClassRef(), input); + } + }), suppressPlugin, true); } return targets;