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

Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.

Browse source
This commit is contained in:
LexManos 2012-10-23 13:32:02 -07:00
parent 190c71eeb5
commit 54f5225530
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
View file

@ -145,6 +145,7 @@ public class AccessTransformer implements IClassTransformer
@Override
public byte[] transform(String name, byte[] bytes)
{
if (bytes == null) { return null; }
if (!modifiers.containsKey(name)) { return bytes; }
ClassNode classNode = new ClassNode();

1
fml/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java
View file

@ -89,6 +89,7 @@ public class MarkerTransformer implements IClassTransformer
@Override
public byte[] transform(String name, byte[] bytes)
{
if (bytes == null) { return null; }
if (!markers.containsKey(name)) { return bytes; }
ClassNode classNode = new ClassNode();

4
fml/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java
View file

@ -23,6 +23,8 @@ public class SideTransformer implements IClassTransformer
@Override
public byte[] transform(String name, byte[] bytes)
{
if (bytes == null) { return null; }
ClassNode classNode = new ClassNode();
ClassReader classReader = new ClassReader(bytes);
classReader.accept(classNode, 0);
@ -33,7 +35,7 @@ public class SideTransformer implements IClassTransformer
{
System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
}
return null;
throw new RuntimeException(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
}
Iterator<FieldNode> fields = classNode.fields.iterator();