LiteLoader 1.4.5_02

+ Added callback pre GUI render to RenderListener + Added forge compatibility to class loading from Macros

LiteLoader 1.4.5_02
+ Added callback pre GUI render to RenderListener + Added forge compatibility to class loading from Macros
Mumfrey
1 parent 0e1a1e12
Showing 4 changed files with 57 additions and 16 deletions
.classpath
java/com/mumfrey/liteloader/RenderListener.java
java/com/mumfrey/liteloader/core/HookProfiler.java
java/com/mumfrey/liteloader/core/LiteLoader.java
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="java"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ClientMods"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/Client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
 	<classpathentry kind="lib" path="/Client/jars/bin/jinput.jar"/>
 package com.mumfrey.liteloader;
+import net.minecraft.src.GuiScreen;
+
 /**
  * Interface for objects which want a pre-render callback
  * 
@@ -12,5 +14,7 @@ public interface RenderListener extends LiteMod
 	 */
 	public abstract void onRender();
+	public abstract void onRenderGui(GuiScreen currentScreen);
+	
 	public abstract void onRenderWorld();
 }
@@ -5,7 +5,10 @@ import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.logging.Logger;
+import com.mumfrey.liteloader.util.ModUtilities;
+
 import net.minecraft.client.Minecraft;
+import net.minecraft.src.EntityPlayerSP;
 import net.minecraft.src.GameSettings;
 import net.minecraft.src.Profiler;
@@ -59,6 +62,8 @@ public class HookProfiler extends Profiler
 	 */
 	public HookProfiler(LiteLoader core, Logger logger)
 	{
+		this.mc = Minecraft.getMinecraft();
+
 		this.loader = core;
 		this.logger = logger;
@@ -87,7 +92,6 @@ public class HookProfiler extends Profiler
 			if (ofProfiler != null)
 			{
 				logger.info(String.format("Optifine version %s detected, enabling compatibility check", GetOptifineVersion()));
-				mc = Minecraft.getMinecraft();
 			}
 		}
 	}
@@ -156,7 +160,7 @@ public class HookProfiler extends Profiler
 			}
 		}
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see net.minecraft.src.Profiler#endSection()
 	 */
@@ -165,9 +169,10 @@ public class HookProfiler extends Profiler
 	{
 		super.endSection();
-		String endingSection = sectionStack.removeLast();
-
-		if ("gameRenderer".equalsIgnoreCase(endingSection) && "root".equalsIgnoreCase(sectionStack.getLast()))
+		String endingSection = sectionStack.size() > 0 ? sectionStack.removeLast() : null;
+		String nextSection = sectionStack.size() > 0 ? sectionStack.getLast() : null;
+		
+		if ("gameRenderer".equals(endingSection) && "root".equals(sectionStack.getLast()))
 		{
 			super.startSection("litetick");
@@ -176,5 +181,9 @@ public class HookProfiler extends Profiler
 			super.endSection();
 		}
+		else if (("mouse".equals(endingSection) && "gameRenderer".equals(nextSection) && (mc.skipRenderWorld || mc.theWorld == null)) || ("gui".equals(endingSection) && "gameRenderer".equals(nextSection) && mc.theWorld != null))
+		{
+			loader.onBeforeGuiRender();
+		}
 	}
 }
@@ -5,6 +5,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.net.URLDecoder;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.util.*;
@@ -18,7 +19,6 @@ import java.util.zip.ZipInputStream;
 import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.util.ModUtilities;
 import com.mumfrey.liteloader.util.PrivateFields;
-import com.sun.corba.se.impl.ior.ByteBuffer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.*;
@@ -28,7 +28,7 @@ import net.minecraft.src.Timer;
  * LiteLoader is a simple loader which provides tick events to loaded mods 
  *
  * @author Adam Mummery-Smith
- * @version 1.4.4
+ * @version 1.4.5_02
  */
 @SuppressWarnings("rawtypes")
 public final class LiteLoader implements FilenameFilter
@@ -36,7 +36,7 @@ public final class LiteLoader implements FilenameFilter
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.4.5";
+	private static final String LOADER_VERSION = "1.4.5_02";
 	/**
 	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
@@ -128,7 +128,7 @@ public final class LiteLoader implements FilenameFilter
 	 * List of mods which implement PluginChannelListener interface
 	 */
 	private LinkedList<PluginChannelListener> pluginChannelListeners = new LinkedList<PluginChannelListener>();
-	
+
 	/**
 	 * Mapping of plugin channel names to listeners 
 	 */
@@ -470,15 +470,35 @@ public final class LiteLoader implements FilenameFilter
 		{
 			logger.info("Searching protection domain code source...");
-			File packagePath = new File(LiteLoader.class.getProtectionDomain().getCodeSource().getLocation().toURI());
-			LinkedList<Class> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+			File packagePath = null;
-			for (Class mod : modClasses)
+			if (LiteLoader.class.getProtectionDomain().getCodeSource().getLocation() != null)
 			{
-				modsToLoad.put(mod.getSimpleName(), mod);
+				packagePath = new File(LiteLoader.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+			}
+			else
+			{
+				// Fix (?) for forge and other mods which screw up the protection domain 
+				String reflectionClassPath = LiteLoader.class.getResource("/com/mumfrey/liteloader/core/LiteLoader.class").getPath();
+				
+				if (reflectionClassPath.indexOf('!') > -1)
+				{
+					reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
+					packagePath = new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!')));
+				}
+			}
+			
+			if (packagePath != null)
+			{
+				LinkedList<Class> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
+				
+				for (Class mod : modClasses)
+				{
+					modsToLoad.put(mod.getSimpleName(), mod);
+				}
+				
+				if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
 			}
-
-			if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
 		catch (Throwable th)
 		{
@@ -966,6 +986,15 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * Called immediately before the current GUI is rendered
+	 */
+	public void onBeforeGuiRender()
+	{
+		for (RenderListener renderListener : renderListeners)
+			renderListener.onRenderGui(minecraft.currentScreen);
+	}
+
+	/**
 	 * Callback from the tick hook, ticks all tickable mods
 	 * 
 	 * @param tick True if this is a new tick (otherwise it's just a new frame)