diff --git a/build.gradle b/build.gradle index 4f0aa284..df2a29f6 100644 --- a/build.gradle +++ b/build.gradle @@ -226,11 +226,15 @@ jar { from sourceSets.bridge.output // Renamed ASM - from zipTree(tasks.renamedASM.outputs.files[0]) + from zipTree(tasks.renamedASM.outputs.files[0]).matching { + include 'org/spongepowered/asm/lib/*' + include 'org/spongepowered/asm/lib/commons/R*' + include 'org/spongepowered/asm/lib/signature/**' + include 'org/spongepowered/asm/lib/tree/**' + include 'org/spongepowered/asm/lib/util/**' + } exclude 'org/objectweb/**' - exclude 'org/spongepowered/asm/lib/commons/**' - exclude 'org/spongepowered/asm/lib/xml/**' // JAR manifest configuration manifest.mainAttributes( diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java index 595b2380..ce98e7cf 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerInjector.java @@ -40,7 +40,6 @@ import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorExcep import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.obfuscation.mapping.common.MappingField; import org.spongepowered.asm.obfuscation.mapping.common.MappingMethod; -import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.ReferenceManager.ReferenceConflictException; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor.CompilerEnvironment; @@ -191,7 +190,7 @@ class AnnotatedMixinElementHandlerInjector extends AnnotatedMixinElementHandler } else if (target.isImaginary()) { elem.printMessage(this.ap, error, elem + " target requires method signature because enclosing type information for " + target + " is unavailable"); - } else if (!Constants.CTOR.equals(targetMember.name)) { + } else if (!targetMember.isInitialiser()) { elem.printMessage(this.ap, error, "Unable to determine signature for " + elem + " target method"); } return true; @@ -203,8 +202,10 @@ class AnnotatedMixinElementHandlerInjector extends AnnotatedMixinElementHandler if (obfData.isEmpty()) { if (target.isSimulated()) { obfData = this.obf.getDataProvider().getRemappedMethod(targetMethod); + } else if (targetMember.isClassInitialiser()) { + return true; } else { - Kind error = Constants.CTOR.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; + Kind error = targetMember.isConstructor() ? Kind.WARNING : Kind.ERROR; elem.addMessage(error, "No obfuscation mapping for " + targetName, elem.getElement(), elem.getAnnotation()); return false; } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java index c7d880aa..abc6c19a 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationDataProvider.java @@ -31,7 +31,6 @@ import org.spongepowered.asm.obfuscation.mapping.IMapping; import org.spongepowered.asm.obfuscation.mapping.IMapping.Type; import org.spongepowered.asm.obfuscation.mapping.common.MappingField; import org.spongepowered.asm.obfuscation.mapping.common.MappingMethod; -import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationDataProvider; import org.spongepowered.tools.obfuscation.mirror.TypeHandle; @@ -159,7 +158,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { */ @Override public ObfuscationData getObfMethod(MemberInfo method) { - return this.getRemappedMethod(method, Constants.CTOR.equals(method.name)); + return this.getRemappedMethod(method, method.isConstructor()); } @Override @@ -191,7 +190,7 @@ public class ObfuscationDataProvider implements IObfuscationDataProvider { */ @Override public ObfuscationData getObfMethod(MappingMethod method) { - return this.getRemappedMethod(method, Constants.CTOR.equals(method.getSimpleName())); + return this.getRemappedMethod(method, method.isConstructor()); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index 415322e5..fe930499 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -34,6 +34,7 @@ import org.spongepowered.asm.mixin.throwables.MixinException; import org.spongepowered.asm.obfuscation.mapping.IMapping; import org.spongepowered.asm.obfuscation.mapping.common.MappingField; import org.spongepowered.asm.obfuscation.mapping.common.MappingMethod; +import org.spongepowered.asm.util.Constants; import org.spongepowered.asm.util.SignaturePrinter; import com.google.common.base.Strings; @@ -399,6 +400,34 @@ public class MemberInfo { return this.forceField || (this.desc != null && !this.desc.startsWith("(")); } + /** + * Get whether this member represents a constructor + * + * @return true if member name is <init> + */ + public boolean isConstructor() { + return Constants.CTOR.equals(this.name); + } + + /** + * Get whether this member represents a class initialiser + * + * @return true if member name is <clinit> + */ + public boolean isClassInitialiser() { + return Constants.CLINIT.equals(this.name); + } + + /** + * Get whether this member represents a constructor or class initialiser + * + * @return true if member name is <init> or + * <clinit> + */ + public boolean isInitialiser() { + return this.isConstructor() || this.isClassInitialiser(); + } + /** * Perform ultra-simple validation of the descriptor, checks that the parts * of the descriptor are basically sane. diff --git a/src/main/java/org/spongepowered/asm/obfuscation/mapping/common/MappingMethod.java b/src/main/java/org/spongepowered/asm/obfuscation/mapping/common/MappingMethod.java index 5db4abcb..37c8907d 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/mapping/common/MappingMethod.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/mapping/common/MappingMethod.java @@ -25,6 +25,7 @@ package org.spongepowered.asm.obfuscation.mapping.common; import org.spongepowered.asm.obfuscation.mapping.IMapping; +import org.spongepowered.asm.util.Constants; import com.google.common.base.Objects; @@ -75,6 +76,10 @@ public class MappingMethod implements IMapping { return this.desc; } + public boolean isConstructor() { + return Constants.CTOR.equals(this.name); + } + @Override public MappingMethod move(String newOwner) { return new MappingMethod(newOwner, this.getSimpleName(), this.getDesc());