fix accessor injection for mods which declare accessors in events.json

Mumfrey
1 parent b24caff3
Showing 3 changed files with 28 additions and 3 deletions
java/common/com/mumfrey/liteloader/transformers/event/json/JsonEvents.java
java/common/com/mumfrey/liteloader/transformers/event/json/ModEventInjectionTransformer.java
java/common/com/mumfrey/liteloader/transformers/event/json/ModEvents.java
@@ -115,7 +115,12 @@ public class JsonEvents implements Serializable, ObfProvider
 			throw new InvalidEventJsonException("An error occurred whilst parsing the event definition: " + ex.getClass().getSimpleName() + ": " + ex.getMessage(), ex);
 		}
 	}
-	
+
+	public boolean hasAccessors()
+	{
+		return this.accessorInterfaces.size() > 0;
+	}
+
 	/**
 	 * Parse a token name, returns the token name as a string if the token is valid, or null if the token is not valid
 	 * 
@@ -37,8 +37,6 @@ public class ModEventInjectionTransformer extends EventInjectionTransformer
 		{
 			LiteLoaderLogger.info("Parsing events for mod with id %s", def.getIdentifier());
 			events = JsonEvents.parse(def.getJson());
-			events.register(this);
-			def.onEventsInjected();
 		}
 		catch (InvalidEventJsonException ex)
 		{
@@ -58,8 +56,15 @@ public class ModEventInjectionTransformer extends EventInjectionTransformer
 		{
 			if (events != null)
 			{
+				if (events.hasAccessors())
+				{
+					LiteLoaderLogger.info("%s contains Accessor definitions, injecting into classpath...", def.getIdentifier());
+					def.injectIntoClassPath();
+				}
+				
 				LiteLoaderLogger.info("Registering events for mod with id %s", def.getIdentifier());
 				events.register(this);
+				def.onEventsInjected();
 			}
 		}
 		catch (Throwable ex)
 package com.mumfrey.liteloader.transformers.event.json;
 import java.io.File;
+import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
+import net.minecraft.launchwrapper.Launch;
+
 import com.google.common.base.Charsets;
 import com.mumfrey.liteloader.api.EnumerationObserver;
 import com.mumfrey.liteloader.core.ModInfo;
@@ -45,6 +48,18 @@ public class ModEvents implements EnumerationObserver
 		{
 			this.file.onEventsInjected();
 		}
+
+		public void injectIntoClassPath()
+		{
+			try
+			{
+				this.file.injectIntoClassPath(Launch.classLoader, true);
+			}
+			catch (MalformedURLException ex)
+			{
+				ex.printStackTrace();
+			}
+		}
 	}
 	private static final String DEFINITION_FILENAME = "events.json";