Liteloader 1.4.4

Mumfrey
1 parent c92c91ea
Showing 10 changed files with 324 additions and 92 deletions
.classpath
.project
java/com/mumfrey/liteloader/PreLoginListener.java
java/com/mumfrey/liteloader/RenderListener.java
java/com/mumfrey/liteloader/core/HookLogin.java
java/com/mumfrey/liteloader/core/LiteLoaderHook.java → java/com/mumfrey/liteloader/core/HookProfiler.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/util/PrivateFields.java
java/net/minecraft/src/CallableJVMFlags.java
java/net/minecraft/src/RenderLightningBolt.java
@@ -2,23 +2,12 @@
 <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="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="LiteLoader/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="LiteLoader/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="LiteLoader/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/bin/jinput.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/bin/lwjgl_util.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/bin/lwjgl.jar"/>
+	<classpathentry kind="lib" path="/Client/jars/bin/minecraft.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -14,13 +14,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>jars</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/jars</locationURI>
-		</link>
-	</linkedResources>
 	<variableList>
 		<variable>
 			<name>MCP_LOC</name>
+package com.mumfrey.liteloader;
+
+import net.minecraft.src.NetHandler;
+import net.minecraft.src.Packet1Login;
+
+/**
+ * Interface for mods which wish to be notified when the player connects to a server (or local game)
+ *
+ * @author Adam Mummery-Smith
+ */
+public interface PreLoginListener extends LiteMod
+{
+	/**
+	 * Called on login
+	 * 
+	 * @param netHandler Net handler
+	 * @param loginPacket Login packet
+	 */
+	public abstract boolean onPreLogin(NetHandler netHandler, Packet1Login loginPacket);
+}
+package com.mumfrey.liteloader;
+
+/**
+ * Interface for objects which want a pre-render callback
+ * 
+ * @author Adam Mummery-Smith
+ */
+public interface RenderListener extends LiteMod
+{
+	/**
+	 * Callback when a frame is rendered
+	 */
+	public abstract void onRender();
+	
+	public abstract void onRenderWorld();
+}
@@ -25,8 +25,11 @@ public class HookLogin extends Packet1Login
 	@Override
 	public void processPacket(NetHandler par1NetHandler)
 	{
-		super.processPacket(par1NetHandler);
-		
-		if (loader != null) loader.onConnectToServer(par1NetHandler, this);
+		if (loader == null || loader.onPreLogin(par1NetHandler, this))
+		{
+			super.processPacket(par1NetHandler);
+
+			if (loader != null) loader.onConnectToServer(par1NetHandler, this);
+		}
 	}
 }
@@ -14,7 +14,7 @@ import net.minecraft.src.Profiler;
  *
  * @author Adam Mummery-Smith
  */
-public class LiteLoaderHook extends Profiler
+public class HookProfiler extends Profiler
 {
 	/**
 	 * Logger instance
@@ -24,12 +24,12 @@ public class LiteLoaderHook extends Profiler
 	/**
 	 * LiteLoader instance which will receive callbacks
 	 */
-	private LiteLoader core;
+	private LiteLoader loader;
 	/**
 	 * Section list, used as a kind of stack to determine where we are in the profiler stack
 	 */
-	private LinkedList<String> sections = new LinkedList<String>();
+	private LinkedList<String> sectionStack = new LinkedList<String>();
 	/**
 	 * Initialisation done
@@ -57,9 +57,9 @@ public class LiteLoaderHook extends Profiler
 	 * @param core LiteLoader object which will get callbacks
 	 * @param logger Logger instance
 	 */
-	public LiteLoaderHook(LiteLoader core, Logger logger)
+	public HookProfiler(LiteLoader core, Logger logger)
 	{
-		this.core = core;
+		this.loader = core;
 		this.logger = logger;
 		// Detect optifine (duh!)
@@ -128,13 +128,18 @@ public class LiteLoaderHook extends Profiler
 		if (!initDone)
 		{
 			initDone = true;
-			core.onInit();
+			loader.onInit();
 		}
-		if (sectionName.equals("animateTick")) tick = true;
-		sections.add(sectionName);
+		if ("gameRenderer".equalsIgnoreCase(sectionName) && "root".equalsIgnoreCase(sectionStack.getLast()))
+		{
+			loader.onRender();
+		}
+			
+		if ("animateTick".equals(sectionName)) tick = true;
+		sectionStack.add(sectionName);
 		super.startSection(sectionName);
-		
+
 		if (ofProfiler != null)
 		{
 			try
@@ -160,13 +165,13 @@ public class LiteLoaderHook extends Profiler
 	{
 		super.endSection();
-		String endingSection = sections.removeLast();
+		String endingSection = sectionStack.removeLast();
-		if (endingSection.equalsIgnoreCase("gameRenderer") && sections.getLast().equalsIgnoreCase("root"))
+		if ("gameRenderer".equalsIgnoreCase(endingSection) && "root".equalsIgnoreCase(sectionStack.getLast()))
 		{
 			super.startSection("litetick");
-			core.onTick(tick);
+			loader.onTick(this, tick);
 			tick = false;
 			super.endSection();
@@ -28,26 +28,27 @@ import net.minecraft.src.Timer;
  * LiteLoader is a simple loader which provides tick events to loaded mods 
  *
  * @author Adam Mummery-Smith
- * @version 1.4.0
+ * @version 1.4.4
  */
+@SuppressWarnings("rawtypes")
 public final class LiteLoader implements FilenameFilter
 {
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.4.0";
+	private static final String LOADER_VERSION = "1.4.4";
 	/**
 	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
 	 */
-	private static final int LOADER_REVISION = 4;
+	private static final int LOADER_REVISION = 6;
 	/**
 	 * 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.4.0", "1.4" };
+	private static final String[] SUPPORTED_VERSIONS = { "1.4.4" };
 	/**
 	 * LiteLoader is a singleton, this is the singleton instance
@@ -96,6 +97,12 @@ public final class LiteLoader implements FilenameFilter
 	private LinkedList<InitCompleteListener> initListeners = new LinkedList<InitCompleteListener>();
 	/**
+	 * List of mods which implement RenderListener interface and will receive render events
+	 * events
+	 */
+	private LinkedList<RenderListener> renderListeners = new LinkedList<RenderListener>();
+	
+	/**
 	 * List of mods which implement ChatListener interface and will receive chat
 	 * events
 	 */
@@ -113,6 +120,11 @@ public final class LiteLoader implements FilenameFilter
 	private LinkedList<LoginListener> loginListeners = new LinkedList<LoginListener>();
 	/**
+	 * List of mods which implement LoginListener interface and will receive client login events
+	 */
+	private LinkedList<PreLoginListener> preLoginListeners = new LinkedList<PreLoginListener>();
+	
+	/**
 	 * List of mods which implement PluginChannelListener interface
 	 */
 	private LinkedList<PluginChannelListener> pluginChannelListeners = new LinkedList<PluginChannelListener>();
@@ -127,7 +139,12 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private Method mAddUrl;
-	private boolean initDone = false;
+	/**
+	 * Flag which keeps track of whether late initialisation has been done
+	 */
+	private boolean loaderStartupDone, loaderStartupComplete, lateInitDone;
+
+	private boolean chatHooked, loginHooked, pluginChannelHooked, tickHooked;
 	/**
 	 * Get the singleton instance of LiteLoader, initialises the loader if necessary
@@ -138,7 +155,10 @@ public final class LiteLoader implements FilenameFilter
 	{
 		if (instance == null)
 		{
+			// Return immediately to stop calls to getInstance causing re-init if they arrive
+			// before init is completed
 			instance = new LiteLoader();
+			instance.initLoader();
 		}
 		return instance;
@@ -179,26 +199,37 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private LiteLoader()
 	{
+	}
+	
+	private void initLoader()
+	{
+		if (loaderStartupDone) return;
+		loaderStartupDone = true;
+		
 		// Set up base class overrides
 		prepareClassOverrides();
 		// Set up loader, initialises any reflection methods needed
-		prepareLoader();
-		
-		logger.info("Liteloader " + LOADER_VERSION + " starting up...");
-
-		// Examines the class path and mods folder and locates loadable mods
-		prepareMods();
-		
-		// Initialises enumerated mods
-		initMods();
-		
-		// Initialises the required hooks for loaded mods
-		initHooks();
+		if (prepareLoader())
+		{
+			logger.info("LiteLoader " + LOADER_VERSION + " starting up...");
+			logger.info(String.format("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase()));
+	
+			// Examines the class path and mods folder and locates loadable mods
+			prepareMods();
+			
+			// Initialises enumerated mods
+			initMods();
+			
+			// Initialises the required hooks for loaded mods
+			initHooks();
+			
+			loaderStartupComplete = true;
+		}
 	}
 	/**
-	 * 
+	 * Do dirty non-base-clean overrides
 	 */
 	private void prepareClassOverrides()
 	{
@@ -233,13 +264,18 @@ public final class LiteLoader implements FilenameFilter
 				outputStream.close();
 			    resourceInputStream.close();
-					
+
+			    logger.info("Defining class override for " + binaryClassName);
 			    mDefineClass.invoke(Minecraft.class.getClassLoader(), binaryClassName, data, 0, data.length);
 			}
+			else
+			{
+			    logger.info("Error defining class override for " + binaryClassName + ", file not found");
+			}
 		}
 		catch (Throwable th)
 		{
-			th.printStackTrace();
+		    logger.log(Level.WARNING, "Error defining class override for " + binaryClassName, th);
 		}
 	}
@@ -247,7 +283,7 @@ public final class LiteLoader implements FilenameFilter
 	 * Set up reflection methods required by the loader
 	 */
 	@SuppressWarnings("unchecked")
-	private void prepareLoader()
+	private boolean prepareLoader()
 	{
 		try
 		{
@@ -279,12 +315,14 @@ public final class LiteLoader implements FilenameFilter
 			FileHandler logFileHandler = new FileHandler(new File(Minecraft.getMinecraftDir(), "LiteLoader.txt").getAbsolutePath());
 			if (minecraftLogFormatter != null) logFileHandler.setFormatter(minecraftLogFormatter);
 			logger.addHandler(logFileHandler);
-
 		}
-		catch (Exception ex)
+		catch (Throwable th)
 		{
-			logger.log(Level.SEVERE, "Error initialising LiteLoader", ex);
+			logger.log(Level.SEVERE, "Error initialising LiteLoader", th);
+			return false;
 		}
+		
+		return true;
 	}
 	/**
@@ -341,16 +379,25 @@ public final class LiteLoader implements FilenameFilter
 		HashMap<String, Class> modsToLoad = null;
 		try
 		{
-			logger.info("Loading mods from class path");
-			
+			logger.info("Enumerating class path...");
+
+			String classPath = System.getProperty("java.class.path");
 			String classPathSeparator = System.getProperty("path.separator");
-			String[] classPathEntries = System.getProperty("java.class.path").split(classPathSeparator);
+			String[] classPathEntries = classPath.split(classPathSeparator);
+			
+			logger.info(String.format("Class path separator=\"%s\"", classPathSeparator));
+			logger.info(String.format("Class path entries=(\n   classpathEntry=%s\n)", classPath.replace(classPathSeparator, "\n   classpathEntry=")));
+			
+			logger.info("Loading mods from class path...");
+
 			modsToLoad = findModClasses(classPathEntries, modFiles);
+
+			logger.info("Mod class discovery completed");
 		}
-		catch (Exception ex)
+		catch (Throwable th)
 		{
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
+			logger.log(Level.WARNING, "Mod class discovery failed", th);
+			return;
 		}
 		loadMods(modsToLoad);
@@ -421,14 +468,17 @@ public final class LiteLoader implements FilenameFilter
 		try
 		{
+			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");
 			for (Class mod : modClasses)
 			{
 				modsToLoad.put(mod.getSimpleName(), mod);
 			}
+
+			if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
 		catch (Throwable th)
 		{
@@ -438,6 +488,8 @@ public final class LiteLoader implements FilenameFilter
 		// Search through the class path and find mod classes
 		for (String classPathPart : classPathEntries)
 		{
+			logger.info(String.format("Searching %s...", classPathPart));
+			
 			File packagePath = new File(classPathPart);
 			LinkedList<Class> modClasses = getSubclassesFor(packagePath, Minecraft.class.getClassLoader(), LiteMod.class, "LiteMod");
@@ -445,17 +497,23 @@ public final class LiteLoader implements FilenameFilter
 			{
 				modsToLoad.put(mod.getSimpleName(), mod);
 			}
+			
+			if (modClasses.size() > 0) logger.info(String.format("Found %s potential matches", modClasses.size()));
 		}
 		// Search through mod files and find mod classes
 		for (File modFile : modFiles)
 		{
+			logger.info(String.format("Searching %s...", modFile.getAbsolutePath()));
+			
 			LinkedList<Class> modClasses = getSubclassesFor(modFile, 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()));
 		}
 		return modsToLoad;
@@ -468,7 +526,11 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private void loadMods(HashMap<String, Class> modsToLoad)
 	{
-		if (modsToLoad == null) return;
+		if (modsToLoad == null)
+		{
+			logger.info("Mod class discovery failed. Not loading any mods!");
+			return;
+		}
 		logger.info("Discovered " + modsToLoad.size() + " total mod(s)");
@@ -511,32 +573,42 @@ public final class LiteLoader implements FilenameFilter
 				if (mod instanceof Tickable)
 				{
-					tickListeners.add((Tickable)mod);
+					addTickListener((Tickable)mod);
 				}
 				if (mod instanceof InitCompleteListener)
 				{
-					initListeners.add((InitCompleteListener)mod);
+					addInitListener((InitCompleteListener)mod);
+				}
+				
+				if (mod instanceof RenderListener)
+				{
+					addRenderListener((RenderListener)mod);
 				}
 				if (mod instanceof ChatFilter)
 				{
-					chatFilters.add((ChatFilter)mod);
+					addChatFilter((ChatFilter)mod);
 				}
 				if (mod instanceof ChatListener && !(mod instanceof ChatFilter))
 				{
-					chatListeners.add((ChatListener)mod);
+					addChatListener((ChatListener)mod);
+				}
+				
+				if (mod instanceof PreLoginListener)
+				{
+					addPreLoginListener((PreLoginListener)mod);
 				}
 				if (mod instanceof LoginListener)
 				{
-					loginListeners.add((LoginListener)mod);
+					addLoginListener((LoginListener)mod);
 				}
 				if (mod instanceof PluginChannelListener)
 				{
-					pluginChannelListeners.add((PluginChannelListener)mod);
+					addPluginChannelListener((PluginChannelListener)mod);
 				}
 				loadedModsList += String.format("\n    - %s version %s", mod.getName(), mod.getVersion());
@@ -551,7 +623,7 @@ public final class LiteLoader implements FilenameFilter
 		loadedModsList = String.format("%s loaded mod(s)%s", loadedModsCount, loadedModsList);
 	}
-	
+
 	/**
 	 * Initialise mod hooks
 	 */
@@ -560,28 +632,35 @@ public final class LiteLoader implements FilenameFilter
 		try
 		{
 			// Chat hook
-			if (chatListeners.size() > 0 || chatFilters.size() > 0)
+			if ((chatListeners.size() > 0 || chatFilters.size() > 0) && !chatHooked)
 			{
+				chatHooked = true;
 				HookChat.Register();
 				HookChat.RegisterPacketHandler(this);
 			}
 			// Login hook
-			if (loginListeners.size() > 0)
+			if ((preLoginListeners.size() > 0 || loginListeners.size() > 0) && !loginHooked)
 			{
+				loginHooked = true;
 				ModUtilities.registerPacketOverride(1, HookLogin.class);
 				HookLogin.loader = this;
 			}
 			// Plugin channels hook
-			if (pluginChannelListeners.size() > 0)
+			if (pluginChannelListeners.size() > 0 && !pluginChannelHooked)
 			{
+				pluginChannelHooked = true;
 				HookPluginChannels.Register();
 				HookPluginChannels.RegisterPacketHandler(this);
 			}
 			// Tick hook
-			PrivateFields.minecraftProfiler.SetFinal(minecraft, new LiteLoaderHook(this, logger));
+			if (!tickHooked)
+			{
+				tickHooked = true;
+				PrivateFields.minecraftProfiler.SetFinal(minecraft, new HookProfiler(this, logger));
+			}
 		}
 		catch (Exception ex)
 		{
@@ -591,6 +670,102 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * @param tickable
+	 */
+	public void addTickListener(Tickable tickable)
+	{
+		if (!tickListeners.contains(tickable))
+		{
+			tickListeners.add(tickable);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+	
+	/**
+	 * @param initCompleteListener
+	 */
+	public void addInitListener(InitCompleteListener initCompleteListener)
+	{
+		if (!initListeners.contains(initCompleteListener))
+		{
+			initListeners.add(initCompleteListener);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param tickable
+	 */
+	public void addRenderListener(RenderListener tickable)
+	{
+		if (!renderListeners.contains(tickable))
+		{
+			renderListeners.add(tickable);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param chatFilter
+	 */
+	public void addChatFilter(ChatFilter chatFilter)
+	{
+		if (!chatFilters.contains(chatFilter))
+		{
+			chatFilters.add(chatFilter);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param chatListener
+	 */
+	public void addChatListener(ChatListener chatListener)
+	{
+		if (!chatListeners.contains(chatListener))
+		{
+			chatListeners.add(chatListener);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param loginListener
+	 */
+	public void addPreLoginListener(PreLoginListener loginListener)
+	{
+		if (!preLoginListeners.contains(loginListener))
+		{
+			preLoginListeners.add(loginListener);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param loginListener
+	 */
+	public void addLoginListener(LoginListener loginListener)
+	{
+		if (!loginListeners.contains(loginListener))
+		{
+			loginListeners.add(loginListener);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
+	 * @param pluginChannelListener
+	 */
+	public void addPluginChannelListener(PluginChannelListener pluginChannelListener)
+	{
+		if (!pluginChannelListeners.contains(pluginChannelListener))
+		{
+			pluginChannelListeners.add(pluginChannelListener);
+			if (loaderStartupComplete) initHooks();
+		}
+	}
+
+	/**
 	 * Enumerate classes on the classpath which are subclasses of the specified
 	 * class
 	 * 
@@ -762,9 +937,9 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	public void onInit()
 	{
-		if (!initDone)
+		if (!lateInitDone)
 		{
-			initDone = true;
+			lateInitDone = true;
 			for (InitCompleteListener initMod : initListeners)
 			{
@@ -780,13 +955,22 @@ public final class LiteLoader implements FilenameFilter
 			}
 		}
 	}
+
+	/**
+	 * Callback from the tick hook, pre render
+	 */
+	public void onRender()
+	{
+		for (RenderListener renderListener : renderListeners)
+			renderListener.onRender();
+	}
 	/**
 	 * 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)
 	 */
-	public void onTick(boolean tick)
+	public void onTick(Profiler profiler, boolean tick)
 	{
 		float partialTicks = 0.0F;
@@ -809,7 +993,9 @@ public final class LiteLoader implements FilenameFilter
 		// Iterate tickable mods
 		for (Tickable tickable : tickListeners)
 		{
+			profiler.startSection(tickable.getClass().getSimpleName());
 			tickable.onTick(minecraft, partialTicks, inGame, tick);
+			profiler.endSection();
 		}
 	}
@@ -832,6 +1018,25 @@ public final class LiteLoader implements FilenameFilter
 		return true;
 	}
+
+	/**
+	 * Pre-login callback from the login hook
+	 * 
+	 * @param netHandler
+	 * @param hookLogin
+	 * @return
+	 */
+	public boolean onPreLogin(NetHandler netHandler, Packet1Login loginPacket)
+	{
+		boolean cancelled = false;
+		
+		for (PreLoginListener loginListener : preLoginListeners)
+		{
+			cancelled |= !loginListener.onPreLogin(netHandler, loginPacket);
+		}
+		
+		return !cancelled;
+	}
 	/**
 	 * Callback from the login hook
@@ -130,12 +130,12 @@ public class PrivateFields&lt;P, T&gt;
 		public T Get() { return Get(null); }
 		public void Set(T value) { Set(null, value); }
-		public static final StaticFields<Packet, Map>           packetClassToIdMap = new StaticFields<Packet, Map>     (Packet.class,     "packetClassToIdMap", "a");
-		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a");
+		public static final StaticFields<Packet, Map>           packetClassToIdMap = new StaticFields<Packet, Map>     (Packet.class,     "packetClassToIdMap", "a"); // Packet/packetClassToIdMap
+		public static final StaticFields<TileEntity, Map> tileEntityNameToClassMap = new StaticFields<TileEntity, Map> (TileEntity.class, "nameToClassMap",     "a"); // TileEntity/nameToClassMap
 	}
-	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "T");
-	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "o");
-	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "I");
+	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "T");  // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "I");  // Minecraft/mcProfiler
+	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "p");  // RenderManager/entityRenderMap
 }
@@ -16,7 +16,7 @@ class CallableJVMFlags implements Callable
     CallableJVMFlags(CrashReport par1CrashReport)
     {
         this.crashReportJVMFlags = par1CrashReport;
-        par1CrashReport.addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
+        par1CrashReport.func_85056_g().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
     }
     public String func_71487_a()
 package net.minecraft.src;
 import java.util.Random;
+
 import org.lwjgl.opengl.GL11;
 import com.mumfrey.liteloader.core.LiteLoader;
@@ -12,8 +13,8 @@ public class RenderLightningBolt extends Render
 		// LiteLoader init
 		LiteLoader.getInstance();
 	}
-	
-    /**
+
+	/**
      * Actually renders the lightning bolt. This method is called through the doRender method.
      */
     public void doRenderLightningBolt(EntityLightningBolt par1EntityLightningBolt, double par2, double par4, double par6, float par8, float par9)