Adding extra mappings back to FG3 service, also fix build on travis

This commit is contained in:
Mumfrey committed 2019-11-04 20:49:38 +00:00
1 parent f9e19c32f4
commit 5ada553610
3 files changed
+10 -9

No files matched your search

@@ -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<String> 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
)
@@ -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<String> inputMappings = Collections.<String>emptyList();
private List<String> inputMappings = new ArrayList<String>();
public MappingProviderTSrg(Messager messager, Filer filer) {
super(messager, filer);
@@ -62,7 +63,7 @@ public class MappingProviderTSrg extends MappingProvider {
final BiMap<MappingMethod, MappingMethod> 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("#")) {