Style update part 3 - apply checkstyle

Mumfrey
1 parent 3781bd92
Showing 100 changed files with 1045 additions and 508 deletions
build.gradle
checkstyle.xml
src/client/java/com/mumfrey/liteloader/ChatFilter.java
src/client/java/com/mumfrey/liteloader/EntityRenderListener.java
src/client/java/com/mumfrey/liteloader/FrameBufferListener.java
src/client/java/com/mumfrey/liteloader/InitCompleteListener.java
src/client/java/com/mumfrey/liteloader/JoinGameListener.java
src/client/java/com/mumfrey/liteloader/OutboundChatFilter.java
src/client/java/com/mumfrey/liteloader/OutboundChatListener.java
src/client/java/com/mumfrey/liteloader/PostLoginListener.java
src/client/java/com/mumfrey/liteloader/PreRenderListener.java
src/client/java/com/mumfrey/liteloader/ScreenshotListener.java
src/client/java/com/mumfrey/liteloader/Tickable.java
src/client/java/com/mumfrey/liteloader/client/CallbackProxyClient.java
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
src/client/java/com/mumfrey/liteloader/client/GameEngineClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderCoreProviderClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderPanelManager.java
src/client/java/com/mumfrey/liteloader/client/PacketEventsClient.java
@@ -17,6 +17,7 @@ buildscript {
 }
  
 apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'checkstyle'
 apply plugin: 'maven'
  
 // Artefact details
@@ -60,6 +61,17 @@ sourceSets {
     }
 }
  
+checkstyle {
+    configProperties = [
+            "name"        : project.name,
+            "organization": project.organization,
+            "url"         : project.url,
+            "year"        : project.inceptionYear
+    ]
+    configFile = file("checkstyle.xml")
+    toolVersion = '6.13'
+}
+
 javadoc {
     source sourceSets.client.allJava
     source sourceSets.debug.allJava
@@ -110,7 +122,7 @@ task runClient(type: JavaExec, overwrite: true) {
 }
  
 tasks.withType(JavaCompile) {
-    options.compilerArgs += ['-Xlint:all', '-Xlint:-path']
+    options.compilerArgs += ['-Xlint:all', '-Xlint:-path', '-Xlint:-rawtypes']
     options.deprecation = true
     options.encoding = 'utf8'
 }
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: LiteLoader Style
+    Description: none
+-->
+<module name="Checker">
+  <property name="severity" value="warning"/>
+  <property name="charset" value="UTF-8"/>
+  <module name="TreeWalker">
+    <module name="FileContentsHolder"/>
+    <module name="OuterTypeFilename"/>
+    <module name="IllegalTokenText">
+      <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+      <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+      <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="option" value="TEXT"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>
+    <module name="ArrayTypeStyle"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="FallThrough"/>
+    <module name="UpperEll"/>
+    <module name="ModifierOrder"/>
+    <module name="PackageName">
+      <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+      <message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="TypeName">
+      <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MemberName">
+      <property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ParameterName">
+      <property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z]([a-zA-Z0-9]*)?$"/>
+      <property name="tokens" value="VARIABLE_DEF"/>
+      <message key="name.invalidPattern" value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ClassTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
+      <message key="name.invalidPattern" value="Class type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MethodTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|(T[A-Z][a-zA-Z0-9]*$)"/>
+      <message key="name.invalidPattern" value="Method type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="NoFinalizer"/>
+    <module name="OperatorWrap">
+      <property name="option" value="NL"/>
+      <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
+    </module>
+    <module name="RequireThis"/>
+    <module name="EqualsHashCode"/>
+    <module name="LeftCurly">
+      <property name="option" value="nl"/>
+    </module>
+    <module name="MethodParamPad">
+      <property name="allowLineBreaks" value="true"/>
+      <property name="tokens" value="CTOR_DEF,METHOD_CALL,METHOD_DEF,SUPER_CTOR_CALL"/>
+    </module>
+    <module name="LineLength">
+      <metadata name="net.sf.eclipsecs.core.comment" value="Code line length"/>
+      <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+      <property name="max" value="150"/>
+      <message key="maxLineLen" value="Code line is longer than {0,number,integer} characters (found {1,number,integer})."/>
+    </module>
+    <module name="LineLength">
+      <metadata name="net.sf.eclipsecs.core.comment" value="Comment line length"/>
+      <property name="ignorePattern" value="^[ ]*([a-zA-Z0-9\{\}\+\|\&amp;\&quot;@\(\)\?\:\.=]|//)"/>
+      <message key="maxLineLen" value="Comment line is longer than {0,number,integer} characters (found {1,number,integer})."/>
+    </module>
+    <module name="NeedBraces">
+      <property name="allowSingleLineStatement" value="true"/>
+      <message key="needBraces" value="''{0}'' must use '''{}'''s."/>
+    </module>
+    <module name="RightCurly">
+      <property name="option" value="alone"/>
+      <property name="tokens" value="LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT"/>
+      <property name="shouldStartLine" value="false"/>
+    </module>
+    <module name="MissingOverride">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="MissingDeprecated">
+      <property name="severity" value="warning"/>
+    </module>
+    <module name="TypecastParenPad">
+      <property name="tokens" value="RPAREN,TYPECAST"/>
+    </module>
+    <module name="DefaultComesLast"/>
+    <module name="EmptyStatement"/>
+    <module name="EqualsAvoidNull"/>
+    <module name="StringLiteralEquality"/>
+    <module name="FinalClass"/>
+  </module>
+  <module name="SuppressionCommentFilter"/>
+</module>
@@ -13,11 +13,13 @@ import net.minecraft.util.IChatComponent;
 public interface ChatFilter extends LiteMod
 {
     /**
-     * Chat filter function, return false to filter this packet, true to pass the packet
+     * Chat filter function, return false to filter this packet, true to pass
+     * the packet.
      * 
      * @param chat ChatMessageComponent parsed from the chat packet
      * @param message Chat message parsed from the chat message component
-     * @param newMessage If you wish to mutate the message, set the value using newMessage.set()
+     * @param newMessage If you wish to mutate the message, set the value using
+     *      newMessage.set()
      * 
      * @return True to keep the packet, false to discard
      */
@@ -4,7 +4,8 @@ import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.entity.Entity;
  
 /**
- * Interface for mods which want to receive callbacks when entities are rendered into the world
+ * Interface for mods which want to receive callbacks when entities are rendered
+ * into the world.
  *  
  * @author Adam Mummery-Smith
  */
@@ -3,20 +3,23 @@ package com.mumfrey.liteloader;
 import net.minecraft.client.shader.Framebuffer;
  
 /**
- * Interface for mods which want to interact with Minecraft's main Frame Buffer Object
+ * Interface for mods which want to interact with Minecraft's main Frame Buffer
+ * Object.
  *
  * @author Adam Mummery-Smith
  */
 public interface FrameBufferListener extends LiteMod
 {
     /**
-     * Called before the FBO is rendered. Useful if you want to interact with the FBO before it is drawn to the screen 
+     * Called before the FBO is rendered. Useful if you want to interact with
+     * the FBO before it is drawn to the screen. 
      */
     public abstract void preRenderFBO(Framebuffer fbo);
  
     /**
-     * Called immediately before the FBO is rendered to the screen, after the appropriate IGL modes and matrix transforms
-     * have been set but before the FBO is actually rendered into the main output buffer.
+     * Called immediately before the FBO is rendered to the screen, after the
+     * appropriate IGL modes and matrix transforms have been set but before the
+     * FBO is actually rendered into the main output buffer.
      *   
      * @param fbo FBO instance
      * @param width FBO width
@@ -5,15 +5,17 @@ import net.minecraft.client.Minecraft;
 import com.mumfrey.liteloader.core.LiteLoader;
  
 /**
- * Interface for mods which need to initialise stuff once the game initialisation is completed,
- * for example mods which need to register new renderers.
+ * Interface for mods which need to initialise stuff once the game
+ * initialisation is completed, for example mods which need to register new
+ * renderers.
  *
  * @author Adam Mummery-Smith
  */
 public interface InitCompleteListener extends Tickable
 {
     /**
-     * Called as soon as the game is initialised and the main game loop is running
+     * Called as soon as the game is initialised and the main game loop is
+     * running.
      * 
      * @param minecraft Minecraft instance
      * @param loader LiteLoader instance
@@ -8,7 +8,8 @@ import com.mojang.realmsclient.dto.RealmsServer;
  
  
 /**
- * Interface for mods which wish to be notified when the player connects to a server (or local game)
+ * Interface for mods which wish to be notified when the player connects to a
+ * server (or local game).
  *
  * @author Adam Mummery-Smith
  */
@@ -19,8 +20,10 @@ public interface JoinGameListener extends LiteMod
      * 
      * @param netHandler Net handler
      * @param joinGamePacket Join game packet
-     * @param serverData ServerData object representing the server being connected to
-     * @param realmsServer If connecting to a realm, a reference to the RealmsServer object
+     * @param serverData ServerData object representing the server being
+     *      connected to
+     * @param realmsServer If connecting to a realm, a reference to the
+     *      RealmsServer object
      */
     public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
 }
@@ -8,7 +8,8 @@ package com.mumfrey.liteloader;
 public interface OutboundChatFilter extends LiteMod
 {
     /**
-     * Raised when a chat message is being sent, return false to filter this message or true to allow it to be sent
+     * Raised when a chat message is being sent, return false to filter this
+     * message or true to allow it to be sent.
      * 
      * @param message
      */
@@ -10,7 +10,8 @@ import net.minecraft.network.play.client.C01PacketChatMessage;
 public interface OutboundChatListener extends LiteMod
 {
     /**
-     * Raised when a new chat packet is created (not necessarily transmitted, something could be trolling us)
+     * Raised when a new chat packet is created (not necessarily transmitted,
+     * something could be trolling us).
      * 
      * @param packet
      * @param message
@@ -10,8 +10,9 @@ import net.minecraft.network.login.server.S02PacketLoginSuccess;
 public interface PostLoginListener extends LiteMod
 {
     /**
-     * Called immediately after login, before the player has properly joined the game. Note that this event is raised
-     * <b>in the network thread</b> and is not marshalled to the main thread as other packet-generated events are.
+     * Called immediately after login, before the player has properly joined the
+     * game. Note that this event is raised <b>in the network thread</b> and is
+     * not marshalled to the main thread as other packet-generated events are.
      * 
      * @param netHandler
      * @param packet
@@ -10,14 +10,16 @@ import net.minecraft.client.renderer.RenderGlobal;
 public interface PreRenderListener extends LiteMod
 {
     /**
-     * Called immediately before rendering of the world (including the sky) is started.
+     * Called immediately before rendering of the world (including the sky) is
+     * started.
      * 
      * @param partialTicks
      */
     public abstract void onRenderWorld(float partialTicks);
  
     /**
-     * Called <b>after</b> the world camera transform is initialised, may be called more than once per frame if anaglyph is enabled
+     * Called <b>after</b> the world camera transform is initialised, may be
+     * called more than once per frame if anaglyph is enabled.
      * 
      * @param partialTicks
      * @param pass
@@ -26,7 +28,8 @@ public interface PreRenderListener extends LiteMod
     public abstract void onSetupCameraTransform(float partialTicks, int pass, long timeSlice);
  
     /**
-     * Called when the sky is rendered, may be called more than once per frame if anaglyph is enabled 
+     * Called when the sky is rendered, may be called more than once per frame
+     * if anaglyph is enabled.
      * 
      * @param partialTicks
      * @param pass
@@ -34,7 +37,8 @@ public interface PreRenderListener extends LiteMod
     public abstract void onRenderSky(float partialTicks, int pass);
  
     /**
-     * Called immediately before the clouds are rendered, may be called more than once per frame if anaglyph is enabled
+     * Called immediately before the clouds are rendered, may be called more
+     * than once per frame if anaglyph is enabled.
      * 
      * @param renderGlobal
      * @param partialTicks
@@ -43,7 +47,8 @@ public interface PreRenderListener extends LiteMod
     public abstract void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal);
  
     /**
-     * Called before the terrain is rendered, may be called more than once per frame if anaglyph is enabled
+     * Called before the terrain is rendered, may be called more than once per
+     * frame if anaglyph is enabled.
      * 
      * @param partialTicks
      * @param pass
@@ -13,15 +13,16 @@ import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
 public interface ScreenshotListener extends LiteMod
 {
     /**
-     * Called when a screenshot is taken, mods should return FALSE to suspend further processing, or TRUE to allow
-     * processing to continue normally
+     * Called when a screenshot is taken, mods should return FALSE to suspend
+     * further processing, or TRUE to allow processing to continue normally
      * 
      * @param screenshotName
      * @param width
      * @param height
      * @param fbo
      * @param message Message to return if the event is cancelled
-     * @return FALSE to suspend further processing, or TRUE to allow processing to continue normally
+     * @return FALSE to suspend further processing, or TRUE to allow processing
+     *      to continue normally
      */
     public boolean onSaveScreenshot(String screenshotName, int width, int height, Framebuffer fbo, ReturnValue<IChatComponent> message);
 }
@@ -15,7 +15,8 @@ public interface Tickable extends LiteMod
      * @param minecraft Minecraft instance
      * @param partialTicks Partial tick value 
      * @param inGame True if in-game, false if in the menu
-     * @param clock True if this is a new tick, otherwise false if it's a regular frame
+     * @param clock True if this is a new tick, otherwise false if it's a
+     *      regular frame
      */
     public abstract void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock);
 }
@@ -26,9 +26,10 @@ import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
  
 /**
- * Proxy class which handles the redirected calls from the injected callbacks and routes them to the
- * relevant liteloader handler classes. We do this rather than patching a bunch of bytecode into the packet
- * classes themselves because this is easier to maintain.
+ * Proxy class which handles the redirected calls from the injected callbacks
+ * and routes them to the relevant liteloader handler classes. We do this rather
+ * than patching a bunch of bytecode into the packet classes themselves because
+ * this is easier to maintain.
  * 
  * @author Adam Mummery-Smith
  */
@@ -50,7 +51,8 @@ public abstract class CallbackProxyClient extends CallbackProxyCommon
  
         if (CallbackProxyClient.clientEventBroker == null)
         {
-            throw new RuntimeException("LiteLoader failed to start up properly. The game is in an unstable state and must shut down now. Check the developer log for startup errors");
+            throw new RuntimeException("LiteLoader failed to start up properly."
+                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
         }
  
         CallbackProxyClient.clientEventBroker.onStartupComplete();
@@ -115,7 +117,8 @@ public abstract class CallbackProxyClient extends CallbackProxyCommon
         CallbackProxyClient.clientEventBroker.postRenderHUD(partialTicks);
     }
  
-    public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName, WorldSettings worldSettings)
+    public static void IntegratedServerCtor(EventInfo<IntegratedServer> e, Minecraft minecraft, String folderName, String worldName,
+            WorldSettings worldSettings)
     {
         CallbackProxyClient.clientEventBroker.onStartServer(e.getSource(), folderName, worldName, worldSettings);
     }
@@ -185,24 +188,27 @@ public abstract class CallbackProxyClient extends CallbackProxyCommon
         CallbackProxyClient.clientEventBroker.onRenderTerrain(partialTicks, pass, timeSlice);
     }
  
-    public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height, Framebuffer fbo)
+    public static void onSaveScreenshot(ReturnEventInfo<ScreenShotHelper, IChatComponent> e, File gameDir, String name, int width, int height,
+            Framebuffer fbo)
     {
         CallbackProxyClient.clientEventBroker.onScreenshot(e, name, width, height, fbo);
     }
  
-    public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
+    public static void onRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks, boolean hideBoundingBox, Render render)
     {
         CallbackProxyClient.clientEventBroker.onRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
     }
  
-    public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, boolean hideBoundingBox, Render render)
+    public static void onPostRenderEntity(ReturnEventInfo<RenderManager, Boolean> e, Entity entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks, boolean hideBoundingBox, Render render)
     {
         CallbackProxyClient.clientEventBroker.onPostRenderEntity(e.getSource(), entity, xPos, yPos, zPos, yaw, partialTicks, render);
     }
  
     /**
-     * Compatiblbe behaviour with FML, this method is called to generate a consistent offline UUID between client and server
-     * for a given username.
+     * Compatiblbe behaviour with FML, this method is called to generate a
+     * consistent offline UUID between client and server for a given username.
      */
     public static void generateOfflineUUID(ReturnEventInfo<Session, GameProfile> e)
     {
@@ -86,7 +86,9 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
     protected boolean send(String channel, PacketBuffer data, ChannelPolicy policy)
     {
         if (channel == null || channel.length() > 16 || CHANNEL_REGISTER.equals(channel) || CHANNEL_UNREGISTER.equals(channel))
+        {
             throw new RuntimeException("Invalid channel name specified"); 
+        }
  
         if (!policy.allows(this, channel))
         {
@@ -148,7 +148,8 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.common.GameEngine#setKeyBindings(java.util.List)
+     * @see com.mumfrey.liteloader.common.GameEngine
+     *      #setKeyBindings(java.util.List)
      */
     @Override
     public void setKeyBindings(List<KeyBinding> keyBindings)
 package com.mumfrey.liteloader.client;
  
+import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
@@ -28,12 +29,15 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
     private final LoaderProperties properties;
  
     /**
-     * Read from the properties file, if true we will inhibit the sound manager reload during startup to avoid getting in trouble with OpenAL
+     * Read from the properties file, if true we will inhibit the sound manager
+     * reload during startup to avoid getting in trouble with OpenAL.
      */
     private boolean inhibitSoundManagerReload = true;
  
     /**
-     * If inhibit is enabled, this object is used to reflectively inhibit the sound manager's reload process during startup by removing it from the reloadables list
+     * If inhibit is enabled, this object is used to reflectively inhibit the
+     * sound manager's reload process during startup by removing it from the
+     * reloadables list.
      */
     private SoundHandlerReloadInhibitor soundHandlerReloadInhibitor;
  
@@ -52,7 +56,9 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
     @Override
     public void onPostInit(GameEngine<?, ?> engine)
     {
-        this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor((SimpleReloadableResourceManager)engine.getResources().getResourceManager(), ((GameEngineClient)engine).getSoundHandler());
+        SimpleReloadableResourceManager resourceManager = (SimpleReloadableResourceManager)engine.getResources().getResourceManager();
+        SoundHandler soundHandler = ((GameEngineClient)engine).getSoundHandler();
+        this.soundHandlerReloadInhibitor = new SoundHandlerReloadInhibitor(resourceManager, soundHandler);
  
         if (this.inhibitSoundManagerReload)
         {
@@ -36,7 +36,7 @@ import com.mumfrey.liteloader.transformers.event.ReturnEventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
-{	
+{
     private static LiteLoaderEventBrokerClient instance;
  
     /**
@@ -60,8 +60,8 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     private boolean wasFullScreen = false;
  
     /**
-     * Hash code of the current world. We don't store the world reference here because we don't want
-     * to mess with world GC by mistake
+     * Hash code of the current world. We don't store the world reference
+     * here because we don't want to mess with world GC by mistake.
      */
     private int worldHashCode = 0;
  
@@ -76,8 +76,10 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     private FastIterableDeque<ViewportListener>     viewportListeners     = new HandlerList<ViewportListener>(ViewportListener.class);
     private FastIterableDeque<FrameBufferListener>  frameBufferListeners  = new HandlerList<FrameBufferListener>(FrameBufferListener.class);
     private FastIterableDeque<InitCompleteListener> initListeners         = new HandlerList<InitCompleteListener>(InitCompleteListener.class);
-    private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class, ReturnLogicOp.AND);
-    private FastIterableDeque<ScreenshotListener>   screenshotListeners   = new HandlerList<ScreenshotListener>(ScreenshotListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<OutboundChatFilter>   outboundChatFilters   = new HandlerList<OutboundChatFilter>(OutboundChatFilter.class,
+                                                                                                                ReturnLogicOp.AND);
+    private FastIterableDeque<ScreenshotListener>   screenshotListeners   = new HandlerList<ScreenshotListener>(ScreenshotListener.class,
+                                                                                                                ReturnLogicOp.AND_BREAK_ON_FALSE);
     private FastIterableDeque<EntityRenderListener> entityRenderListeners = new HandlerList<EntityRenderListener>(EntityRenderListener.class);
  
     @SuppressWarnings("cast")
@@ -103,7 +105,8 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.InterfaceProvider#registerInterfaces(com.mumfrey.liteloader.core.InterfaceRegistrationDelegate)
+     * @see com.mumfrey.liteloader.api.InterfaceProvider#registerInterfaces(
+     *      com.mumfrey.liteloader.core.InterfaceRegistrationDelegate)
      */
     @Override
     public void registerInterfaces(InterfaceRegistrationDelegate delegate)
@@ -540,7 +543,8 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param partialTicks
      * @param render 
      */
-    public void onRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
+    public void onRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks,
+            Render render)
     {
         this.entityRenderListeners.all().onRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
     }
@@ -555,7 +559,8 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param partialTicks
      * @param render 
      */
-    public void onPostRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks, Render render)
+    public void onPostRenderEntity(RenderManager source, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks,
+            Render render)
     {
         this.entityRenderListeners.all().onPostRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
     }
@@ -41,7 +41,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     private Minecraft minecraft;
  
     /**
-     * Setting which determines whether we show the "mod info" screen tab in the main menu
+     * Setting which determines whether we show the "mod info" screen tab in the
+     * main menu.
      */
     private boolean displayModInfoScreenTab = true;
  
@@ -51,8 +52,9 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     private boolean tabAlwaysExpanded = false;
  
     /**
-     * Override for the "mod info" tab setting, so that mods which want to handle the mod info themselves
-     * can temporarily disable the function without having to change the underlying property
+     * Override for the "mod info" tab setting, so that mods which want to
+     * handle the mod info themselves can temporarily disable the function
+     * without having to change the underlying property.
      */
     private boolean hideModInfoScreenTab = false;
  
@@ -61,8 +63,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     private String notification;
  
     /**
-     * Active "mod info" screen, drawn as an overlay when in the main menu and made the active screen if
-     * the user clicks the tab
+     * Active "mod info" screen, drawn as an overlay when in the main menu and
+     * made the active screen if the user clicks the tab.
      */
     private GuiLiteLoaderPanel panelHost;
  
@@ -114,7 +116,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.TickObserver#onTick(boolean, float, boolean)
+     * @see com.mumfrey.liteloader.api.TickObserver
+     *      #onTick(boolean, float, boolean)
      */
     @Override
     public void onTick(boolean clock, float partialTicks, boolean inGame)
@@ -140,7 +143,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.PostRenderObserver#onPostRender(int, int, float)
+     * @see com.mumfrey.liteloader.api.PostRenderObserver
+     *      #onPostRender(int, int, float)
      */
     @Override
     public void onPostRender(int mouseX, int mouseY, float partialTicks)
@@ -149,12 +153,14 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
  
         boolean tabHidden = this.isTabHidden() && this.minecraft.currentScreen instanceof GuiMainMenu;
  
-        if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !tabHidden) || (this.panelHost != null && this.panelHost.isOpen())))
+        if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen)
+                && ((this.displayModInfoScreenTab && !tabHidden) || (this.panelHost != null && this.panelHost.isOpen())))
         {
             // If we're at the main menu, prepare the overlay
             if (this.panelHost == null || this.panelHost.getScreen() != this.minecraft.currentScreen)
             {
-                this.panelHost = new GuiLiteLoaderPanel(this.minecraft, this.minecraft.currentScreen, this.mods, this.environment, this.properties, this.configManager, !tabHidden);
+                this.panelHost = new GuiLiteLoaderPanel(this.minecraft, this.minecraft.currentScreen, this.mods, this.environment, this.properties,
+                        this.configManager, !tabHidden);
                 if (this.notification != null)
                 {
                     this.panelHost.setNotification(this.notification);
@@ -170,14 +176,18 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
             this.panelHost.release();
             this.panelHost = null;
         }
-        else if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen) && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && Keyboard.isKeyDown(Keyboard.KEY_TAB))
+        else if (this.isPanelSupportedOnScreen(this.minecraft.currentScreen)
+                && Keyboard.isKeyDown(Keyboard.KEY_LCONTROL)
+                && Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)
+                && Keyboard.isKeyDown(Keyboard.KEY_TAB))
         {
             this.displayLiteLoaderPanel(this.minecraft.currentScreen);
         }
     }
  
     /**
-     * Set the "mod info" screen tab to hidden, regardless of the property setting
+     * Set the "mod info" screen tab to hidden, regardless of the property
+     * setting.
      */
     @Override
     public void hideTab()
@@ -247,7 +257,8 @@ public class LiteLoaderPanelManager implements PanelManager&lt;GuiScreen&gt;
     {
         if (this.isPanelSupportedOnScreen(parentScreen))
         {
-            this.panelHost = new GuiLiteLoaderPanel(this.minecraft, parentScreen, this.mods, this.environment, this.properties, this.configManager, !this.isTabHidden());
+            this.panelHost = new GuiLiteLoaderPanel(this.minecraft, parentScreen, this.mods, this.environment, this.properties,
+                    this.configManager, !this.isTabHidden());
             this.minecraft.displayGuiScreen(this.panelHost);
         }
     }
@@ -45,11 +45,13 @@ public class PacketEventsClient extends PacketEvents
 {
     private static RealmsServer joiningRealm;
  
-    private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
-    private FastIterableDeque<ChatListener> chatListeners = new HandlerList<ChatListener>(ChatListener.class);
-    private FastIterableDeque<ChatFilter> chatFilters = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-    private FastIterableDeque<PreJoinGameListener> preJoinGameListeners = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-    private FastIterableDeque<PostLoginListener> postLoginListeners = new HandlerList<PostLoginListener>(PostLoginListener.class);
+    private FastIterableDeque<JoinGameListener>    joinGameListeners    = new HandlerList<JoinGameListener>(JoinGameListener.class);
+    private FastIterableDeque<ChatListener>        chatListeners        = new HandlerList<ChatListener>(ChatListener.class);
+    private FastIterableDeque<ChatFilter>          chatFilters          = new HandlerList<ChatFilter>(ChatFilter.class,
+                                                                                                        ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<PreJoinGameListener> preJoinGameListeners = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class,
+                                                                                                        ReturnLogicOp.AND_BREAK_ON_FALSE);
+    private FastIterableDeque<PostLoginListener>   postLoginListeners   = new HandlerList<PostLoginListener>(PostLoginListener.class);
  
     @Override
     public void registerInterfaces(InterfaceRegistrationDelegate delegate)
@@ -86,7 +88,8 @@ public class PacketEventsClient extends PacketEvents
     {
         if (chatListener instanceof ChatFilter)
         {
-            LiteLoaderLogger.warning("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! Remove one of these interfaces", chatListener.getName());
+            LiteLoaderLogger.warning("Interface error initialising mod '%1s'. A mod implementing ChatFilter and ChatListener is not supported! "
+                    + "Remove one of these interfaces", chatListener.getName());
         }
         else
         {
@@ -127,7 +130,10 @@ public class PacketEventsClient extends PacketEvents
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S01PacketJoinGame)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(
+     *      com.mumfrey.liteloader.common.transformers.PacketEventInfo,
+     *      net.minecraft.network.INetHandler,
+     *      net.minecraft.network.play.server.S01PacketJoinGame)
      */
     @Override
     protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
@@ -179,7 +185,10 @@ public class PacketEventsClient extends PacketEvents
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.login.server.S02PacketLoginSuccess)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(
+     *      com.mumfrey.liteloader.common.transformers.PacketEventInfo,
+     *      net.minecraft.network.INetHandler,
+     *      net.minecraft.network.login.server.S02PacketLoginSuccess)
      */
     @Override
     protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketLoginSuccess packet)
@@ -199,13 +208,18 @@ public class PacketEventsClient extends PacketEvents
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S02PacketChat)
+     * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(
+     *      com.mumfrey.liteloader.common.transformers.PacketEventInfo,
+     *      net.minecraft.network.INetHandler,
+     *      net.minecraft.network.play.server.S02PacketChat)
      */
     @Override
     protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketChat packet)
     {
         if (packet.getChatComponent() == null)
+        {
             return;
+        }
  
         IChatComponent originalChat = packet.getChatComponent();
         IChatComponent chat = originalChat;
@@ -50,7 +50,8 @@ public class ResourceObserver implements ModLoadObserver
         {
             LiteLoaderLogger.info("Adding \"%s\" to active resource pack set", container.getLocation());
             IResourcePack resourcePack = this.initResourcePack(container, modName);
-            Resources<IResourceManager, IResourcePack> resources = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
+            Resources<IResourceManager, IResourcePack> resources
+                    = (Resources<IResourceManager, IResourcePack>)LiteLoader.getGameEngine().getResources();
             if (resources.registerResourcePack(resourcePack))
             {
                 LiteLoaderLogger.info("Successfully added \"%s\" to active resource pack set", container.getLocation());
@@ -66,7 +67,8 @@ public class ResourceObserver implements ModLoadObserver
         {
             if (container.isDirectory())
             {
-                LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", container.toFile().getParentFile().getName(), container.getName(), name);
+                LiteLoaderLogger.info("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"",
+                        container.toFile().getParentFile().getName(), container.getName(), name);
                 resourcePack = new ModResourcePackDir(name, container.toFile());
             }
             else
@@ -22,7 +22,8 @@ public class ResourcesClient implements Resources&lt;IResourceManager, IResourcePac
     private final Map<String, IResourcePack> registeredResourcePacks = new HashMap<String, IResourcePack>();
  
     /**
-     * True while initialising mods if we need to do a resource manager reload once the process is completed
+     * True while initialising mods if we need to do a resource manager reload
+     * once the process is completed.
      */
     private boolean pendingResourceReload;
  
@@ -50,7 +51,8 @@ public class ResourcesClient implements Resources&lt;IResourceManager, IResourcePac
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(net.minecraft.client.resources.IResourcePack)
+     * @see com.mumfrey.liteloader.common.GameEngine#registerResourcePack(
+     *      net.minecraft.client.resources.IResourcePack)
      */
     @Override
     public boolean registerResourcePack(IResourcePack resourcePack)
@@ -72,7 +74,8 @@ public class ResourcesClient implements Resources&lt;IResourceManager, IResourcePac
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(net.minecraft.client.resources.IResourcePack)
+     * @see com.mumfrey.liteloader.common.GameEngine#unRegisterResourcePack(
+     *      net.minecraft.client.resources.IResourcePack)
      */
     @Override
     public boolean unRegisterResourcePack(IResourcePack resourcePack)
@@ -10,7 +10,8 @@ import com.mumfrey.liteloader.client.util.PrivateFieldsClient;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
 /**
- * Manager object which handles inhibiting the sound handler's reload notification at startup
+ * Manager object which handles inhibiting the sound handler's reload
+ * notification at startup.
  *
  * @author Adam Mummery-Smith
  */
@@ -32,7 +33,8 @@ public class SoundHandlerReloadInhibitor
     private boolean inhibited;
  
     /**
-     * So that we can re-insert the sound manager at the same index, we store the index we remove it from
+     * So that we can re-insert the sound manager at the same index, we store
+     * the index we remove it from.
      */
     private int storedIndex;
  
@@ -7,7 +7,8 @@ import com.mumfrey.liteloader.api.TranslationProvider;
 public class Translator implements TranslationProvider
 {
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.Object[])
+     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(
+     *      java.lang.String, java.lang.Object[])
      */
     @Override
     public String translate(String key, Object... args)
@@ -17,7 +18,8 @@ public class Translator implements TranslationProvider
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(java.lang.String, java.lang.String, java.lang.Object[])
+     * @see com.mumfrey.liteloader.api.TranslationProvider#translate(
+     *      java.lang.String, java.lang.String, java.lang.Object[])
      */
     @Override
     public String translate(String locale, String key, Object... args)
@@ -20,9 +20,13 @@ public class LiteLoaderBrandingProvider implements BrandingProvider
     public static final int BRANDING_COLOUR = 0xFF4785D1;
  
     public static final ResourceLocation ABOUT_TEXTURE = new ResourceLocation("liteloader", "textures/gui/about.png");
-    public static final IconAbsolute LOGO_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "logo", 128, 40, 0, 0, 256, 80);
-    public static final IconAbsolute ICON_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "chicken", 32, 45, 0, 80, 64, 170);
-    public static final IconAbsolute TWITTER_AVATAR_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "twitter_avatar", 32, 32, 192, 80, 256, 144);
+    
+    public static final IconAbsolute LOGO_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                                                                        "logo", 128, 40, 0, 0, 256, 80);
+    public static final IconAbsolute ICON_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                                                                        "chicken", 32, 45, 0, 80, 64, 170);
+    public static final IconAbsolute TWITTER_AVATAR_COORDS = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                                                                        "twitter_avatar",32, 32, 192, 80, 256, 144);
  
     public static final URI LITELOADER_URI = URI.create("http://www.liteloader.com/");
  
@@ -117,7 +121,8 @@ public class LiteLoaderBrandingProvider implements BrandingProvider
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.BrandingProvider#getTwitterAvatarResource()
+     * @see com.mumfrey.liteloader.api.BrandingProvider
+     *      #getTwitterAvatarResource()
      */
     @Override
     public ResourceLocation getTwitterAvatarResource()
@@ -53,7 +53,8 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.LiteAPI#getRequiredDownstreamTransformers()
+     * @see com.mumfrey.liteloader.api.LiteAPI
+     *      #getRequiredDownstreamTransformers()
      */
     @Override
     public String[] getRequiredDownstreamTransformers()
@@ -144,7 +145,7 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI
         if (this.objectFactory == null)
         {
             this.objectFactory = new ObjectFactoryClient(this.environment, this.properties);
-        }	
+        }
  
         return this.objectFactory;
     }
@@ -20,14 +20,17 @@ import com.mumfrey.liteloader.util.render.IconTextured;
 public class LiteLoaderModInfoDecorator implements ModInfoDecorator
 {
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.ModInfoDecorator#addIcons(com.mumfrey.liteloader.core.ModInfo, java.util.List)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator
+     *      #addIcons(com.mumfrey.liteloader.core.ModInfo, java.util.List)
      */
     @Override
     public void addIcons(final ModInfo<?> mod, List<IconTextured> icons)
     {
         if (mod.hasTweakClass())
         {
-            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestweak"), 12, 12, 158, 80, 170, 92){
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                    I18n.format("gui.mod.providestweak"), 12, 12, 158, 80, 170, 92)
+            {
                 @Override
                 public void onClicked(Object source, Object container)
                 {
@@ -41,7 +44,9 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
  
         if (mod.hasEventTransformers())
         {
-            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providesevents"), 12, 12, 170, 92, 182, 104){
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                    I18n.format("gui.mod.providesevents"), 12, 12, 170, 92, 182, 104)
+            {
                 @Override
                 public void onClicked(Object source, Object container)
                 {
@@ -55,7 +60,9 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
  
         if (mod.hasClassTransformers())
         {
-            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.providestransformer"), 12, 12, 170, 80, 182, 92){
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                    I18n.format("gui.mod.providestransformer"), 12, 12, 170, 80, 182, 92)
+            {
                 @Override
                 public void onClicked(Object source, Object container)
                 {
@@ -69,13 +76,16 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
  
         if (mod.usesAPI())
         {
-            icons.add(new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.usingapi"), 12, 12, 122, 92, 134, 104));
+            icons.add(new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                    I18n.format("gui.mod.usingapi"), 12, 12, 122, 92, 134, 104));
         }
  
         List<Throwable> startupErrors = mod.getStartupErrors();
         if (startupErrors != null && startupErrors.size() > 0)
         {
-            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE, I18n.format("gui.mod.startuperror", startupErrors.size()), 12, 12, 134, 92, 146, 104){
+            icons.add(new IconAbsoluteClickable(LiteLoaderBrandingProvider.ABOUT_TEXTURE,
+                    I18n.format("gui.mod.startuperror", startupErrors.size()), 12, 12, 134, 92, 146, 104)
+            {
                 @Override
                 public void onClicked(Object source, Object container)
                 {
@@ -89,7 +99,9 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.ModInfoDecorator#modifyStatusText(com.mumfrey.liteloader.core.ModInfo, java.lang.String)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator
+     *      #modifyStatusText(com.mumfrey.liteloader.core.ModInfo,
+     *      java.lang.String)
      */
     @Override
     public String modifyStatusText(ModInfo<?> mod, String statusText)
@@ -98,10 +110,13 @@ public class LiteLoaderModInfoDecorator implements ModInfoDecorator
     }
  
     /* (non-Javadoc)
-     * @see com.mumfrey.liteloader.api.ModInfoDecorator#onDrawListEntry(int, int, float, int, int, int, int, boolean, com.mumfrey.liteloader.core.ModInfo, int, int, int)
+     * @see com.mumfrey.liteloader.api.ModInfoDecorator
+     *      #onDrawListEntry(int, int, float, int, int, int, int, boolean,
+     *      com.mumfrey.liteloader.core.ModInfo, int, int, int)
      */
     @Override
-    public void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected, ModInfo<?> mod, int gradientColour, int titleColour, int statusColour)
+    public void onDrawListEntry(int mouseX, int mouseY, float partialTicks, int xPosition, int yPosition, int width, int height, boolean selected,
+            ModInfo<?> mod, int gradientColour, int titleColour, int statusColour)
     {
     }
 }
@@ -96,7 +96,7 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
         if (this.engine == null)
         {
             this.engine = new GameEngineClient();
-        }	
+        }
  
         return this.engine;
     }
@@ -118,7 +118,7 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
         if (this.clientPluginChannels == null)
         {
             this.clientPluginChannels = new ClientPluginChannelsClient();
-        }	
+        }
  
         return this.clientPluginChannels;
     }
@@ -129,7 +129,7 @@ class ObjectFactoryClient implements ObjectFactory&lt;Minecraft, IntegratedServer&gt;
         if (this.serverPluginChannels == null)
         {
             this.serverPluginChannels = new ServerPluginChannels();
-        }	
+        }
  
         return this.serverPluginChannels;
     }
@@ -27,14 +27,23 @@ public class GuiCheckbox extends GuiButton
         {
             minecraft.getTextureManager().bindTexture(LiteLoaderBrandingProvider.ABOUT_TEXTURE);
             glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-            this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
+            this.hovered = mouseX >= this.xPosition
+                    && mouseY >= this.yPosition
+                    && mouseX < this.xPosition + this.width
+                    && mouseY < this.yPosition + this.height;
  
             this.drawTexturedModalRect(this.xPosition, this.yPosition, this.checked ? 134 : 122, 80, 12, 12);
             this.mouseDragged(minecraft, mouseX, mouseY);
  
             int colour = 0xE0E0E0;
-            if (!this.enabled) colour = 0xA0A0A0;
-            else if (this.hovered) colour = 0xFFFFA0;
+            if (!this.enabled)
+            {
+                colour = 0xA0A0A0;
+            }
+            else if (this.hovered)
+            {
+                colour = 0xFFFFA0;
+            }
  
             this.drawString(minecraft.fontRendererObj, this.displayString, this.xPosition + 16, this.yPosition + 2, colour);
         }
@@ -36,7 +36,10 @@ public class GuiHoverLabel extends GuiButton
     {
         if (this.visible)
         {
-            this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
+            this.hovered = mouseX >= this.xPosition
+                    && mouseY >= this.yPosition
+                    && mouseX < this.xPosition + this.width
+                    && mouseY < this.yPosition + this.height;
             this.fontRenderer.drawString(this.displayString, this.xPosition, this.yPosition, this.hovered ? this.hoverColour : this.colour);
         }
         else
@@ -36,30 +36,45 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel;
 import com.mumfrey.liteloader.util.render.Icon;
  
 /**
- * GUI screen which displays info about loaded mods and also allows them to be enabled and
- * disabled. An instance of this class is created every time the main menu is displayed and is
- * drawn as an overlay until the tab is clicked, at which point it becomes the active GUI screen
- * and draws the parent main menu screen as its background to give the appearance of being
- * overlaid on the main menu. 
+ * GUI screen which displays info about loaded mods and also allows them to be
+ * enabled and disabled. An instance of this class is created every time the
+ * main menu is displayed and is drawn as an overlay until the tab is clicked,
+ * at which point it becomes the active GUI screen and draws the parent main
+ * menu screen as its background to give the appearance of being overlaid on the
+ * main menu.
  *
  * @author Adam Mummery-Smith
  */
 public class GuiLiteLoaderPanel extends GuiScreen
 {
-    static final int LEFT_EDGE       = 80;
-    static final int MARGIN          = 12;
-    static final int TAB_WIDTH       = 20;
-    static final int TAB_HEIGHT      = 40;
-    static final int TAB_TOP         = 20;
-    static final int PANEL_TOP       = 83;
-    static final int PANEL_BOTTOM    = 26;
+    static final int WHITE                           = 0xFFFFFFFF;
+    static final int OPAQUE                          = 0xFF000000;
+    static final int NOTIFICATION_TOOLTIP_FOREGROUND = 0xFFFFFF;
+    static final int NOTIFICATION_TOOLTIP_BACKGROUND = 0xB0000099;
+    static final int ERROR_TOOLTIP_FOREGROUND        = 0xFF5555;
+    static final int ERROR_TOOLTIP_BACKGROUND        = 0xB0330000;
+    static final int HEADER_HR_COLOUR                = 0xFF999999;
+    static final int HEADER_TEXT_COLOUR              = GuiLiteLoaderPanel.WHITE;
+    static final int HEADER_TEXT_COLOUR_SUB          = 0xFFAAAAAA;
+    static final int TOOLTIP_FOREGROUND              = 0xFFFFFF;
+    static final int TOOLTIP_FOREGROUND_SUB          = 0xCCCCCC;
+    static final int TOOLTIP_BACKGROUND              = 0xB0000000;
+    
+    static final int LEFT_EDGE                       = 80;
+    static final int MARGIN                          = 12;
+    static final int TAB_WIDTH                       = 20;
+    static final int TAB_HEIGHT                      = 40;
+    static final int TAB_TOP                         = 20;
+    static final int PANEL_TOP                       = 83;
+    static final int PANEL_BOTTOM                    = 26;
  
     private static final double TWEEN_RATE = 0.08;
  
     private static boolean displayErrorToolTip = true;
  
     /**
-     * Reference to the main menu which this screen is either overlaying or using as its background
+     * Reference to the main menu which this screen is either overlaying or
+     * using as its background.
      */
     private GuiScreen parentScreen;
  
@@ -84,7 +99,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
     private double tweenAmount = 0.0;
  
     /**
-     * Since we don't get real mouse events we have to simulate them by tracking the mouse state
+     * Since we don't get real mouse events we have to simulate them by tracking
+     * the mouse state.
      */
     private boolean mouseDown, toggled, toggleable;
  
@@ -131,7 +147,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
      * @param parentScreen
      * @param mods
      */
-    public GuiLiteLoaderPanel(Minecraft minecraft, GuiScreen parentScreen, LiteLoaderMods mods, LoaderEnvironment environment, LoaderProperties properties, ConfigManager configManager, boolean showTab)
+    public GuiLiteLoaderPanel(Minecraft minecraft, GuiScreen parentScreen, LiteLoaderMods mods, LoaderEnvironment environment,
+            LoaderProperties properties, ConfigManager configManager, boolean showTab)
     {
         this.mc              = minecraft;
         this.fontRendererObj = minecraft.fontRendererObj;
@@ -148,7 +165,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
  
         this.initBranding();
  
-        this.currentPanel = this.modsPanel = new GuiPanelMods(this, minecraft, mods, environment, configManager, this.brandColour, this.modInfoDecorators);
+        this.currentPanel = this.modsPanel = new GuiPanelMods(this, minecraft, mods, environment, configManager,
+                this.brandColour, this.modInfoDecorators);
         this.settingsPanel = new GuiPanelSettings(this, minecraft);
  
         this.startupErrorCount = mods.getStartupErrorCount();
@@ -181,7 +199,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
                 if (brandingProvider.getBrandingColour() != 0 && brandingProvider.getPriority() > brandingColourProviderPriority)
                 {
                     brandingColourProviderPriority = brandingProvider.getPriority();
-                    this.brandColour = 0xFF000000 | brandingProvider.getBrandingColour();
+                    this.brandColour = GuiLiteLoaderPanel.OPAQUE | brandingProvider.getBrandingColour();
                 }
  
                 ResourceLocation logoResource = brandingProvider.getLogoResource();
@@ -271,11 +289,13 @@ public class GuiLiteLoaderPanel extends GuiScreen
  
         this.currentPanel.setSize(this.width - LEFT_EDGE, this.height);
  
-        this.buttonList.add(new GuiHoverLabel(2, LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 9, this.fontRendererObj, I18n.format("gui.about.taboptions"), this.brandColour));
+        this.buttonList.add(new GuiHoverLabel(2, LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 9, this.fontRendererObj,
+                I18n.format("gui.about.taboptions"), this.brandColour));
  
         if (LiteLoaderVersion.getUpdateSite().canCheckForUpdate() && this.mc.theWorld == null && !this.isSnapshot)
         {
-            this.buttonList.add(new GuiHoverLabel(3, LEFT_EDGE + MARGIN + 38 + this.fontRendererObj.getStringWidth(this.versionText) + 6, 50, this.fontRendererObj, I18n.format("gui.about.checkupdates"), this.brandColour));
+            this.buttonList.add(new GuiHoverLabel(3, LEFT_EDGE + MARGIN + 38 + this.fontRendererObj.getStringWidth(this.versionText) + 6, 50,
+                    this.fontRendererObj, I18n.format("gui.about.checkupdates"), this.brandColour));
         }
  
         Keyboard.enableRepeatEvents(true);
@@ -288,7 +308,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
     }
  
     /* (non-Javadoc)
-     * @see net.minecraft.client.gui.GuiScreen#setWorldAndResolution(net.minecraft.client.Minecraft, int, int)
+     * @see net.minecraft.client.gui.GuiScreen
+     *      #setWorldAndResolution(net.minecraft.client.Minecraft, int, int)
      */
     @Override
     public void setWorldAndResolution(Minecraft minecraft, int width, int height)
@@ -363,11 +384,15 @@ public class GuiLiteLoaderPanel extends GuiScreen
         int offsetMouseX = mouseX - (int)xOffset;
  
         // Handle mouse stuff here since we won't get mouse events when not the active GUI
-        boolean mouseOverTab = this.showTab && (offsetMouseX > LEFT_EDGE - TAB_WIDTH && offsetMouseX < LEFT_EDGE && mouseY > TAB_TOP && mouseY < TAB_TOP + TAB_HEIGHT);
+        boolean mouseOverTab = this.showTab && (offsetMouseX > LEFT_EDGE - TAB_WIDTH
+                                                && offsetMouseX < LEFT_EDGE
+                                                && mouseY > TAB_TOP
+                                                && mouseY < TAB_TOP + TAB_HEIGHT);
         this.handleMouseClick(offsetMouseX, mouseY, partialTicks, active, mouseOverTab);
  
         // Calculate the tab opacity, not framerate adjusted because we don't really care
-        this.tabOpacity = mouseOverTab || alwaysExpandTab || this.startupErrorCount > 0 || this.notification != null || this.isOpen() ? 0.5F : Math.max(0.0F, this.tabOpacity - partialTicks * 0.1F);
+        this.tabOpacity = mouseOverTab || alwaysExpandTab || this.startupErrorCount > 0 || this.notification != null
+                || this.isOpen() ? 0.5F : Math.max(0.0F, this.tabOpacity - partialTicks * 0.1F);
  
         // Draw the panel contents
         this.drawPanel(offsetMouseX, mouseY, partialTicks, active, xOffset);
@@ -391,12 +416,12 @@ public class GuiLiteLoaderPanel extends GuiScreen
         glTranslatef(xOffset, 0.0F, 0.0F);
  
         // Draw the background and left edge
-        drawRect(LEFT_EDGE, 0, this.width, this.height, 0xB0000000);
+        drawRect(LEFT_EDGE, 0, this.width, this.height, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND);
  
         if (this.showTab)
         {
-            drawRect(LEFT_EDGE, 0, LEFT_EDGE + 1, TAB_TOP, 0xFFFFFFFF);
-            drawRect(LEFT_EDGE, TAB_TOP + TAB_HEIGHT, LEFT_EDGE + 1, this.height, 0xFFFFFFFF);
+            drawRect(LEFT_EDGE, 0, LEFT_EDGE + 1, TAB_TOP, GuiLiteLoaderPanel.WHITE);
+            drawRect(LEFT_EDGE, TAB_TOP + TAB_HEIGHT, LEFT_EDGE + 1, this.height, GuiLiteLoaderPanel.WHITE);
  
             this.mc.getTextureManager().bindTexture(LiteLoaderBrandingProvider.ABOUT_TEXTURE);
             glDrawTexturedRect(LEFT_EDGE - TAB_WIDTH, TAB_TOP, TAB_WIDTH + 1, TAB_HEIGHT, 80, 80, 122, 160, 0.5F + this.tabOpacity);
@@ -411,7 +436,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
         }
         else
         {
-            drawRect(LEFT_EDGE, 0, LEFT_EDGE + 1, this.height, 0xFFFFFFFF);
+            drawRect(LEFT_EDGE, 0, LEFT_EDGE + 1, this.height, GuiLiteLoaderPanel.WHITE);
         }
  
         // Only draw the panel contents if we are actually open
@@ -470,14 +495,15 @@ public class GuiLiteLoaderPanel extends GuiScreen
         glDrawTexturedRect(right - this.iconCoords.getIconWidth(), MARGIN, this.iconCoords, 1.0F);
  
         // Draw header text
-        this.fontRendererObj.drawString(this.versionText, left + 38, 50, 0xFFFFFFFF);
-        this.fontRendererObj.drawString(this.activeModText, left + 38, 60, 0xFFAAAAAA);
+        this.fontRendererObj.drawString(this.versionText, left + 38, 50, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR);
+        this.fontRendererObj.drawString(this.activeModText, left + 38, 60, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR_SUB);
  
         // Draw top and bottom horizontal rules
-        drawRect(left, 80, right, 81, 0xFF999999);
-        drawRect(left, this.height - bottom + 2, right, this.height - bottom + 3, 0xFF999999);
+        drawRect(left, 80, right, 81, GuiLiteLoaderPanel.HEADER_HR_COLOUR);
+        drawRect(left, this.height - bottom + 2, right, this.height - bottom + 3, GuiLiteLoaderPanel.HEADER_HR_COLOUR);
  
-        this.mouseOverLogo = (mouseY > MARGIN && mouseY < MARGIN + this.logoCoords.getIconHeight() && mouseX > left && mouseX < left + this.logoCoords.getIconWidth());
+        this.mouseOverLogo = (mouseY > MARGIN && mouseY < MARGIN + this.logoCoords.getIconHeight()
+                && mouseX > left && mouseX < left + this.logoCoords.getIconWidth());
         return this.mouseOverLogo;
     }
  
@@ -487,8 +513,10 @@ public class GuiLiteLoaderPanel extends GuiScreen
  
         if (mouseOverTab && this.tweenAmount < 0.01)
         {
-            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, LiteLoader.getVersionDisplayString(), mouseX, mouseY, this.width, this.height, 0xFFFFFF, 0xB0000000);
-            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.activeModText, mouseX, mouseY + 13, this.width, this.height, 0xCCCCCC, 0xB0000000);
+            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, LiteLoader.getVersionDisplayString(), mouseX, mouseY, this.width, this.height,
+                    GuiLiteLoaderPanel.TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND);
+            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.activeModText, mouseX, mouseY + 13, this.width, this.height,
+                    GuiLiteLoaderPanel.TOOLTIP_FOREGROUND_SUB, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND);
  
             if (annoyingTip)
             {
@@ -505,16 +533,19 @@ public class GuiLiteLoaderPanel extends GuiScreen
     {
         if (this.startupErrorCount > 0)
         {
-            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, I18n.format("gui.error.tooltip", this.startupErrorCount, this.criticalErrorCount), left, top, this.width, this.height, 0xFF5555, 0xB0330000);
+            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, I18n.format("gui.error.tooltip", this.startupErrorCount, this.criticalErrorCount),
+                    left, top, this.width, this.height, GuiLiteLoaderPanel.ERROR_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.ERROR_TOOLTIP_BACKGROUND);
         }
         else if (this.notification != null)
         {
-            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.notification, left, top, this.width, this.height, 0xFFFFFF, 0xB0000099);
+            GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.notification, left, top, this.width, this.height,
+                    GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_BACKGROUND);
         }
     }
  
     /* (non-Javadoc)
-     * @see net.minecraft.client.gui.GuiScreen#actionPerformed(net.minecraft.client.gui.GuiButton)
+     * @see net.minecraft.client.gui.GuiScreen
+     *      #actionPerformed(net.minecraft.client.gui.GuiButton)
      */
     @Override
     protected void actionPerformed(GuiButton button)
@@ -586,9 +617,13 @@ public class GuiLiteLoaderPanel extends GuiScreen
     protected void mouseReleased(int mouseX, int mouseY, int button)
     {
         if (button == -1)
+        {
             this.currentPanel.mouseMoved(mouseX - LEFT_EDGE, mouseY);
+        }
         else
+        {
             this.currentPanel.mouseReleased(mouseX - LEFT_EDGE, mouseY, button);
+        }
  
         if (!this.currentPanel.stealFocus())
         {
@@ -661,7 +696,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
     }
  
     /**
-     * Callback for the "config" button, display the config panel for the currently selected mod
+     * Callback for the "config" button, display the config panel for the
+     * currently selected mod.
      */
     void openConfigPanel(ConfigPanel panel, LiteMod mod)
     {
@@ -694,7 +730,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
     }
  
     /**
-     * Draw a tooltip at the specified location and clip to screenWidth and screenHeight
+     * Draw a tooltip at the specified location and clip to screenWidth and
+     * screenHeight
      * 
      * @param fontRenderer
      * @param tooltipText
@@ -705,13 +742,14 @@ public class GuiLiteLoaderPanel extends GuiScreen
      * @param colour
      * @param backgroundColour
      */
-    public static void drawTooltip(FontRenderer fontRenderer, String tooltipText, int mouseX, int mouseY, int screenWidth, int screenHeight, int colour, int backgroundColour)
+    public static void drawTooltip(FontRenderer fontRenderer, String tooltipText, int mouseX, int mouseY, int screenWidth, int screenHeight,
+            int colour, int backgroundColour)
     {
         int textSize = fontRenderer.getStringWidth(tooltipText);
         mouseX = Math.max(0, Math.min(screenWidth - 4, mouseX - 4));
         mouseY = Math.max(0, Math.min(screenHeight - 16, mouseY));
         drawRect(mouseX - textSize - 2, mouseY, mouseX + 2, mouseY + 12, backgroundColour);
-        fontRenderer.drawStringWithShadow(tooltipText, mouseX - textSize, mouseY + 2, colour); // TODO OBF MCPTEST drawStringWithShadow - func_175063_a
+        fontRenderer.drawStringWithShadow(tooltipText, mouseX - textSize, mouseY + 2, colour);
     }
  
  
@@ -23,13 +23,15 @@ import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.render.Icon;
  
 /**
- * "About LiteLoader" panel which docks in the mod info screen and lists information about the installed APIs
+ * "About LiteLoader" panel which docks in the mod info screen and lists
+ * information about the installed APIs.
  *
  * @author Adam Mummery-Smith
  */
 class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
 {
-    public static final IconAbsolute apiIconCoords = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "api_icon", 32, 32, 192, 144, 256, 208);
+    public static final IconAbsolute apiIconCoords = new IconAbsolute(LiteLoaderBrandingProvider.ABOUT_TEXTURE, "api_icon",
+            32, 32, 192, 144, 256, 208);
  
     private static final int ROW_HEIGHT = 40;
  
@@ -51,7 +53,8 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
  
         this.sortBrandingProviders();
  
-        this.scrollPane.addControl(new GuiHoverLabel(-2, 38, 22 + this.brandings.size() * GuiPanelAbout.ROW_HEIGHT, this.mc.fontRendererObj, "\247n" + MCP_URI.toString(), this.parent.getBrandColour()));
+        this.scrollPane.addControl(new GuiHoverLabel(-2, 38, 22 + this.brandings.size() * GuiPanelAbout.ROW_HEIGHT, this.mc.fontRendererObj,
+                "\247n" + MCP_URI.toString(), this.parent.getBrandColour()));
     }
  
     /**
@@ -66,9 +69,10 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
             BrandingProvider brandingProvider = LiteLoader.getCustomisationProvider(api, BrandingProvider.class);
             if (brandingProvider != null)
             {
-                sortedBrandingProviders.add(new SortableValue<BrandingProvider>(Integer.MAX_VALUE - brandingProvider.getPriority(), 0, brandingProvider));
+                sortedBrandingProviders.add(new SortableValue<BrandingProvider>(Integer.MAX_VALUE - brandingProvider.getPriority(), 0,
+                        brandingProvider));
             }
-        }	
+        }
  
         int brandingIndex = 0;
  
@@ -80,7 +84,8 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
             URI homepage = brandingProvider.getHomepage();
             if (homepage != null)
             {
-                this.scrollPane.addControl(new GuiHoverLabel(brandingIndex, 38, 22 + brandingIndex * GuiPanelAbout.ROW_HEIGHT, this.mc.fontRendererObj, "\247n" + homepage, this.parent.getBrandColour()));
+                this.scrollPane.addControl(new GuiHoverLabel(brandingIndex, 38, 22 + brandingIndex * GuiPanelAbout.ROW_HEIGHT,
+                        this.mc.fontRendererObj, "\247n" + homepage, this.parent.getBrandColour()));
             }
  
             brandingIndex++;
@@ -11,8 +11,9 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel;
 import com.mumfrey.liteloader.modconfig.ConfigPanelHost;
  
 /**
- * Config panel container, this handles drawing the configuration panel chrome and also hosts the
- * configuration panels themselves to support scrolling and stuff
+ * Config panel container, this handles drawing the configuration panel chrome
+ * and also hosts the configuration panels themselves to support scrolling and
+ * stuff.
  *
  * @author Adam Mummery-Smith
  */
@@ -186,7 +187,8 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost
  
         // Update and draw scroll bar
         this.scrollBar.setMaxValue(this.totalHeight - this.innerHeight);
-        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, this.width - MARGIN - 5, TOP, 5, this.innerHeight, Math.max(this.innerHeight, this.totalHeight));
+        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, this.width - MARGIN - 5, TOP, 5, this.innerHeight,
+                Math.max(this.innerHeight, this.totalHeight));
  
         // Draw other buttons
         super.draw(mouseX, mouseY, partialTicks);
@@ -221,7 +223,9 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost
         if (mouseButton == 0)
         {
             if (this.scrollBar.wasMouseOver())
+            {
                 this.scrollBar.setDragging(true);
+            }
         }
  
         super.mousePressed(mouseX, mouseY, mouseButton);
@@ -89,9 +89,12 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
     {
         super.setSize(width, height);
  
-        this.controls.add(new GuiButton(0, this.width - 59 - MARGIN, this.height - BOTTOM + 9, 60, 20, I18n.format("gui.done")));
-        this.controls.add(this.btnUpload = new GuiButton(1, this.width - 145 - MARGIN, this.height - BOTTOM + 9, 80, 20, I18n.format("gui.log.postlog")));
-        this.controls.add(this.chkScale = new GuiCheckbox(2, MARGIN, this.height - BOTTOM + 15, I18n.format("gui.log.scalecheckbox")));
+        this.controls.add(new GuiButton(0, this.width - 59 - MARGIN, this.height - BOTTOM + 9, 60, 20,
+                I18n.format("gui.done")));
+        this.controls.add(this.btnUpload = new GuiButton(1, this.width - 145 - MARGIN, this.height - BOTTOM + 9, 80, 20,
+                I18n.format("gui.log.postlog")));
+        this.controls.add(this.chkScale = new GuiCheckbox(2, MARGIN, this.height - BOTTOM + 15,
+                I18n.format("gui.log.scalecheckbox")));
  
         this.chkScale.checked = GuiPanelLiteLoaderLog.useNativeRes;
  
@@ -142,7 +145,8 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
             {
                 LiteLoaderLogger.info("Log file upload succeeded, url is %s", this.logURL);
                 int urlWidth = this.mc.fontRendererObj.getStringWidth(this.logURL);
-                this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRendererObj, "\247n" + this.logURL, this.parent.getBrandColour()));
+                this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRendererObj, "\247n" + this.logURL,
+                        this.parent.getBrandColour()));
             }
             else
             {
@@ -26,7 +26,7 @@ import com.mumfrey.liteloader.modconfig.ConfigPanel;
  * @author Adam Mummery-Smith
  */
 public class GuiPanelMods extends GuiPanel implements ModListContainer
-{	
+{
     private static final int SCROLLBAR_WIDTH = 5;
  
     private final GuiLiteLoaderPanel parentScreen;
@@ -58,7 +58,8 @@ public class GuiPanelMods extends GuiPanel implements ModListContainer
      */
     private GuiSimpleScrollBar scrollBar = new GuiSimpleScrollBar();
  
-    public GuiPanelMods(GuiLiteLoaderPanel parentScreen, Minecraft minecraft, LiteLoaderMods mods, LoaderEnvironment environment, ConfigManager configManager, int brandColour, List<ModInfoDecorator> decorators)
+    public GuiPanelMods(GuiLiteLoaderPanel parentScreen, Minecraft minecraft, LiteLoaderMods mods, LoaderEnvironment environment,
+            ConfigManager configManager, int brandColour, List<ModInfoDecorator> decorators)
     {
         super(minecraft);
  
@@ -106,8 +107,10 @@ public class GuiPanelMods extends GuiPanel implements ModListContainer
         int rightPanelLeftEdge = MARGIN + 4 + (this.width - MARGIN - MARGIN - 4) / 2;
  
         this.controls.clear();
-        this.controls.add(this.btnToggle = new GuiButton(0, rightPanelLeftEdge, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 90, 20, I18n.format("gui.enablemod")));
-        this.controls.add(this.btnConfig = new GuiButton(1, rightPanelLeftEdge + 92, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 69, 20, I18n.format("gui.modsettings")));
+        this.controls.add(this.btnToggle = new GuiButton(0, rightPanelLeftEdge, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 90, 20,
+                I18n.format("gui.enablemod")));
+        this.controls.add(this.btnConfig = new GuiButton(1, rightPanelLeftEdge + 92, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM - 24, 69, 20,
+                I18n.format("gui.modsettings")));
  
         this.modList.setSize(width, height);
     }
@@ -252,7 +255,8 @@ public class GuiPanelMods extends GuiPanel implements ModListContainer
      */
     private void drawModsList(int mouseX, int mouseY, float partialTicks, int width, int height)
     {
-        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, MARGIN + width - SCROLLBAR_WIDTH, GuiLiteLoaderPanel.PANEL_TOP, SCROLLBAR_WIDTH, height, this.listHeight);
+        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, MARGIN + width - SCROLLBAR_WIDTH, GuiLiteLoaderPanel.PANEL_TOP, SCROLLBAR_WIDTH,
+                height, this.listHeight);
  
         // clip outside of scroll area
         glEnableClipping(MARGIN, MARGIN + width - SCROLLBAR_WIDTH - 1, GuiLiteLoaderPanel.PANEL_TOP, this.height - GuiLiteLoaderPanel.PANEL_BOTTOM);
@@ -22,6 +22,8 @@ import com.mumfrey.liteloader.update.UpdateSite;
  */
 class GuiPanelUpdateCheck extends GuiPanel
 {
+    private static final int WHITE = 0xFFFFFFFF;
+
     /**
      * URI to open if a new version is available
      */
@@ -51,7 +53,8 @@ class GuiPanelUpdateCheck extends GuiPanel
  
     private boolean canForceUpdate, updateForced;
  
-    public GuiPanelUpdateCheck(GuiLiteLoaderPanel parentScreen, Minecraft minecraft, UpdateSite updateSite, String updateName, LoaderProperties properties)
+    public GuiPanelUpdateCheck(GuiLiteLoaderPanel parentScreen, Minecraft minecraft, UpdateSite updateSite, String updateName,
+            LoaderProperties properties)
     {
         super(minecraft);
  
@@ -67,9 +70,12 @@ class GuiPanelUpdateCheck extends GuiPanel
     {
         super.setSize(width, height);
  
-        this.controls.add(new GuiButton(0, this.width - 99 - MARGIN, this.height - BOTTOM + 9, 100, 20, this.updateForced ? I18n.format("gui.exitgame") : I18n.format("gui.done")));
-        this.controls.add(this.btnCheck = new GuiButton(1, MARGIN + 16, TOP + 16, 100, 20, I18n.format("gui.checknow")));
-        this.controls.add(this.btnDownload = new GuiButton(2, MARGIN + 16, TOP + 118, 100, 20, this.canForceUpdate ? I18n.format("gui.forceupdate") : I18n.format("gui.downloadupdate")));
+        this.controls.add(new GuiButton(0, this.width - 99 - MARGIN, this.height - BOTTOM + 9, 100, 20,
+                this.updateForced ? I18n.format("gui.exitgame") : I18n.format("gui.done")));
+        this.controls.add(this.btnCheck = new GuiButton(1, MARGIN + 16, TOP + 16, 100, 20,
+                I18n.format("gui.checknow")));
+        this.controls.add(this.btnDownload = new GuiButton(2, MARGIN + 16, TOP + 118, 100, 20,
+                this.canForceUpdate ? I18n.format("gui.forceupdate") : I18n.format("gui.downloadupdate")));
     }
  
     @Override
@@ -78,7 +84,7 @@ class GuiPanelUpdateCheck extends GuiPanel
         FontRenderer fontRenderer = this.mc.fontRendererObj;
  
         // Draw panel title
-        fontRenderer.drawString(this.panelTitle, MARGIN, TOP - 14, 0xFFFFFFFF);
+        fontRenderer.drawString(this.panelTitle, MARGIN, TOP - 14, GuiPanelUpdateCheck.WHITE);
  
         // Draw top and bottom horizontal bars
         drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999);
@@ -90,23 +96,25 @@ class GuiPanelUpdateCheck extends GuiPanel
         if (this.updateSite.isCheckInProgress())
         {
             this.drawThrobber(MARGIN, TOP + 40, this.throb);
-            fontRenderer.drawString(I18n.format("gui.updates.status.checking", ""), MARGIN + 18, TOP + 44, 0xFFFFFFFF);
+            fontRenderer.drawString(I18n.format("gui.updates.status.checking", ""), MARGIN + 18, TOP + 44, GuiPanelUpdateCheck.WHITE);
         }
         else if (this.updateSite.isCheckComplete())
         {
             boolean success = this.updateSite.isCheckSucceess();
             String status = success ? I18n.format("gui.updates.status.success") : I18n.format("gui.updates.status.failed");
-            fontRenderer.drawString(I18n.format("gui.updates.status.checking", status), MARGIN + 18, TOP + 44, 0xFFFFFFFF);
+            fontRenderer.drawString(I18n.format("gui.updates.status.checking", status), MARGIN + 18, TOP + 44, GuiPanelUpdateCheck.WHITE);
  
             if (success)
             {
-                fontRenderer.drawString(I18n.format("gui.updates.available.title"), MARGIN + 18, TOP + 70, 0xFFFFFFFF);
+                fontRenderer.drawString(I18n.format("gui.updates.available.title"), MARGIN + 18, TOP + 70, GuiPanelUpdateCheck.WHITE);
                 if (this.updateSite.isUpdateAvailable())
                 {
                     this.btnDownload.visible = !this.updateForced;
-                    fontRenderer.drawString(I18n.format("gui.updates.available.newversion"), MARGIN + 18, TOP + 84, 0xFFFFFFFF);
-                    fontRenderer.drawString(I18n.format("gui.updates.available.version", this.updateSite.getAvailableVersion()), MARGIN + 18, TOP + 94, 0xFFFFFFFF);
-                    fontRenderer.drawString(I18n.format("gui.updates.available.date", this.updateSite.getAvailableVersionDate()), MARGIN + 18, TOP + 104, 0xFFFFFFFF);
+                    fontRenderer.drawString(I18n.format("gui.updates.available.newversion"), MARGIN + 18, TOP + 84, GuiPanelUpdateCheck.WHITE);
+                    fontRenderer.drawString(I18n.format("gui.updates.available.version", this.updateSite.getAvailableVersion()),
+                            MARGIN + 18, TOP + 94, GuiPanelUpdateCheck.WHITE);
+                    fontRenderer.drawString(I18n.format("gui.updates.available.date", this.updateSite.getAvailableVersionDate()),
+                            MARGIN + 18, TOP + 104, GuiPanelUpdateCheck.WHITE);
  
                     if (this.updateForced)
                     {
@@ -115,13 +123,13 @@ class GuiPanelUpdateCheck extends GuiPanel
                 }
                 else
                 {
-                    fontRenderer.drawString(I18n.format("gui.updates.available.nonewversion"), MARGIN + 18, TOP + 84, 0xFFFFFFFF);
+                    fontRenderer.drawString(I18n.format("gui.updates.available.nonewversion"), MARGIN + 18, TOP + 84, GuiPanelUpdateCheck.WHITE);
                 }
             }
         }
         else
         {
-            fontRenderer.drawString(I18n.format("gui.updates.status.idle"), MARGIN + 18, TOP + 44, 0xFFFFFFFF);
+            fontRenderer.drawString(I18n.format("gui.updates.status.idle"), MARGIN + 18, TOP + 44, GuiPanelUpdateCheck.WHITE);
         }
  
         super.draw(mouseX, mouseY, partialTicks);
@@ -129,7 +129,8 @@ class GuiScrollPanel extends GuiPanel
         glPopMatrix();
  
         // Update and draw scroll bar
-        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, this.left + this.width - 5, this.top, 5, this.height, Math.max(this.height, this.contentHeight));
+        this.scrollBar.drawScrollBar(mouseX, mouseY, partialTicks, this.left + this.width - 5, this.top, 5, this.height,
+                Math.max(this.height, this.contentHeight));
     }
  
     @Override
@@ -153,7 +154,9 @@ class GuiScrollPanel extends GuiPanel
         if (mouseButton == 0)
         {
             if (this.scrollBar.wasMouseOver())
+            {
                 this.scrollBar.setDragging(true);
+            }
         }
     }
  
@@ -51,7 +51,8 @@ public class GuiSimpleScrollBar extends Gui
     }
  
     /**
-     * Set the scroll value, the value is clamped between 0 and the current max value
+     * Set the scroll value, the value is clamped between 0 and the current max
+     * value.
      */
     public void setValue(int value)
     {
@@ -59,7 +60,8 @@ public class GuiSimpleScrollBar extends Gui
     }
  
     /**
-     * Offset the scroll value by the specified amount, the value is clamped between 0 and the current max value
+     * Offset the scroll value by the specified amount, the value is clamped
+     * between 0 and the current max value.
      */
     public void offsetValue(int offset)
     {
@@ -6,7 +6,7 @@ public interface ScrollPanelContent
 {
     public abstract int getScrollPanelContentHeight(GuiScrollPanel source);
  
-    public abstract void drawScrollPanelContent(GuiScrollPanel source, int mouseX, int mouseY, float partialTicks, int scrollAmount, int visibleHeight);
+    public abstract void drawScrollPanelContent(GuiScrollPanel source, int mouseX, int mouseY, float partialTicks, int scrollAmt, int visibleHeight);
  
     public abstract void scrollPanelActionPerformed(GuiScrollPanel source, GuiButton control);
  
@@ -59,7 +59,8 @@ public class GuiModInfoPanel extends Gui
  
         drawRect(xPosition + 5, yPos, xPosition + width, yPos + 1, GuiModInfoPanel.DIVIDER_COLOUR); yPos += 4; // divider
  
-        this.fontRenderer.drawString(I18n.format("gui.about.authors") + ": \2477" + this.modInfo.getAuthor(), xPosition + 5, yPos, GuiModInfoPanel.AUTHORS_COLOUR); yPos += 10;
+        this.fontRenderer.drawString(I18n.format("gui.about.authors") + ": \2477" + this.modInfo.getAuthor(), xPosition + 5, yPos,
+                GuiModInfoPanel.AUTHORS_COLOUR); yPos += 10;
         if (!Strings.isNullOrEmpty(this.modInfo.getURL()))
         {
             this.fontRenderer.drawString(this.modInfo.getURL(), xPosition + 5, yPos, GuiModListPanel.BLEND_2THRDS & this.brandColour); yPos += 10;
@@ -106,7 +106,8 @@ public class GuiModListPanel extends Gui
         int titleColour    = this.getTitleColour(selected);
         int statusColour   = this.getStatusColour(selected);
  
-        this.drawGradientRect(xPosition, yPosition, xPosition + width, yPosition + GuiModListPanel.PANEL_HEIGHT, gradientColour, GuiModListPanel.GRADIENT_COLOUR2);
+        this.drawGradientRect(xPosition, yPosition, xPosition + width, yPosition + GuiModListPanel.PANEL_HEIGHT, gradientColour,
+                GuiModListPanel.GRADIENT_COLOUR2);
  
         String titleText = this.owner.getTitleText();
         String versionText = this.owner.getVersionText();
@@ -128,7 +129,8 @@ public class GuiModListPanel extends Gui
  
         for (ModInfoDecorator decorator : this.decorators)
         {
-            decorator.onDrawListEntry(mouseX, mouseY, partialTicks, xPosition, yPosition, width, GuiModListPanel.PANEL_HEIGHT, selected, this.modInfo, gradientColour, titleColour, statusColour);
+            decorator.onDrawListEntry(mouseX, mouseY, partialTicks, xPosition, yPosition, width, GuiModListPanel.PANEL_HEIGHT, selected,
+                    this.modInfo, gradientColour, titleColour, statusColour);
         }
     }
  
@@ -172,7 +174,8 @@ public class GuiModListPanel extends Gui
             if (tooltipText != null)
             {
                 glDisableClipping();
-                GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, tooltipText, mouseX, mouseY, 4096, 4096, GuiModListPanel.WHITE, GuiModListPanel.BLEND_HALF & GuiModListPanel.BLACK);
+                GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, tooltipText, mouseX, mouseY, 4096, 4096, GuiModListPanel.WHITE,
+                        GuiModListPanel.BLEND_HALF & GuiModListPanel.BLACK);
                 glEnableClipping();
             }
  
@@ -187,7 +190,10 @@ public class GuiModListPanel extends Gui
      */
     protected int getGradientColour(boolean selected)
     {
-        return GuiModListPanel.BLEND_2THRDS & (this.owner.isErrored() ? (selected ? GuiModListPanel.ERROR_GRADIENT_COLOUR : GuiModListPanel.ERROR_GRADIENT_COLOUR2) : (selected ? (this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : this.brandColour) : GuiModListPanel.BLACK));
+        return GuiModListPanel.BLEND_2THRDS
+            & (this.owner.isErrored()
+                    ? (selected ? GuiModListPanel.ERROR_GRADIENT_COLOUR : GuiModListPanel.ERROR_GRADIENT_COLOUR2)
+                    : (selected ? (this.owner.isExternal() ? GuiModListPanel.EXTERNAL_ENTRY_COLOUR : this.brandColour) : GuiModListPanel.BLACK));
     }
  
     /**
@@ -11,7 +11,8 @@ public class GuiModListPanelInvalid extends GuiModListPanel
 {
     private static final int BAD_PANEL_HEIGHT = 22;
  
-    public GuiModListPanelInvalid(ModListEntry owner, FontRenderer fontRenderer, int brandColour, ModInfo<?> modInfo, List<ModInfoDecorator> decorators)
+    public GuiModListPanelInvalid(ModListEntry owner, FontRenderer fontRenderer, int brandColour, ModInfo<?> modInfo,
+            List<ModInfoDecorator> decorators)
     {
         super(owner, fontRenderer, brandColour, modInfo, decorators);
     }
@@ -38,7 +38,8 @@ public class ModList
  
     private boolean hasConfig = false;