From 5ada553610869dde513c0293aa887aeaaee70e1a Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 4 Nov 2019 20:49:38 +0000 Subject: [PATCH] Adding extra mappings back to FG3 service, also fix build on travis --- .../tools/obfuscation/fg3/ObfuscationServiceFG3.java | 11 ++++++----- .../obfuscation/mapping/fg3/MappingProviderTSrg.java | 5 +++-- .../injection/modify/LocalVariableDiscriminator.java | 3 +-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/fg3/ObfuscationServiceFG3.java b/src/ap/java/org/spongepowered/tools/obfuscation/fg3/ObfuscationServiceFG3.java index ad2654b9..87f5e526 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/fg3/ObfuscationServiceFG3.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/fg3/ObfuscationServiceFG3.java @@ -41,11 +41,12 @@ import com.google.common.collect.ImmutableSet; */ public class ObfuscationServiceFG3 implements IObfuscationService { - public static final String SEARGE = "searge"; + public static final String SEARGE = "searge"; - public static final String REOBF_TSRG_FILE = "reobfTsrgFile"; - public static final String OUT_TSRG_SRG_FILE = "outTsrgFile"; - public static final String TSRG_OUTPUT_BEHAVIOUR = "mergeBehaviour"; + public static final String REOBF_TSRG_FILE = "reobfTsrgFile"; + public static final String REOBF_EXTRA_TSRG_FILES = "reobfTsrgFiles"; + public static final String OUT_TSRG_SRG_FILE = "outTsrgFile"; + public static final String TSRG_OUTPUT_BEHAVIOUR = "mergeBehaviour"; @Override public Set getSupportedOptions() { @@ -64,7 +65,7 @@ public class ObfuscationServiceFG3 implements IObfuscationService { new ObfuscationTypeDescriptor( ObfuscationServiceFG3.SEARGE, ObfuscationServiceFG3.REOBF_TSRG_FILE, - null, + ObfuscationServiceFG3.REOBF_EXTRA_TSRG_FILES, ObfuscationServiceFG3.OUT_TSRG_SRG_FILE, ObfuscationEnvironmentFG3.class ) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/mapping/fg3/MappingProviderTSrg.java b/src/ap/java/org/spongepowered/tools/obfuscation/mapping/fg3/MappingProviderTSrg.java index 7a6af8bf..91f031a3 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/mapping/fg3/MappingProviderTSrg.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/mapping/fg3/MappingProviderTSrg.java @@ -27,6 +27,7 @@ package org.spongepowered.tools.obfuscation.mapping.fg3; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -47,7 +48,7 @@ import com.google.common.io.Files; */ public class MappingProviderTSrg extends MappingProvider { - private List inputMappings = Collections.emptyList(); + private List inputMappings = new ArrayList(); public MappingProviderTSrg(Messager messager, Filer filer) { super(messager, filer); @@ -62,7 +63,7 @@ public class MappingProviderTSrg extends MappingProvider { final BiMap methodMap = this.methodMap; String fromClass = null, toClass = null; - this.inputMappings = Files.readLines(input, Charset.defaultCharset()); + this.inputMappings.addAll(Files.readLines(input, Charset.defaultCharset())); for (String line : this.inputMappings) { if (Strings.isNullOrEmpty(line) || line.startsWith("#")) { diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java index c035a322..499589a1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/modify/LocalVariableDiscriminator.java @@ -41,7 +41,6 @@ import org.spongepowered.asm.util.Bytecode; import org.spongepowered.asm.util.Annotations; import org.spongepowered.asm.util.Locals; import org.spongepowered.asm.util.PrettyPrinter; -import org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable; import org.spongepowered.asm.util.SignaturePrinter; /** @@ -55,7 +54,7 @@ public class LocalVariableDiscriminator { * Discriminator context information, wraps all relevant information about * a target location for use when performing discrimination */ - public static class Context implements IPrettyPrintable { + public static class Context implements org.spongepowered.asm.util.PrettyPrinter.IPrettyPrintable { /** * Information about a local variable in the LVT, used during