diff --git a/gradle.properties b/gradle.properties index e88e86b9..44adeeac 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.15 +buildVersion=0.4.16 buildType=SNAPSHOT diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java index 79c272d4..657dca67 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixins.java @@ -151,7 +151,7 @@ class AnnotatedMixins implements IMixinAnnotationProcessor, ITokenProvider, ITyp new TargetValidator(this) ); - this.initTokenCache(this.getOption("tokens")); + this.initTokenCache(this.getOption(SupportedOptions.TOKENS)); } protected TargetMap initTargetMap() { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java index 5df85f3b..17528c5e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationType.java @@ -24,20 +24,27 @@ */ package org.spongepowered.tools.obfuscation; +import java.util.List; + import org.spongepowered.tools.obfuscation.interfaces.IOptionProvider; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList.Builder; + enum ObfuscationType { - SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.OUT_SRG_SRG_FILE), - NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.OUT_NOTCH_SRG_FILE); + SRG("searge", SupportedOptions.REOBF_SRG_FILE, SupportedOptions.REOBF_EXTRA_SRG_FILES, SupportedOptions.OUT_SRG_SRG_FILE), + NOTCH("notch", SupportedOptions.REOBF_NOTCH_FILE, SupportedOptions.REOBF_EXTRA_NOTCH_FILES, SupportedOptions.OUT_NOTCH_SRG_FILE); private final String key; private final String srgFileArgName; + private final String extraSrgFilesArgName; private final String outSrgFileArgName; - private ObfuscationType(String displayName, String srgFileArgName, String outSrgFileArgName) { + private ObfuscationType(String displayName, String srgFileArgName, String extraSrgFilesArgName, String outSrgFileArgName) { this.key = displayName; this.srgFileArgName = srgFileArgName; + this.extraSrgFilesArgName = extraSrgFilesArgName; this.outSrgFileArgName = outSrgFileArgName; } @@ -54,6 +61,10 @@ enum ObfuscationType { return this.srgFileArgName; } + public String getExtraSrgFilesOption() { + return this.extraSrgFilesArgName; + } + public String getOutputSrgFileOption() { return this.outSrgFileArgName; } @@ -64,11 +75,25 @@ enum ObfuscationType { } public boolean isSupported(IOptionProvider options) { - return this.getSrgFileName(options) != null; + return this.getSrgFileNames(options).size() > 0; } - public String getSrgFileName(IOptionProvider options) { - return options.getOption(this.srgFileArgName); + public List getSrgFileNames(IOptionProvider options) { + Builder builder = ImmutableList.builder(); + + String srgFile = options.getOption(this.srgFileArgName); + if (srgFile != null) { + builder.add(srgFile); + } + + String extraSrgFiles = options.getOption(this.extraSrgFilesArgName); + if (extraSrgFiles != null) { + for (String extraSrgFile : extraSrgFiles.split(";")) { + builder.add(extraSrgFile.trim()); + } + } + + return builder.build(); } public String getOutputSrgFileName(IOptionProvider options) { diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java index aef3103f..f87d2e66 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/SupportedOptions.java @@ -30,8 +30,11 @@ import com.google.common.collect.ImmutableSet; public final class SupportedOptions { + public static final String TOKENS = "tokens"; public static final String REOBF_SRG_FILE = "reobfSrgFile"; + public static final String REOBF_EXTRA_SRG_FILES = "reobfSrgFiles"; public static final String REOBF_NOTCH_FILE = "reobfNotchSrgFile"; + public static final String REOBF_EXTRA_NOTCH_FILES = "reobfNotchSrgFiles"; public static final String OUT_SRG_SRG_FILE = "outSrgFile"; public static final String OUT_NOTCH_SRG_FILE = "outNotchSrgFile"; public static final String OUT_REFMAP_FILE = "outRefMapFile"; @@ -53,7 +56,7 @@ public final class SupportedOptions { SupportedOptions.OVERWRITE_ERROR_LEVEL, SupportedOptions.DEFAULT_OBFUSCATION_ENV ); - + private SupportedOptions() {} } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 80e92554..f16b97d3 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -67,7 +68,7 @@ class TargetObfuscationEnvironment { /** * File containing the reobfd srgs */ - private final String reobfSrgFileName; + private final List reobfSrgFileNames; /** * Reference mapper for reference mapping @@ -90,7 +91,7 @@ class TargetObfuscationEnvironment { this.type = type; this.refMapper = refMapper; - this.reobfSrgFileName = type.getSrgFileName(ap); + this.reobfSrgFileNames = type.getSrgFileNames(ap); this.outSrgFileName = type.getOutputSrgFileName(ap); } @@ -98,19 +99,30 @@ class TargetObfuscationEnvironment { if (!this.initDone) { this.initDone = true; - if (this.reobfSrgFileName == null) { + if (this.reobfSrgFileNames == null) { this.ap.printMessage(Kind.ERROR, "The " + this.type.getSrgFileOption() + " argument was not supplied, obfuscation processing will not occur"); return false; } - try { - File reobfSrgFile = new File(this.reobfSrgFileName); - this.ap.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); - this.srgs = new SrgContainer().readSrg(reobfSrgFile); - } catch (Exception ex) { - ex.printStackTrace(); - this.ap.printMessage(Kind.ERROR, "The specified " + this.type + " SRG file could not be read, processing cannot continue"); + int successCount = 0; + this.srgs = new SrgContainer(); + + for (String srgFileName : this.reobfSrgFileNames) { + File reobfSrgFile = new File(srgFileName); + try { + if (reobfSrgFile.isFile()) { + this.ap.printMessage(Kind.NOTE, "Loading " + this.type + " mappings from " + reobfSrgFile.getAbsolutePath()); + this.srgs.readSrg(reobfSrgFile); + successCount++; + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } + + if (successCount < 1) { + this.ap.printMessage(Kind.ERROR, "No valid SRG files for " + this.type + " could be read, processing may not be sucessful."); this.srgs = null; } } diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index d210de57..cf3b8cd0 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.15"; + public static final String VERSION = "0.4.16"; /** * Blackboard key where the subsystem version will be stored to indicate