LiteLoader for Minecraft 1.5

Mumfrey
1 parent 5403adcb
Showing 11 changed files with 245 additions and 155 deletions
java/com/mumfrey/liteloader/PluginChannelListener.java
java/com/mumfrey/liteloader/core/HookChat.java
java/com/mumfrey/liteloader/core/HookPluginChannels.java
java/com/mumfrey/liteloader/core/HookProfiler.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderLogFormatter.java
java/com/mumfrey/liteloader/util/ModUtilities.java
java/com/mumfrey/liteloader/util/PrivateFields.java
java/net/minecraft/src/CallableJVMFlags.java
java/net/minecraft/src/RenderLightningBolt.java
res/liteloader.properties
@@ -16,12 +16,12 @@ public interface PluginChannelListener extends LoginListener
 	 */
 	public abstract List<String> getChannels();
-    /**
-     * Called when a custom payload packet arrives on a channel this mod has registered
-     * 
-     * @param channel Channel on which the custom payload was received
-     * @param length Length of the custom payload data
-     * @param data Custom payload data
-     */
-    public abstract void onCustomPayload(String channel, int length, byte[] data);
+	/**
+	 * Called when a custom payload packet arrives on a channel this mod has registered
+	 * 
+	 * @param channel Channel on which the custom payload was received
+	 * @param length Length of the custom payload data
+	 * @param data Custom payload data
+	 */
+	public abstract void onCustomPayload(String channel, int length, byte[] data);
 }
@@ -117,15 +117,15 @@ public class HookChat extends Packet3Chat
 	{
 		if (proxyPacket != null)
 			return proxyPacket.getPacketSize();
-		else
-			return super.getPacketSize();
+
+		return super.getPacketSize();
 	}
 	/**
 	 * Register the specified handler as the packet handler for this packet
 	 * @param handler
 	 */
-	public static void RegisterPacketHandler(LiteLoader handler)
+	public static void registerPacketHandler(LiteLoader handler)
 	{
 		packetHandler = handler;
 	}
@@ -133,9 +133,9 @@ public class HookChat extends Packet3Chat
 	/**
 	 * Register this packet as the new packet for packet ID 3
 	 */
-    public static void Register()
+    public static void register()
     {
-    	Register(false);
+    	register(false);
     }
     /**
@@ -144,8 +144,8 @@ public class HookChat extends Packet3Chat
      * 
      * @param force Force registration even if registration was already performed previously.
      */
-    @SuppressWarnings("unchecked")
-	public static void Register(boolean force)
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	public static void register(boolean force)
 	{
 		if (!registered || force)
 		{
@@ -162,7 +162,7 @@ public class HookChat extends Packet3Chat
 			    packetIdToClassMap.removeObject(3);
 			    packetIdToClassMap.addKey(3, HookChat.class);
-			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.Get();
+			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
 			    packetClassToIdMap.put(HookChat.class, Integer.valueOf(3));
 			    registered = true;
@@ -109,15 +109,15 @@ public class HookPluginChannels extends Packet250CustomPayload
 	{
 		if (proxyPacket != null)
 			return proxyPacket.getPacketSize();
-		else
-			return super.getPacketSize();
+		
+		return super.getPacketSize();
 	}
 	/**
 	 * Register the specified handler as the packet handler for this packet
 	 * @param handler
 	 */
-	public static void RegisterPacketHandler(LiteLoader handler)
+	public static void registerPacketHandler(LiteLoader handler)
 	{
 		packetHandler = handler;
 	}
@@ -125,9 +125,9 @@ public class HookPluginChannels extends Packet250CustomPayload
 	/**
 	 * Register this packet as the new packet for packet ID 250
 	 */
-    public static void Register()
+    public static void register()
     {
-    	Register(false);
+    	register(false);
     }
     /**
@@ -136,8 +136,8 @@ public class HookPluginChannels extends Packet250CustomPayload
      * 
      * @param force Force registration even if registration was already performed previously.
      */
-    @SuppressWarnings("unchecked")
-	public static void Register(boolean force)
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	public static void register(boolean force)
 	{
 		if (!registered || force)
 		{
@@ -154,7 +154,7 @@ public class HookPluginChannels extends Packet250CustomPayload
 			    packetIdToClassMap.removeObject(250);
 			    packetIdToClassMap.addKey(250, HookPluginChannels.class);
-			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.Get();
+			    Map packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
 			    packetClassToIdMap.put(HookPluginChannels.class, Integer.valueOf(250));
 			    registered = true;
@@ -5,10 +5,7 @@ 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;
@@ -68,7 +65,7 @@ public class HookProfiler extends Profiler
 		this.logger = logger;
 		// Detect optifine (duh!)
-		DetectOptifine();
+		detectOptifine();
 	}
 	/**
@@ -76,7 +73,7 @@ public class HookProfiler extends Profiler
 	 * 
 	 * @param logger
 	 */
-	private void DetectOptifine()
+	private void detectOptifine()
 	{
 		try
 		{
@@ -91,7 +88,7 @@ public class HookProfiler extends Profiler
 		{
 			if (ofProfiler != null)
 			{
-				logger.info(String.format("Optifine version %s detected, enabling compatibility check", GetOptifineVersion()));
+				logger.info(String.format("Optifine version %s detected, enabling compatibility check", getOptifineVersion()));
 			}
 		}
 	}
@@ -101,15 +98,14 @@ public class HookProfiler extends Profiler
 	 * 
 	 * @return
 	 */
-	private String GetOptifineVersion()
+	private String getOptifineVersion()
 	{
 		try
 		{
-			Class config = Class.forName("Config");
+			Class<?> config = Class.forName("Config");
 			if (config != null)
 			{
-				@SuppressWarnings("unchecked")
 				Method getVersion = config.getDeclaredMethod("getVersion");
 				if (getVersion != null)
@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -32,8 +31,9 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
+import javax.activity.InvalidActivityException;
+
 import net.minecraft.client.Minecraft;
-import net.minecraft.src.ConsoleLogManager;
 import net.minecraft.src.NetHandler;
 import net.minecraft.src.Packet1Login;
 import net.minecraft.src.Packet3Chat;
@@ -57,7 +57,7 @@ import com.mumfrey.liteloader.util.PrivateFields;
  * LiteLoader is a simple loader which provides tick events to loaded mods 
  *
  * @author Adam Mummery-Smith
- * @version 1.4.7
+ * @version 1.5
  */
 @SuppressWarnings("rawtypes")
 public final class LiteLoader implements FilenameFilter
@@ -65,19 +65,19 @@ public final class LiteLoader implements FilenameFilter
 	/**
 	 * Liteloader version 
 	 */
-	private static final String LOADER_VERSION = "1.4.7";
+	private static final String LOADER_VERSION = "1.5";
 	/**
 	 * Loader revision, can be used by mods to determine whether the loader is sufficiently up-to-date 
 	 */
-	private static final int LOADER_REVISION = 7;
+	private static final int LOADER_REVISION = 8;
 	/**
 	 * 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.6", "1.4.7" };
+	private static final String[] SUPPORTED_VERSIONS = { "1.5", "1.5.r1" };
 	/**
 	 * Maximum recursion depth for mod discovery
@@ -241,6 +241,11 @@ public final class LiteLoader implements FilenameFilter
 		return logger;
 	}
+	/**
+	 * Get the output stream which we are using for console output
+	 * 
+	 * @return
+	 */
 	public static final PrintStream getConsoleStream()
 	{
 		return useStdOut ? System.out : System.err;
@@ -331,7 +336,7 @@ public final class LiteLoader implements FilenameFilter
 	 */
 	private void prepareClassOverrides()
 	{
-		this.registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "g"), "g");
+		this.registerBaseClassOverride(ModUtilities.getObfuscatedFieldName("net.minecraft.src.CallableJVMFlags", "h"), "h");
 	}
 	/**
@@ -355,25 +360,25 @@ public final class LiteLoader implements FilenameFilter
 				for (int readBytes = resourceInputStream.read(); readBytes >= 0; readBytes = resourceInputStream.read())
 				{
-			        outputStream.write(readBytes);
+					outputStream.write(readBytes);
 				}
-			 
+			
 				byte[] data = outputStream.toByteArray();
 				outputStream.close();
-			    resourceInputStream.close();
+				resourceInputStream.close();
-			    logger.info("Defining class override for " + binaryClassName);
-			    mDefineClass.invoke(Minecraft.class.getClassLoader(), binaryClassName, data, 0, data.length);
+				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");
+				logger.info("Error defining class override for " + binaryClassName + ", file not found");
 			}
 		}
 		catch (Throwable th)
 		{
-		    logger.log(Level.WARNING, "Error defining class override for " + binaryClassName, th);
+			logger.log(Level.WARNING, "Error defining class override for " + binaryClassName, th);
 		}
 	}
@@ -417,34 +422,19 @@ public final class LiteLoader implements FilenameFilter
 	 * @throws SecurityException
 	 * @throws IOException
 	 */
-	@SuppressWarnings("unchecked")
 	private void prepareLogger() throws SecurityException, IOException
 	{
-		Formatter minecraftLogFormatter = null;
-		
-		try
-		{
-			Class<? extends Formatter> formatterClass = (Class<? extends Formatter>)Minecraft.class.getClassLoader().loadClass(ModUtilities.getObfuscatedFieldName("net.minecraft.src.ConsoleLogFormatter", "em"));
-			Constructor<? extends Formatter> defaultConstructor = formatterClass.getDeclaredConstructor();
-			defaultConstructor.setAccessible(true);
-			minecraftLogFormatter = defaultConstructor.newInstance();
-		}
-		catch (Exception ex)
-		{
-			ConsoleLogManager.init();
-			minecraftLogFormatter = ConsoleLogManager.loggerLogManager.getHandlers()[0].getFormatter();
-		}
+		Formatter logFormatter = new LiteLoaderLogFormatter();
 		logger.setUseParentHandlers(false);
-		
 		this.useStdOut = System.getProperty("liteloader.log", "stderr").equalsIgnoreCase("stdout") || this.localProperties.getProperty("log", "stderr").equalsIgnoreCase("stdout");
 		StreamHandler consoleHandler = useStdOut ? new com.mumfrey.liteloader.util.log.ConsoleHandler() : new java.util.logging.ConsoleHandler();
-		if (minecraftLogFormatter != null) consoleHandler.setFormatter(minecraftLogFormatter);
+		consoleHandler.setFormatter(logFormatter);
 		logger.addHandler(consoleHandler);
 		FileHandler logFileHandler = new FileHandler(new File(Minecraft.getMinecraftDir(), "LiteLoader.txt").getAbsolutePath());
-		if (minecraftLogFormatter != null) logFileHandler.setFormatter(minecraftLogFormatter);
+		logFileHandler.setFormatter(logFormatter);
 		logger.addHandler(logFileHandler);
 	}
@@ -470,6 +460,7 @@ public final class LiteLoader implements FilenameFilter
 		try
 		{
+			this.localProperties = new Properties(this.internalProperties);
 			InputStream localPropertiesStream = this.getLocalPropertiesStream();
 			if (localPropertiesStream != null)
@@ -480,7 +471,7 @@ public final class LiteLoader implements FilenameFilter
 		}
 		catch (Throwable th)
 		{
-			this.localProperties = new Properties();
+			this.localProperties = new Properties(this.internalProperties);
 		}
 	}
@@ -560,6 +551,34 @@ public final class LiteLoader implements FilenameFilter
 	}
 	/**
+	 * Get a reference to a loaded mod, if the mod exists
+	 * 
+	 * @param modName Mod's name or class name
+	 * @return
+	 * @throws InvalidActivityException
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends LiteMod> T getMod(String modName) throws InvalidActivityException, IllegalArgumentException
+	{
+		if (!this.loaderStartupComplete)
+		{
+			throw new InvalidActivityException("Attempted to get a reference to a mod before loader startup is complete");
+		}
+		
+		if (modName == null)
+		{
+			throw new IllegalArgumentException("Attempted to get a reference to a mod without specifying a mod name");
+		}
+			
+		for (LiteMod mod : this.mods)
+		{
+			if (modName.equalsIgnoreCase(mod.getName()) || modName.equalsIgnoreCase(mod.getClass().getSimpleName())) return (T)mod;
+		}
+		
+		return null;
+	}
+	
+	/**
 	 * Enumerate the java class path and "mods" folder to find mod classes, then load the classes
 	 */
 	private void prepareMods(boolean searchMods, boolean searchProtectionDomain, boolean searchClassPath)
@@ -637,6 +656,10 @@ public final class LiteLoader implements FilenameFilter
 					{
 						modFiles.add(modFile);
 					}
+					else
+					{
+						logger.info("Not adding invalid or outdated mod file: " +  modFile.getAbsolutePath());
+					}
 				}
 				modZip.close();
@@ -705,6 +728,11 @@ public final class LiteLoader implements FilenameFilter
 					for (Class mod : modClasses)
 					{
+						if (modsToLoad.containsKey(mod.getSimpleName()))
+						{
+							logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
+						}
+						
 						modsToLoad.put(mod.getSimpleName(), mod);
 					}
@@ -729,6 +757,11 @@ public final class LiteLoader implements FilenameFilter
 				for (Class mod : modClasses)
 				{
+					if (modsToLoad.containsKey(mod.getSimpleName()))
+					{
+						logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
+					}
+					
 					modsToLoad.put(mod.getSimpleName(), mod);
 				}
@@ -745,6 +778,11 @@ public final class LiteLoader implements FilenameFilter
 			for (Class mod : modClasses)
 			{
+				if (modsToLoad.containsKey(mod.getSimpleName()))
+				{
+					logger.warning("Mod name collision for mod with class '" + mod.getSimpleName() + "', maybe you have more than one copy?");
+				}
+				
 				modsToLoad.put(mod.getSimpleName(), mod);
 			}
@@ -831,9 +869,16 @@ public final class LiteLoader implements FilenameFilter
 					this.addChatFilter((ChatFilter)mod);
 				}
-				if (mod instanceof ChatListener && !(mod instanceof ChatFilter))
+				if (mod instanceof ChatListener)
 				{
-					this.addChatListener((ChatListener)mod);
+					if (mod instanceof ChatFilter)
+					{
+						this.logger.warning(String.format("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", mod.getName()));
+					}
+					else
+					{
+						this.addChatListener((ChatListener)mod);
+					}
 				}
 				if (mod instanceof PreLoginListener)
@@ -875,8 +920,8 @@ public final class LiteLoader implements FilenameFilter
 			if ((this.chatListeners.size() > 0 || this.chatFilters.size() > 0) && !this.chatHooked)
 			{
 				this.chatHooked = true;
-				HookChat.Register();
-				HookChat.RegisterPacketHandler(this);
+				HookChat.register();
+				HookChat.registerPacketHandler(this);
 			}
 			// Login hook
@@ -891,15 +936,15 @@ public final class LiteLoader implements FilenameFilter
 			if (this.pluginChannelListeners.size() > 0 && !this.pluginChannelHooked)
 			{
 				this.pluginChannelHooked = true;
-				HookPluginChannels.Register();
-				HookPluginChannels.RegisterPacketHandler(this);
+				HookPluginChannels.register();
+				HookPluginChannels.registerPacketHandler(this);
 			}
 			// Tick hook
 			if (!this.tickHooked)
 			{
 				this.tickHooked = true;
-				PrivateFields.minecraftProfiler.SetFinal(this.minecraft, new HookProfiler(this, logger));
+				PrivateFields.minecraftProfiler.setFinal(this.minecraft, new HookProfiler(this, logger));
 			}
 		}
 		catch (Exception ex)
@@ -1272,7 +1317,7 @@ public final class LiteLoader implements FilenameFilter
 		// Try to get the minecraft timer object and determine the value of the partialTicks
 		if (tick || this.minecraftTimer == null)
 		{
-			this.minecraftTimer = PrivateFields.minecraftTimer.Get(this.minecraft);
+			this.minecraftTimer = PrivateFields.minecraftTimer.get(this.minecraft);
 		}
 		// Hooray, we got the timer reference
@@ -1421,9 +1466,9 @@ public final class LiteLoader implements FilenameFilter
 				separator = true;
 			}
-	        byte[] registrationData = channelList.toString().getBytes(Charset.forName("UTF8"));
-        
-	        sendPluginChannelMessage("REGISTER", registrationData);
+			byte[] registrationData = channelList.toString().getBytes(Charset.forName("UTF8"));
+			
+			sendPluginChannelMessage("REGISTER", registrationData);
 		}
 	}
 }
 \ No newline at end of file
+package com.mumfrey.liteloader.core;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+final class LiteLoaderLogFormatter extends Formatter
+{
+	private SimpleDateFormat simpleDateFormatLogFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	
+	@Override
+	public String format(LogRecord logRecord)
+	{
+		StringBuilder sb = new StringBuilder();
+		sb.append(this.simpleDateFormatLogFormatter.format(Long.valueOf(logRecord.getMillis())));
+		Level var3 = logRecord.getLevel();
+		
+		if (var3 == Level.SEVERE)
+			sb.append(" [").append(var3.getLocalizedName()).append("] ");
+		else
+			sb.append(" [").append(var3.toString().toUpperCase()).append("] ");
+		
+		sb.append(logRecord.getMessage());
+		sb.append('\n');
+		Throwable th = logRecord.getThrown();
+		
+		if (th != null)
+		{
+			StringWriter var5 = new StringWriter();
+			th.printStackTrace(new PrintWriter(var5));
+			sb.append(var5.toString());
+		}
+		
+		return sb.toString();
+	}
+}
 package com.mumfrey.liteloader.util;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Set;
 import com.mumfrey.liteloader.core.LiteLoader;
@@ -11,48 +13,55 @@ import net.minecraft.src.*;
 public abstract class ModUtilities
 {
-    /**
-     * Add a renderer map entry for the specified entity class
-     * 
-     * @param entityClass
-     * @param renderer
-     */
+	private static Set<Integer> overriddenPackets = new HashSet<Integer>();
+	
+	/**
+	 * Add a renderer map entry for the specified entity class
+	 * 
+	 * @param entityClass
+	 * @param renderer
+	 */
     @SuppressWarnings("unchecked")
 	public static void addRenderer(Class<? extends Entity> entityClass, Render renderer)
     {
-    	Map<Class<? extends Entity>, Render> 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);
     }
-
-	/**
-	 * Register a packet override
-	 * 
-	 * @param packetId
-	 * @param newPacket
-	 */
-	@SuppressWarnings("unchecked")
-	public static boolean registerPacketOverride(int packetId, Class<? extends Packet> newPacket)
-	{
-		try
-		{
-	    	IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
-	    	PrivateFields.StaticFields.packetClassToIdMap.Get();
-			Map<Class<? extends Packet>, Integer> packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.Get();
-			
-		    packetIdToClassMap.removeObject(packetId);
-		    packetIdToClassMap.addKey(packetId, newPacket);
-	        packetClassToIdMap.put(newPacket, Integer.valueOf(packetId));
-			
-			return true;
-		}
-		catch (Exception ex)
-		{
-			LiteLoader.logger.warning("Error registering packet override for packet id " + packetId + ": " + ex.getMessage());
-			return false;
-		}
-	}
-	
+    
+    /**
+     * Register a packet override
+     * 
+     * @param packetId
+     * @param newPacket
+     */
+    @SuppressWarnings("unchecked")
+    public static boolean registerPacketOverride(int packetId, Class<? extends Packet> newPacket)
+    {
+    	if (overriddenPackets.contains(Integer.valueOf(packetId)))
+    	{
+    		LiteLoader.getLogger().warning(String.format("Packet with ID %s was already overridden by another mod, one or mods may not function correctly", packetId));
+    	}
+    	
+    	try
+    	{
+    		IntHashMap packetIdToClassMap = Packet.packetIdToClassMap;
+    		PrivateFields.StaticFields.packetClassToIdMap.get();
+    		Map<Class<? extends Packet>, Integer> packetClassToIdMap = PrivateFields.StaticFields.packetClassToIdMap.get();
+    		
+    		packetIdToClassMap.removeObject(packetId);
+    		packetIdToClassMap.addKey(packetId, newPacket);
+    		packetClassToIdMap.put(newPacket, Integer.valueOf(packetId));
+    		
+    		return true;
+    	}
+    	catch (Exception ex)
+    	{
+    		LiteLoader.logger.warning("Error registering packet override for packet id " + packetId + ": " + ex.getMessage());
+    		return false;
+    	}
+    }
+    
 	/**
 	 * Send a plugin channel (custom payload) packet to the server
 	 * 
@@ -99,17 +108,17 @@ public abstract class ModUtilities
 		if (mc == null || mc.gameSettings == null) return;
-	    LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
-	    keyBindings.addAll(Arrays.asList(mc.gameSettings.keyBindings));
-	    
-	    if (!keyBindings.contains(newBinding))
-	    {
-	    	keyBindings.add(newBinding);
-	    	mc.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
-	    	mc.gameSettings.loadOptions();
-	    }
+		LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
+		keyBindings.addAll(Arrays.asList(mc.gameSettings.keyBindings));
+		
+		if (!keyBindings.contains(newBinding))
+		{
+			keyBindings.add(newBinding);
+			mc.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
+			mc.gameSettings.loadOptions();
+		}
 	}
-
+	
 	/**
 	 * Unregisters a registered keybind with the game settings class, thus removing it from the "controls" screen
 	 * 
@@ -120,14 +129,14 @@ public abstract class ModUtilities
 		Minecraft mc = Minecraft.getMinecraft();
 		if (mc == null || mc.gameSettings == null) return;
-	
+		
 		LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
-	    keyBindings.addAll(Arrays.asList(mc.gameSettings.keyBindings));
-	    
-	    if (keyBindings.contains(removeBinding))
-	    {
-	        keyBindings.remove(removeBinding);
-	        mc.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
-	    }
+		keyBindings.addAll(Arrays.asList(mc.gameSettings.keyBindings));
+		
+		if (keyBindings.contains(removeBinding))
+		{
+			keyBindings.remove(removeBinding);
+			mc.gameSettings.keyBindings = keyBindings.toArray(new KeyBinding[0]);
+		}
 	}
 }
@@ -15,12 +15,13 @@ import net.minecraft.src.*;
  * @param <P> Parent class type, the type of the class that owns the field
  * @param <T> Field type, the type of the field value
  */
+@SuppressWarnings("rawtypes")
 public class PrivateFields<P, T>
 {
 	/**
 	 * Class to which this field belongs
 	 */
-	public final Class parentClass;
+	public final Class<P> parentClass;
 	/**
 	 * MCP name for this field
@@ -44,7 +45,7 @@ public class PrivateFields&lt;P, T&gt;
 	 * @param mcpName
 	 * @param name
 	 */
-	private PrivateFields(Class owner, String mcpName, String name)
+	private PrivateFields(Class<P> owner, String mcpName, String name)
 	{
 		this.parentClass = owner;
 		this.mcpName = mcpName;
@@ -60,7 +61,7 @@ public class PrivateFields&lt;P, T&gt;
 	 * @return field value or null if errors occur
 	 */
 	@SuppressWarnings("unchecked")
-	public T Get(P instance)
+	public T get(P instance)
 	{
 		try
 		{
@@ -81,7 +82,7 @@ public class PrivateFields&lt;P, T&gt;
 	 * @param value value to set
 	 * @return value
 	 */
-	public T Set(P instance, T value)
+	public T set(P instance, T value)
 	{
 		try
 		{
@@ -101,7 +102,7 @@ public class PrivateFields&lt;P, T&gt;
 	 * @param value value to set
 	 * @return value
 	 */
-	public T SetFinal(P instance, T value)
+	public T setFinal(P instance, T value)
 	{
 		try
 		{
@@ -126,16 +127,16 @@ public class PrivateFields&lt;P, T&gt;
 	 */
 	public static final class StaticFields<P, T> extends PrivateFields<P, T>
 	{
-		public StaticFields(Class owner, String mcpName, String name) { super(owner, mcpName, name); }
-		public T Get() { return Get(null); }
-		public void Set(T value) { Set(null, value); }
+		public StaticFields(Class<P> owner, String mcpName, String name) { super(owner, mcpName, name); }
+		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"); // 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");  // 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
+	public static final PrivateFields<Minecraft, Timer>       minecraftTimer = new PrivateFields<Minecraft, Timer>    (Minecraft.class,     "timer",           "V");  // Minecraft/timer
+	public static final PrivateFields<Minecraft, Profiler> minecraftProfiler = new PrivateFields<Minecraft, Profiler> (Minecraft.class,     "mcProfiler",      "J");  // Minecraft/mcProfiler
+	public static final PrivateFields<RenderManager, Map>    entityRenderMap = new PrivateFields<RenderManager, Map>  (RenderManager.class, "entityRenderMap", "q");  // RenderManager/entityRenderMap
 }
@@ -9,14 +9,14 @@ import java.util.concurrent.Callable;
 import com.mumfrey.liteloader.core.CallableLiteLoaderBrand;
 import com.mumfrey.liteloader.core.CallableLiteLoaderMods;
-class CallableJVMFlags implements Callable
+class CallableJVMFlags implements Callable<String>
 {
-    /** Gets additional Java Enviroment info for Crash Report. */
-    final CrashReport crashReportJVMFlags;
+    /** Reference to the CrashReport object. */
+    final CrashReport theCrashReport;
     CallableJVMFlags(CrashReport par1CrashReport)
     {
-        this.crashReportJVMFlags = par1CrashReport;
+        this.theCrashReport = par1CrashReport;
         par1CrashReport.func_85056_g().addCrashSectionCallable("Mod Pack", new CallableLiteLoaderBrand(par1CrashReport));
         par1CrashReport.func_85056_g().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(par1CrashReport));
     }
@@ -27,14 +27,14 @@ class CallableJVMFlags implements Callable
     public String getJVMFlagsAsString()
     {
         RuntimeMXBean var1 = ManagementFactory.getRuntimeMXBean();
-        List var2 = var1.getInputArguments();
+        List<String> var2 = var1.getInputArguments();
         int var3 = 0;
         StringBuilder var4 = new StringBuilder();
-        Iterator var5 = var2.iterator();
+        Iterator<String> var5 = var2.iterator();
         while (var5.hasNext())
         {
-            String var6 = (String)var5.next();
+            String var6 = var5.next();
             if (var6.startsWith("-X"))
             {
@@ -51,7 +51,7 @@ class CallableJVMFlags implements Callable
     }
     @Override
-	public Object call()
+	public String call()
     {
         return this.getJVMFlagsAsString();
     }
 package net.minecraft.src;
 import java.util.Random;
-
 import org.lwjgl.opengl.GL11;
 import com.mumfrey.liteloader.core.LiteLoader;
@@ -13,11 +12,12 @@ 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)
+    @SuppressWarnings("cast")
+	public void doRenderLightningBolt(EntityLightningBolt par1EntityLightningBolt, double par2, double par4, double par6, float par8, float par9)
     {
         Tessellator var10 = Tessellator.instance;
         GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -2,5 +2,5 @@ search.mods=true
 search.jar=true
 search.classpath=true
 log=stderr
-
+brand=The Voxel Modpack