allow access to shared descriptor table in JSON event transformer definitions

Mumfrey
1 parent 97e55cae
Showing 3 changed files with 49 additions and 4 deletions
java/common/com/mumfrey/liteloader/core/runtime/Methods.java
java/common/com/mumfrey/liteloader/transformers/event/json/JsonInjection.java
java/common/com/mumfrey/liteloader/transformers/event/json/JsonMethods.java
 package com.mumfrey.liteloader.core.runtime;
 import java.io.File;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
 import com.mumfrey.liteloader.transformers.event.MethodInfo;
@@ -44,4 +47,26 @@ public abstract class Methods
 	public static final MethodInfo endStartSection        = new MethodInfo(Obf.Profiler,                   Obf.endStartSection,              Void.TYPE, String.class);
 	private Methods() {}
+	
+	private static final Map<String, MethodInfo> methodMap = new HashMap<String, MethodInfo>();
+	
+	static
+	{
+		try
+		{
+			for (Field fd : Methods.class.getFields())
+			{
+				if (fd.getType().equals(MethodInfo.class))
+				{
+					Methods.methodMap.put(fd.getName(), (MethodInfo)fd.get(null));
+				}
+			}
+		}
+		catch (IllegalAccessException ex) {}
+	}
+
+	public static MethodInfo getByName(String name)
+	{
+		return Methods.methodMap.get(name);
+	}
 }
@@ -84,7 +84,14 @@ public class JsonInjection implements Serializable
 	private MethodInfo parseMethod(JsonMethods methods)
 	{
-		return methods.get(this.methodName);
+		try
+		{
+			return methods.get(this.methodName);
+		}
+		catch (NullPointerException ex)
+		{
+			throw new InvalidEventJsonException("'method' must not be null for injection");
+		}
 	}
 	public InjectionPoint parseInjectionPoint(JsonMethods methods)
@@ -148,6 +155,11 @@ public class JsonInjection implements Serializable
 			}
 		}
+		if (this.target == null)
+		{
+			throw new InvalidEventJsonException("'target' is required for injection type " + this.type.name());
+		}
+		
 		return this.target;
 	}
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.mumfrey.liteloader.core.runtime.Methods;
 import com.mumfrey.liteloader.transformers.event.MethodInfo;
 /**
@@ -69,10 +70,17 @@ public class JsonMethods
 		}
 		MethodInfo method = this.methods.get(key);
-		if (method == null)
+		if (method != null)
 		{
-			throw new InvalidEventJsonException("Could not locate method with token " + token);
+			return method;
 		}
-		return method;
+		
+		MethodInfo builtinMethod = Methods.getByName(key);
+		if (builtinMethod != null)
+		{
+			return builtinMethod;
+		}
+		
+		throw new InvalidEventJsonException("Could not locate method descriptor with token " + token);
 	}
 }
 \ No newline at end of file