keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

DeobfuscationData no longer required at dev time

Browse source
This commit is contained in:
AbrarSyed 2015-06-28 17:16:10 -05:00
parent 0fb705f8f5
commit c5ac5b0264
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fml/src/main/java/net/minecraftforge/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
View file

@ -45,6 +45,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.io.CharSource; import com.google.common.io.CharSource;
import com.google.common.io.Files;
public class FMLDeobfuscatingRemapper extends Remapper { public class FMLDeobfuscatingRemapper extends Remapper {
public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper(); public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper();
@ -113,10 +114,22 @@ public class FMLDeobfuscatingRemapper extends Remapper {
this.classLoader = classLoader; this.classLoader = classLoader;
try try
{ {
InputStream classData = getClass().getResourceAsStream(deobfFileName); List<String> srgList;
LZMAInputSupplier zis = new LZMAInputSupplier(classData); final String gradleStartProp = System.getProperty("net.minecraftforge.gradle.GradleStart.srg.srg-mcp");
CharSource srgSource = zis.asCharSource(Charsets.UTF_8);
List<String> srgList = srgSource.readLines(); 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(); rawMethodMaps = Maps.newHashMap();
rawFieldMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap();
Builder<String, String> builder = ImmutableBiMap.<String,String>builder(); Builder<String, String> builder = ImmutableBiMap.<String,String>builder();