From c5ac5b0264d47773c7efa1c0cf3a05389ee7f681 Mon Sep 17 00:00:00 2001 From: AbrarSyed Date: Sun, 28 Jun 2015 17:16:10 -0500 Subject: [PATCH] DeobfuscationData no longer required at dev time --- .../deobf/FMLDeobfuscatingRemapper.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 4698bfe944..0ac23ed396 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -45,6 +45,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.CharSource; +import com.google.common.io.Files; public class FMLDeobfuscatingRemapper extends Remapper { public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper(); @@ -113,10 +114,22 @@ public class FMLDeobfuscatingRemapper extends Remapper { this.classLoader = classLoader; try { - InputStream classData = getClass().getResourceAsStream(deobfFileName); - LZMAInputSupplier zis = new LZMAInputSupplier(classData); - CharSource srgSource = zis.asCharSource(Charsets.UTF_8); - List srgList = srgSource.readLines(); + List srgList; + final String gradleStartProp = System.getProperty("net.minecraftforge.gradle.GradleStart.srg.srg-mcp"); + + if (Strings.isNullOrEmpty(gradleStartProp)) + { + // get as a resource + InputStream classData = getClass().getResourceAsStream(deobfFileName); + LZMAInputSupplier zis = new LZMAInputSupplier(classData); + CharSource srgSource = zis.asCharSource(Charsets.UTF_8); + srgList = srgSource.readLines(); + } + else + { + srgList = Files.readLines(new File(gradleStartProp), Charsets.UTF_8); + } + rawMethodMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder();