mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 10:34:49 +00:00
Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.
This commit is contained in:
1 parent
7a34246dc9
commit
ff0f00f64f
3 files changed
+5
-1
No files matched your search
@@ -145,6 +145,7 @@ public class AccessTransformer implements IClassTransformer
|
|||||||
@Override
|
@Override
|
||||||
public byte[] transform(String name, byte[] bytes)
|
public byte[] transform(String name, byte[] bytes)
|
||||||
{
|
{
|
||||||
|
if (bytes == null) { return null; }
|
||||||
if (!modifiers.containsKey(name)) { return bytes; }
|
if (!modifiers.containsKey(name)) { return bytes; }
|
||||||
|
|
||||||
ClassNode classNode = new ClassNode();
|
ClassNode classNode = new ClassNode();
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ public class MarkerTransformer implements IClassTransformer
|
|||||||
@Override
|
@Override
|
||||||
public byte[] transform(String name, byte[] bytes)
|
public byte[] transform(String name, byte[] bytes)
|
||||||
{
|
{
|
||||||
|
if (bytes == null) { return null; }
|
||||||
if (!markers.containsKey(name)) { return bytes; }
|
if (!markers.containsKey(name)) { return bytes; }
|
||||||
|
|
||||||
ClassNode classNode = new ClassNode();
|
ClassNode classNode = new ClassNode();
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ public class SideTransformer implements IClassTransformer
|
|||||||
@Override
|
@Override
|
||||||
public byte[] transform(String name, byte[] bytes)
|
public byte[] transform(String name, byte[] bytes)
|
||||||
{
|
{
|
||||||
|
if (bytes == null) { return null; }
|
||||||
|
|
||||||
ClassNode classNode = new ClassNode();
|
ClassNode classNode = new ClassNode();
|
||||||
ClassReader classReader = new ClassReader(bytes);
|
ClassReader classReader = new ClassReader(bytes);
|
||||||
classReader.accept(classNode, 0);
|
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));
|
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();
|
Iterator<FieldNode> fields = classNode.fields.iterator();
|
||||||
|
|||||||
Reference in new issue
Block a user