Liteloader 1.4.0

Mumfrey
1 parent 14886082
Showing 10 changed files with 389 additions and 113 deletions
.classpath
java/com/mumfrey/liteloader/core/CallableLiteLoaderMods.java
java/com/mumfrey/liteloader/core/FilteringClassLoader.java
java/com/mumfrey/liteloader/core/HookChat.java
java/com/mumfrey/liteloader/core/HookPluginChannels.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderHook.java
java/com/mumfrey/liteloader/util/ModUtilities.java
java/com/mumfrey/liteloader/util/PrivateFields.java
java/net/minecraft/src/CallableJVMFlags.java
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="java"/>
+	<classpathentry kind="src" path="res"/>
 	<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="jars/bin/jinput.jar">
+package com.mumfrey.liteloader.core;
+
+import java.util.concurrent.Callable;
+
+import net.minecraft.src.CrashReport;
+
+public class CallableLiteLoaderMods implements Callable<String>
+{
+	final CrashReport crashReport;
+	
+	public CallableLiteLoaderMods(CrashReport report)
+	{
+		this.crashReport = report;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.util.concurrent.Callable#call()
+	 */
+	@Override
+	public String call() throws Exception
+	{
+		return LiteLoader.getInstance().getLoadedModsList();
+	}
+}
+package com.mumfrey.liteloader.core;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Enumeration;
+
+import net.minecraft.client.Minecraft;
+
+public class FilteringClassLoader extends URLClassLoader
+{
+	public FilteringClassLoader()
+	{
+		super(new URL[0], Minecraft.class.getClassLoader());
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#loadClass(java.lang.String)
+	 */
+	@Override
+	public Class<?> loadClass(String name) throws ClassNotFoundException
+	{
+		System.out.println("Parent is trying to load class " + name);
+		return super.loadClass(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#findClass(java.lang.String)
+	 */
+	@Override
+	protected Class<?> findClass(String name) throws ClassNotFoundException
+	{
+		System.out.println("findClass " + name);
+		// TODO Auto-generated method stub
+		return super.findClass(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#getResource(java.lang.String)
+	 */
+	@Override
+	public URL getResource(String name)
+	{
+		System.out.println("getResource " + name);
+		// TODO Auto-generated method stub
+		return super.getResource(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#getResources(java.lang.String)
+	 */
+	@Override
+	public Enumeration<URL> getResources(String name) throws IOException
+	{
+		System.out.println("getResources " + name);
+		// TODO Auto-generated method stub
+		return super.getResources(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#findResource(java.lang.String)
+	 */
+	@Override
+	public URL findResource(String name)
+	{
+		System.out.println("findResource " + name);
+		// TODO Auto-generated method stub
+		return super.findResource(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#findResources(java.lang.String)
+	 */
+	@Override
+	public Enumeration<URL> findResources(String name) throws IOException
+	{
+		System.out.println("findResources " + name);
+		// TODO Auto-generated method stub
+		return super.findResources(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String)
+	 */
+	@Override
+	public InputStream getResourceAsStream(String name)
+	{
+		System.out.println("getResourceAsStream " + name);
+		// TODO Auto-generated method stub
+		return super.getResourceAsStream(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#getPackage(java.lang.String)
+	 */
+	@Override
+	protected Package getPackage(String name)
+	{
+		System.out.println("getPackage " + name);
+		// TODO Auto-generated method stub
+		return super.getPackage(name);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#getPackages()
+	 */
+	@Override
+	protected Package[] getPackages()
+	{
+		System.out.println("getPackages");
+		// TODO Auto-generated method stub
+		return super.getPackages();
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#findLibrary(java.lang.String)
+	 */
+	@Override
+	protected String findLibrary(String libname)
+	{
+		System.out.println("findLibrary " + libname);
+		// TODO Auto-generated method stub
+		return super.findLibrary(libname);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#setDefaultAssertionStatus(boolean)
+	 */
+	@Override
+	public synchronized void setDefaultAssertionStatus(boolean enabled)
+	{
+		System.out.println("setDefaultAssertionStatus " + enabled);
+		// TODO Auto-generated method stub
+		super.setDefaultAssertionStatus(enabled);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#setPackageAssertionStatus(java.lang.String, boolean)
+	 */
+	@Override
+	public synchronized void setPackageAssertionStatus(String packageName, boolean enabled)
+	{
+		System.out.println("setPackageAssertionStatus " + packageName + "   " + enabled);
+		// TODO Auto-generated method stub
+		super.setPackageAssertionStatus(packageName, enabled);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#setClassAssertionStatus(java.lang.String, boolean)
+	 */
+	@Override
+	public synchronized void setClassAssertionStatus(String className, boolean enabled)
+	{
+		System.out.println("setClassAssertionStatus " + className + "   " + enabled);
+		// TODO Auto-generated method stub
+		super.setClassAssertionStatus(className, enabled);
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.ClassLoader#clearAssertionStatus()
+	 */
+	@Override
+	public synchronized void clearAssertionStatus()
+	{
+		System.out.println("clearAssertionStatus");
+		// TODO Auto-generated method stub
+		super.clearAssertionStatus();
+	}
+}
@@ -3,16 +3,12 @@ package com.mumfrey.liteloader.core;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
 import java.util.Map;
-import net.minecraft.src.IntHashMap;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet3Chat;
-
 import com.mumfrey.liteloader.util.PrivateFields;
+import net.minecraft.src.*;
+
 /**
  * Proxy packet which we will register in place of the original chat packet. The class will proxy the function calls
  * through to the replaced class via reflection if the original (replaced) class is NOT the basic Packet3Chat (this
@@ -3,16 +3,11 @@ package com.mumfrey.liteloader.core;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Constructor;
 import java.util.Map;
 import com.mumfrey.liteloader.util.PrivateFields;
-import net.minecraft.src.IntHashMap;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.Packet3Chat;
+import net.minecraft.src.*;
 public class HookPluginChannels extends Packet250CustomPayload
 {
 package com.mumfrey.liteloader.core;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.CharBuffer;
 import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.FileHandler;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.logging.*;
 import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.StreamHandler;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
-import net.minecraft.client.Minecraft;
-import net.minecraft.src.ConsoleLogManager;
-import net.minecraft.src.NetHandler;
-import net.minecraft.src.Packet1Login;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.Packet3Chat;
-import net.minecraft.src.Timer;
-
-import com.mumfrey.liteloader.ChatFilter;
-import com.mumfrey.liteloader.ChatListener;
-import com.mumfrey.liteloader.InitCompleteListener;
-import com.mumfrey.liteloader.LiteMod;
-import com.mumfrey.liteloader.LoginListener;
-import com.mumfrey.liteloader.PluginChannelListener;
-import com.mumfrey.liteloader.Tickable;
+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.*;
+import net.minecraft.src.Timer;
 /**
  * LiteLoader is a simple loader which provides tick events to loaded mods 
  *
  * @author Adam Mummery-Smith
- * @version 1.3.2_03
+ * @version 1.4.0
  */
 public final class LiteLoader implements FilenameFilter
 {
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.3.2_03";
+	private static final String LOADER_VERSION = "1.4.0";
+	
+	/**
+	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
+	 */
+	private static final int LOADER_REVISION = 4;
 	/**
 	 * Minecraft versions that we will load mods for, this will be compared
 	 * against the version.txt value in mod files to prevent outdated mods being
 	 * loaded!!!
 	 */
-	private static final String[] SUPPORTED_VERSIONS = { "1.3.1", "1.3.2" };
+	private static final String[] SUPPORTED_VERSIONS = { "1.4.0", "1.4" };
 	/**
 	 * LiteLoader is a singleton, this is the singleton instance
@@ -91,6 +73,11 @@ public final class LiteLoader implements FilenameFilter
 	 * Reference to the minecraft timer
 	 */
 	private Timer minecraftTimer;
+
+	/**
+	 * List of loaded mods, for crash reporting
+	 */
+	private String loadedModsList = "none";
 	/**
 	 * Global list of mods which we have loaded
@@ -157,16 +144,44 @@ public final class LiteLoader implements FilenameFilter
 		return instance;
 	}
+	/**
+	 * Get the LiteLoader logger object
+	 * 
+	 * @return
+	 */
 	public static final Logger getLogger()
 	{
 		return logger;
 	}
 	/**
+	 * Get LiteLoader version
+	 * 
+	 * @return
+	 */
+	public static final String getVersion()
+	{
+		return LOADER_VERSION;
+	}
+	
+	/**
+	 * Get the loader revision
+	 * 
+	 * @return
+	 */
+	public static final int getRevision()
+	{
+		return LOADER_REVISION;
+	}
+	
+	/**
 	 * LiteLoader constructor
 	 */
 	private LiteLoader()
 	{
+		// Set up base class overrides
+		prepareClassOverrides();
+		
 		// Set up loader, initialises any reflection methods needed
 		prepareLoader();
@@ -183,6 +198,52 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * 
+	 */
+	private void prepareClassOverrides()
+	{
+		registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "g"), "g");
+	}
+	
+	/**
+	 * Reads a base class overrride from a resource file
+	 * 
+	 * @param binaryClassName
+	 * @param fileName
+	 */
+	private void registerBaseClassOverride(String binaryClassName, String fileName)
+	{
+		try
+		{
+			Method mDefineClass = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class); 
+			mDefineClass.setAccessible(true);
+			
+			InputStream resourceInputStream = LiteLoader.class.getResourceAsStream("/classes/" + fileName + ".bin");
+			
+			if (resourceInputStream != null)
+			{
+				ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+				
+				for (int readBytes = resourceInputStream.read(); readBytes >= 0; readBytes = resourceInputStream.read())
+				{
+			        outputStream.write(readBytes);
+				}
+			 
+				byte[] data = outputStream.toByteArray();
+
+				outputStream.close();
+			    resourceInputStream.close();
+					
+			    mDefineClass.invoke(Minecraft.class.getClassLoader(), binaryClassName, data, 0, data.length);
+			}
+		}
+		catch (Throwable th)
+		{
+			th.printStackTrace();
+		}
+	}
+	
+	/**
 	 * Set up reflection methods required by the loader
 	 */
 	@SuppressWarnings("unchecked")
@@ -205,7 +266,7 @@ public final class LiteLoader implements FilenameFilter
 			}
 			catch (Exception ex)
 			{
-				ConsoleLogManager.func_73699_a();
+				ConsoleLogManager.init();
 				minecraftLogFormatter = ConsoleLogManager.loggerLogManager.getHandlers()[0].getFormatter();
 			}
@@ -250,6 +311,16 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * Used for crash reporting
+	 * 
+	 * @return List of loaded mods as a string
+	 */
+	public String getLoadedModsList()
+	{
+		return loadedModsList;
+	}
+	
+	/**
 	 * Enumerate the java class path and "mods" folder to find mod classes, then load the classes
 	 */
 	private void prepareMods()
@@ -425,6 +496,9 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private void initMods()
 	{
+		loadedModsList = "";
+		int loadedModsCount = 0;
+		
 		for (Iterator<LiteMod> iter = mods.iterator(); iter.hasNext();)
 		{
 			LiteMod mod = iter.next();
@@ -464,6 +538,9 @@ public final class LiteLoader implements FilenameFilter
 				{
 					pluginChannelListeners.add((PluginChannelListener)mod);
 				}
+				
+				loadedModsList += String.format("\n    - %s version %s", mod.getName(), mod.getVersion());
+				loadedModsCount++;
 			}
 			catch (Throwable th)
 			{
@@ -471,6 +548,8 @@ public final class LiteLoader implements FilenameFilter
 				iter.remove();
 			}
 		}
+		
+		loadedModsList = String.format("%s loaded mod(s)%s", loadedModsCount, loadedModsList);
 	}
 	/**
@@ -633,6 +712,7 @@ public final class LiteLoader implements FilenameFilter
 	 * @param classes
 	 * @param className
 	 */
+	@SuppressWarnings("unchecked")
 	private static void checkAndAddClass(ClassLoader classloader, Class superClass, LinkedList<Class> classes, String className)
 	{
 		if (className.indexOf('$') > -1)
@@ -714,14 +794,15 @@ public final class LiteLoader implements FilenameFilter
 		if (tick || minecraftTimer == null)
 		{
 			minecraftTimer = PrivateFields.minecraftTimer.Get(minecraft);
+		}
-			// Hooray, we got the timer reference
-			if (minecraftTimer != null)
-			{
-				partialTicks = minecraftTimer.elapsedPartialTicks;
-			}
+		// Hooray, we got the timer reference
+		if (minecraftTimer != null)
+		{
+			partialTicks = minecraftTimer.elapsedPartialTicks;
+			tick = minecraftTimer.elapsedTicks > 0;
 		}
-		
+	
 		// Flag indicates whether we are in game at the moment
 		boolean inGame = minecraft.renderViewEntity != null && minecraft.renderViewEntity.worldObj != null;
@@ -845,20 +926,4 @@ public final class LiteLoader implements FilenameFilter
 	        sendPluginChannelMessage("REGISTER", registrationData);
 		}
 	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
 \ No newline at end of file
@@ -105,6 +105,7 @@ public class LiteLoaderHook extends Profiler
 			if (config != null)
 			{
+				@SuppressWarnings("unchecked")
 				Method getVersion = config.getDeclaredMethod("getVersion");
 				if (getVersion != null)
 package com.mumfrey.liteloader.util;
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.Map;
-import net.minecraft.client.Minecraft;
-import net.minecraft.src.IntHashMap;
-import net.minecraft.src.KeyBinding;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Packet250CustomPayload;
-import net.minecraft.src.Render;
-import net.minecraft.src.RenderManager;
-import net.minecraft.src.Tessellator;
-
 import com.mumfrey.liteloader.core.LiteLoader;
+import net.minecraft.client.Minecraft;
+import net.minecraft.src.*;
+
 public abstract class ModUtilities
 {
     /**
@@ -24,9 +17,10 @@ public abstract class ModUtilities
      * @param entityClass
      * @param renderer
      */
-    public static void addRenderer(Class entityClass, Render renderer)
+    @SuppressWarnings("unchecked")
+	public static void addRenderer(Class<? extends Entity> entityClass, Render renderer)
     {
-    	Map entityRenderMap = PrivateFields.entityRenderMap.Get(RenderManager.instance);
+    	Map<Class<? extends Entity>, Render> entityRenderMap = PrivateFields.entityRenderMap.Get(RenderManager.instance);
     	entityRenderMap.put(entityClass, renderer);
     	renderer.setRenderManager(RenderManager.instance);
     }
@@ -37,13 +31,14 @@ public abstract class ModUtilities
 	 * @param packetId
 	 * @param newPacket
 	 */
-	public static boolean registerPacketOverride(int packetId, Class newPacket)
+	@SuppressWarnings("unchecked")
+	public static boolean registerPacketOverride(int packetId, Class<? extends Packet> newPacket)
 	{
 		try
 		{
 	    	IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
 	    	PrivateFields.StaticFields.packetClassToIdMap.Get();
-			Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.Get();
+			Map<Class<? extends Packet>, Integer> packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.Get();
 		    packetIdToClassMap.removeObject(packetId);
 		    packetIdToClassMap.addKey(packetId, newPacket);
@@ -111,6 +106,7 @@ public abstract class ModUtilities
 	    {
 	    	keyBindings.add(newBinding);
 	    	mc.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
+	    	mc.gameSettings.loadOptions();
 	    }
 	}
 package com.mumfrey.liteloader.util;
-import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Map;
-import java.util.Properties;
-import java.util.zip.ZipFile;
 import net.minecraft.client.Minecraft;
-import net.minecraft.src.GuiButton;
-import net.minecraft.src.GuiIngame;
-import net.minecraft.src.GuiScreen;
-import net.minecraft.src.GuiSlot;
-import net.minecraft.src.GuiTexturePacks;
-import net.minecraft.src.NetClientHandler;
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet;
-import net.minecraft.src.Profiler;
-import net.minecraft.src.RenderEngine;
-import net.minecraft.src.RenderGlobal;
-import net.minecraft.src.RenderManager;
-import net.minecraft.src.SoundManager;
-import net.minecraft.src.SoundPool;
-import net.minecraft.src.StringTranslate;
-import net.minecraft.src.TexturePackCustom;
-import net.minecraft.src.TexturePackImplementation;
-import net.minecraft.src.TexturePackList;
-import net.minecraft.src.TileEntity;
-import net.minecraft.src.Timer;
-import net.minecraft.src.WorldInfo;
-import net.minecraft.src.WorldRenderer;
-import net.minecraft.src.WorldType;
+import net.minecraft.src.*;
 /**
  * Wrapper for obf/mcp reflection-accessed private fields, mainly added to centralise the locations I have to update the obfuscated field names
+package net.minecraft.src;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import com.mumfrey.liteloader.core.CallableLiteLoaderMods;
+
+class CallableJVMFlags implements Callable
+{
+    /** Gets additional Java Enviroment info for Crash Report. */
+    final CrashReport crashReportJVMFlags;
+
+    CallableJVMFlags(CrashReport par1CrashReport)
+    {
+        this.crashReportJVMFlags = par1CrashReport;
+        par1CrashReport.addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
+    }
+
+    public String func_71487_a()
+    {
+        RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
+        List var2 = var1.getInputArguments();
+        int var3 = 0;
+        StringBuilder var4 = new StringBuilder();
+        Iterator var5 = var2.iterator();
+
+        while (var5.hasNext())
+        {
+            String var6 = (String)var5.next();
+
+            if (var6.startsWith("-X"))
+            {
+                if (var3++ > 0)
+                {
+                    var4.append(" ");
+                }
+
+                var4.append(var6);
+            }
+        }
+
+        return String.format("%d total; %s", new Object[] {Integer.valueOf(var3), var4.toString()});
+    }
+
+    @Override
+	public Object call()
+    {
+        return this.func_71487_a();
+    }
+}