From bc4219660112e703b5b211418568583518033c80 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Thu, 3 Dec 2015 02:34:46 +0000 Subject: [PATCH] Minor fixes --- .../tools/obfuscation/AnnotatedMixin.java | 6 ++++-- .../obfuscation/InjectionObfuscationProcessor.java | 8 ++------ .../tools/obfuscation/MixinProcessor.java | 13 +++++++++++++ .../obfuscation/TargetObfuscationProcessor.java | 7 +------ .../asm/launch/MixinLaunchAgentFML.java | 3 +-- .../asm/launch/MixinTweakContainer.java | 7 ++++++- .../spongepowered/asm/mixin/MixinEnvironment.java | 2 +- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java index 401427bb..3083d2d4 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixin.java @@ -550,8 +550,10 @@ class AnnotatedMixin { return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); } - String obfName = obfMethod.name.substring(obfMethod.name.lastIndexOf('/') + 1); - MemberInfo remappedReference = new MemberInfo(obfName, this.targetRef, obfMethod.sig, false); + int slashPos = obfMethod.name.lastIndexOf('/'); + String obfName = obfMethod.name.substring(slashPos + 1); + String obfOwner = obfMethod.name.substring(0, slashPos); + MemberInfo remappedReference = new MemberInfo(obfName, obfOwner, obfMethod.sig, false); this.mixins.getReferenceMapper().addMapping(this.classRef, originalReference, remappedReference.toString()); return null; diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java index e07acb5a..2dbd81ac 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/InjectionObfuscationProcessor.java @@ -29,9 +29,6 @@ import java.util.Set; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedOptions; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -39,6 +36,7 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; +import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.Redirect; @@ -48,14 +46,12 @@ import org.spongepowered.tools.MirrorUtils; * Annotation processor which finds {@link Inject} and {@link At} annotations in * mixin classes and generates SRG mappings */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) @SupportedAnnotationTypes({ "org.spongepowered.asm.mixin.injection.Inject", "org.spongepowered.asm.mixin.injection.ModifyArg", "org.spongepowered.asm.mixin.injection.Redirect", "org.spongepowered.asm.mixin.injection.At" }) -@SupportedOptions({ "reobfSrgFile", "outSrgFile", "outRefMapFile" }) public class InjectionObfuscationProcessor extends MixinProcessor { /* (non-Javadoc) @@ -66,7 +62,7 @@ public class InjectionObfuscationProcessor extends MixinProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { if (roundEnv.processingOver()) { - return false; + return true; } this.processMixins(roundEnv); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java index 9d899129..0184fdc8 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/MixinProcessor.java @@ -24,6 +24,8 @@ */ package org.spongepowered.tools.obfuscation; +import java.util.Set; + import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; @@ -35,7 +37,13 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.Mixin; +import com.google.common.collect.ImmutableSet; + public abstract class MixinProcessor extends AbstractProcessor { + + private static final Set supportedOptions = ImmutableSet.of( + "reobfSrgFile", "outSrgFile", "outRefMapFile", "disableTargetValidator" + ); /** * Mixin info manager @@ -82,4 +90,9 @@ public abstract class MixinProcessor extends AbstractProcessor { return super.getSupportedSourceVersion(); } + @Override + public Set getSupportedOptions() { + return MixinProcessor.supportedOptions; + } + } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java index fdbd7ff3..53201a87 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationProcessor.java @@ -28,9 +28,6 @@ import java.util.Set; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedOptions; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -47,9 +44,7 @@ import org.spongepowered.tools.MirrorUtils; * Annotation processor which finds {@link Shadow} and {@link Overwrite} * annotations in mixin classes and generates SRG mappings */ -@SupportedSourceVersion(SourceVersion.RELEASE_6) @SupportedAnnotationTypes({ "org.spongepowered.asm.mixin.Mixin", "org.spongepowered.asm.mixin.Shadow", "org.spongepowered.asm.mixin.Overwrite" }) -@SupportedOptions({ "reobfSrgFile", "outSrgFile", "outRefMapFile", "disableTargetValidator" }) public class TargetObfuscationProcessor extends MixinProcessor { /* (non-Javadoc) @@ -60,7 +55,7 @@ public class TargetObfuscationProcessor extends MixinProcessor { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { if (roundEnv.processingOver()) { - return false; + return true; } this.processMixins(roundEnv); diff --git a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java index 099b0778..c39d1460 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinLaunchAgentFML.java @@ -91,9 +91,8 @@ public class MixinLaunchAgentFML extends MixinLaunchAgentAbstract { return this.injectCorePlugin(); } catch (Exception ex) { - ex.printStackTrace(); + return null; } - return null; } /** diff --git a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java index d140042a..2bf79fa4 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinTweakContainer.java @@ -29,6 +29,9 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import net.minecraft.launchwrapper.Launch; import net.minecraft.launchwrapper.LaunchClassLoader; @@ -46,6 +49,8 @@ public class MixinTweakContainer { MixinTweakContainer.agentClasses.add("org.spongepowered.asm.launch.MixinLaunchAgentDefault"); } + private final Logger logger = LogManager.getLogger("mixin"); + private final URI uri; private final List agents = new ArrayList(); @@ -61,7 +66,7 @@ public class MixinTweakContainer { IMixinLaunchAgent agent = ctor.newInstance(uri); this.agents.add(agent); } catch (Exception ex) { - ex.printStackTrace(); + this.logger.catching(ex); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java index b1294206..6973e578 100644 --- a/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java +++ b/src/main/java/org/spongepowered/asm/mixin/MixinEnvironment.java @@ -211,7 +211,7 @@ public class MixinEnvironment implements ITokenProvider { return name; } - name = this.getSideName("com.mumfrey.liteloader.core.LiteLoader", "getEnvironmentType"); + name = this.getSideName("com.mumfrey.liteloader.launch.LiteLoaderTweaker", "getEnvironmentType"); if (name != null) { return name; }