mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Now actually works for mods, somewhat. It currently generates access violations for
ModLoader mods that presume access to fields that are not actually accessible from a different package.
This commit is contained in:
1 parent
9c2b899454
commit
b41af51ccf
3 files changed
+42
-15
No files matched your search
@@ -28,8 +28,8 @@ import org.objectweb.asm.FieldVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
import cpw.mods.fml.common.CertificateHelper;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
|
||||
import cpw.mods.fml.relauncher.FMLRelaunchLog;
|
||||
import cpw.mods.fml.relauncher.IFMLCallHook;
|
||||
import cpw.mods.fml.relauncher.RelaunchClassLoader;
|
||||
|
||||
@@ -74,17 +74,17 @@ public class FMLSanityChecker implements IFMLCallHook
|
||||
String fingerprint = CertificateHelper.getFingerprint(cert);
|
||||
if (fingerprint.equals(FMLFINGERPRINT))
|
||||
{
|
||||
FMLLog.info("Found valid fingerprint for FML. Certificate fingerprint %s", fingerprint);
|
||||
FMLRelaunchLog.info("Found valid fingerprint for FML. Certificate fingerprint %s", fingerprint);
|
||||
goodFML = true;
|
||||
}
|
||||
else if (fingerprint.equals(FORGEFINGERPRINT))
|
||||
{
|
||||
FMLLog.info("Found valid fingerprint for Minecraft Forge. Certificate fingerprint %s", fingerprint);
|
||||
FMLRelaunchLog.info("Found valid fingerprint for Minecraft Forge. Certificate fingerprint %s", fingerprint);
|
||||
goodFML = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
FMLLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
|
||||
FMLRelaunchLog.severe("Found invalid fingerprint for FML: %s", fingerprint);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -95,7 +95,7 @@ public class FMLSanityChecker implements IFMLCallHook
|
||||
}
|
||||
if (!goodFML)
|
||||
{
|
||||
FMLLog.severe("FML appears to be missing any signature data. This is not a good thing");
|
||||
FMLRelaunchLog.severe("FML appears to be missing any signature data. This is not a good thing");
|
||||
}
|
||||
byte[] mlClass = cl.getClassBytes("ModLoader");
|
||||
// Only care in obfuscated env
|
||||
|
||||
+32
-9
@@ -5,6 +5,7 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.Charset;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -20,7 +21,9 @@ import com.google.common.base.Charsets;
|
||||
import com.google.common.collect.BiMap;
|
||||
import com.google.common.collect.HashBiMap;
|
||||
import com.google.common.collect.ImmutableBiMap;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.google.common.collect.ImmutableBiMap.Builder;
|
||||
@@ -127,13 +130,13 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
@Override
|
||||
public String mapMethodName(String owner, String name, String desc)
|
||||
{
|
||||
if (classNameBiMap==null || !classNameBiMap.containsKey(owner))
|
||||
if (classNameBiMap==null)
|
||||
{
|
||||
return name;
|
||||
}
|
||||
Map<String, String> methodMap = getMethodMap(owner);
|
||||
String methodDescriptor = name+desc;
|
||||
return methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name;
|
||||
return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name;
|
||||
}
|
||||
|
||||
private Map<String,String> getMethodMap(String className)
|
||||
@@ -150,27 +153,47 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
try
|
||||
{
|
||||
byte[] classBytes = classLoader.getClassBytes(name);
|
||||
if (classBytes == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
ClassReader cr = new ClassReader(classBytes);
|
||||
String superName = cr.getSuperName();
|
||||
mergeSuperMaps(name, superName);
|
||||
String[] interfaces = cr.getInterfaces();
|
||||
if (interfaces == null)
|
||||
{
|
||||
interfaces = new String[0];
|
||||
}
|
||||
mergeSuperMaps(name, superName, interfaces);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
public void mergeSuperMaps(String name, String superName)
|
||||
public void mergeSuperMaps(String name, String superName, String[] interfaces)
|
||||
{
|
||||
if (classNameBiMap == null || !classNameBiMap.containsKey(name))
|
||||
if (classNameBiMap == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (superName != null && classNameBiMap.containsKey(superName) && !methodNameMaps.containsKey(superName))
|
||||
List<String> allParents = ImmutableList.<String>builder().add(superName).addAll(Arrays.asList(interfaces)).build();
|
||||
for (String parentThing : allParents)
|
||||
{
|
||||
findAndMergeSuperMaps(superName);
|
||||
if (superName != null && classNameBiMap.containsKey(superName) && !methodNameMaps.containsKey(superName))
|
||||
{
|
||||
findAndMergeSuperMaps(superName);
|
||||
}
|
||||
}
|
||||
System.out.printf("Merging maps for %s (%s , %s)\n", name, superName, Arrays.asList(interfaces));
|
||||
Map<String, String> methodMap = Maps.<String,String>newHashMap();
|
||||
for (String parentThing : allParents)
|
||||
{
|
||||
if (methodNameMaps.containsKey(parentThing))
|
||||
{
|
||||
methodMap.putAll(methodNameMaps.get(parentThing));
|
||||
}
|
||||
}
|
||||
FMLLog.info("Merging maps for %s (%s)", name, superName);
|
||||
Map<String, String> methodMap = methodNameMaps.containsKey(superName) ? Maps.newHashMap(methodNameMaps.get(superName)) : Maps.<String, String>newHashMap();
|
||||
if (rawMethodMaps.containsKey(name))
|
||||
{
|
||||
methodMap.putAll(rawMethodMaps.get(name));
|
||||
|
||||
@@ -13,7 +13,11 @@ public class FMLRemappingAdapter extends RemappingClassAdapter {
|
||||
@Override
|
||||
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
|
||||
{
|
||||
FMLDeobfuscatingRemapper.INSTANCE.mergeSuperMaps(name, superName);
|
||||
if (interfaces == null)
|
||||
{
|
||||
interfaces = new String[0];
|
||||
}
|
||||
FMLDeobfuscatingRemapper.INSTANCE.mergeSuperMaps(name, superName, interfaces);
|
||||
super.visit(version, access, name, signature, superName, interfaces);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user