Merge branch '1.9'

Mumfrey
2 parents 9f5bfc13 9c27400c
Showing 100 changed files with 1189 additions and 431 deletions
README.MD
build.gradle
checkstyle.xml
docs/logo.png
gradle.properties
src/client/java/com/mumfrey/liteloader/ChatFilter.java
src/client/java/com/mumfrey/liteloader/ChatListener.java
src/client/java/com/mumfrey/liteloader/ChatRenderListener.java
src/client/java/com/mumfrey/liteloader/EntityRenderListener.java
src/client/java/com/mumfrey/liteloader/FrameBufferListener.java
src/client/java/com/mumfrey/liteloader/GameLoopListener.java
src/client/java/com/mumfrey/liteloader/HUDRenderListener.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/PostRenderListener.java
src/client/java/com/mumfrey/liteloader/PreRenderListener.java
src/client/java/com/mumfrey/liteloader/RenderListener.java
+![LiteLoader Logo](docs/logo.png?raw=true)
+
+**LiteLoader** is a lightweight mod framework designed primarily for client-side
+mods. It aims to provide a wide array of features as possible whilst having
+minimal footprint and very low impact game performance when features are not in
+use.
+
+### Features
+
+* __Simple callback system based on interfaces__. Simply implement the
+interfaces your mod needs
+* __Powerful class transformers__. If LiteLoader can't meet your needs "out of
+the box", you have a wide selection of powerful class transformers at your
+fingertips. It provides access to cutting edge transformers developed for
+LiteLoader but also used by the wider modding community. This guarantees that
+LiteLoader's transformers are the most stable and powerful libraries available
+* __Tiny footprint__. Liteloader injects minimal code into the game, and uses
+native bytecode injection for maximum performance. LiteLoader makes use of Java
+libraries shipped with the base game such as Gson rather than bundling a slew of
+optional libraries
+* __Native bytecode event handlers__. Liteloader generates raw java bytecode for
+event callbacks, this makes its event handlers blazing fast
+
+### License and Permissions
+
+LiteLoader is Copyright 2012-2016 Adam Mummery-Smith  All Rights Reserved
+You are free to use the source code for personal reference.
+You may not redistribute modified versions of the loader.
+You may not redistribute the source code in any form without written permission.
+
+### Building the project
+**LiteLoader** uses the [Gradle](http://gradle.org/) build automation
+system. You must have Gradle installed on your system. To build the project
+simply navigate to the project directory in a terminal and execute
+
+```
+gradle
+```
 \ No newline at end of file
@@ -17,9 +17,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
-        classpath 'org.spongepowered:mixingradle:0.1-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
     }
 }
  
@@ -33,14 +33,17 @@ apply plugin: &#39;org.spongepowered.mixin&#39;
 defaultTasks 'build'
  
 ext {
+    def isJenkins = project.hasProperty("jenkins")
+    
     // Artefact details
-    buildNumber = project.hasProperty("buildNumber") ? buildNumber : '0'
+    buildNumber = isJenkins ? System.env.BUILD_NUMBER : (project.hasProperty("buildNumber") ? buildNumber : '0')
     buildVersion = project.hasProperty("buildVersion") ? buildVersion : '0.0'
     ciSystem = project.hasProperty("ciSystem") ? ciSystem : 'unknown'
-    commit = project.hasProperty("commit") ? commit : 'unknown'
+    commit = isJenkins ? System.env.GIT_COMMIT : (project.hasProperty("commit") ? commit : 'unknown')
     classifier = project.hasProperty("buildType") ? buildType : 'SNAPSHOT'
     isReleaseBuild = "RELEASE".equals(project.classifier.toUpperCase())
     mavenRepo = project.isReleaseBuild ? "mavenUrl" : "mavenSnapshotUrl"
+    brand = isJenkins ? "${project.mcVersion}-SNAPSHOT-r${System.env.GIT_COMMIT.take(7).toUpperCase()}-b${System.env.BUILD_NUMBER}-${System.env.BUILD_ID}" : ""
  
     // Extended project information
     projectName = 'LiteLoader'
@@ -68,9 +71,15 @@ repositories {
 }
  
 dependencies {
-    compile 'org.spongepowered:mixin:0.4.11-SNAPSHOT'
-    compile 'com.google.guava:guava:17.0'
-    compile 'com.google.code.gson:gson:2.2.4'
+//    compile 'org.ow2.asm:asm-debug-all:5.0.3'
+    compile('org.spongepowered:mixin:0.5.5-SNAPSHOT') {
+        exclude module: 'asm-commons'
+        exclude module: 'asm-tree'
+        exclude module: 'launchwrapper'
+        exclude module: 'guava'
+    }
+//    compile 'com.google.guava:guava:17.0'
+//    compile 'com.google.code.gson:gson:2.2.4'
 }
  
 minecraft {
@@ -131,6 +140,14 @@ afterEvaluate {
     mc.replacer.putReplacement '{RUN_CLIENT_TWEAKER}', minecraft.tweakClass
 }
  
+processResources {
+    inputs.property "brand", project.brand
+    from (sourceSets.main.resources.srcDirs) {
+        include 'liteloader.properties'
+        filter { line -> line.startsWith('brand=') ? line + project.brand : line }
+    }
+}
+
 // manifest entries for all jars
 def jarManifest = {
     mainAttributes (
@@ -146,7 +163,7 @@ jar {
     doFirst {
         // Seriously forge?
         ant.replace(
-            file: sourceSets.main.refMapFile,
+            file: file("${compileJava.temporaryDir}/${sourceSets.main.refMap}"),
             token: "func_72355_a(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;)V",
             value: "initializeConnectionToPlayer(Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V"
         )
@@ -284,7 +301,20 @@ uploadArchives {
                         url 'http://develop.liteloader.com/liteloader/LiteLoader/issues'
                     }
                 }
+                whenConfigured {
+                    dependencies = dependencies.findAll {
+                        !it.artifactId.contains('mixin')
+                    }
+                }
             }
         }
     }
 }
+
+install.repositories.mavenInstaller.pom {
+    whenConfigured {
+        dependencies = dependencies.findAll {
+            !it.artifactId.contains('mixin')
+        }
+    }
+}
@@ -5,7 +5,7 @@
     This configuration file was written by the eclipse-cs plugin configuration editor
 -->
 <!--
-    Checkstyle-Configuration: LiteLoader Style
+    Checkstyle-Configuration: LiteLoader
     Description: none
 -->
 <module name="Checker">
@@ -36,7 +36,7 @@
       <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]*)?$"/>
+      <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">
@@ -5,6 +5,6 @@ description=LiteLoader
 url=http://www.liteloader.com
 organization=LiteLoader
 buildType=SNAPSHOT
-buildVersion=1.8
-mcVersion=1.8
-mcMappings=snapshot_20151124
 \ No newline at end of file
+buildVersion=1.9
+mcVersion=1.9
+mcMappings=snapshot_20160411
 \ No newline at end of file
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
  
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
  
 /**
@@ -23,5 +28,5 @@ public interface ChatFilter extends LiteMod
      * 
      * @return True to keep the packet, false to discard
      */
-    public abstract boolean onChat(IChatComponent chat, String message, ReturnValue<IChatComponent> newMessage);
+    public abstract boolean onChat(ITextComponent chat, String message, ReturnValue<ITextComponent> newMessage);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
  
  
 /**
@@ -13,8 +18,8 @@ public interface ChatListener extends LiteMod
     /**
      * Handle an inbound message
      * 
-     * @param chat IChatComponent parsed from the chat packet
+     * @param chat ITextComponent parsed from the chat packet
      * @param message Chat message parsed from the chat message component
      */
-    public abstract void onChat(IChatComponent chat, String message);
+    public abstract void onChat(ITextComponent chat, String message);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.gui.GuiNewChat;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.renderer.entity.Render;
@@ -22,7 +27,8 @@ public interface EntityRenderListener extends LiteMod
      * @param yaw
      * @param partialTicks
      */
-    public abstract void onRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
+    public abstract void onRenderEntity(Render<? extends Entity> render, Entity entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks);
  
     /**
      * Called immediately following an entity being rendered
@@ -35,5 +41,6 @@ public interface EntityRenderListener extends LiteMod
      * @param yaw
      * @param partialTicks
      */
-    public abstract void onPostRenderEntity(Render render, Entity entity, double xPos, double yPos, double zPos, float yaw, float partialTicks);
+    public abstract void onPostRenderEntity(Render<? extends Entity> render, Entity entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.shader.Framebuffer;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.Minecraft;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 /**
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
-import net.minecraft.client.Minecraft;
-
 import com.mumfrey.liteloader.core.LiteLoader;
  
+import net.minecraft.client.Minecraft;
+
 /**
  * Interface for mods which need to initialise stuff once the game
  * initialisation is completed, for example mods which need to register new
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
+import com.mojang.realmsclient.dto.RealmsServer;
+
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-
-import com.mojang.realmsclient.dto.RealmsServer;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
  
 /**
@@ -25,5 +30,5 @@ public interface JoinGameListener extends LiteMod
      * @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);
+    public abstract void onJoinGame(INetHandler netHandler, SPacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 /**
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
-import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.CPacketChatMessage;
  
 /**
  * Interface for mods which want to monitor outbound chat
@@ -16,5 +21,5 @@ public interface OutboundChatListener extends LiteMod
      * @param packet
      * @param message
      */
-    public abstract void onSendChatMessage(C01PacketChatMessage packet, String message);
+    public abstract void onSendChatMessage(CPacketChatMessage packet, String message);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
  
 /**
  *
@@ -17,5 +22,5 @@ public interface PostLoginListener extends LiteMod
      * @param netHandler
      * @param packet
      */
-    public abstract void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess packet);
+    public abstract void onPostLogin(INetHandlerLoginClient netHandler, SPacketLoginSuccess packet);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 /**
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.renderer.RenderGlobal;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.gui.GuiScreen;
@@ -22,14 +27,6 @@ public interface RenderListener extends LiteMod
     public abstract void onRenderGui(GuiScreen currentScreen);
  
     /**
-     * Called when the world is rendered
-     * 
-     * @deprecated Use PreRenderListener::onRenderWorld(F)V instead
-     */
-    @Deprecated
-    public abstract void onRenderWorld();
-
-    /**
      * Called immediately after the world/camera transform is initialised
      */
     public abstract void onSetupCameraTransform();
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
-import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.util.IChatComponent;
-
 import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
  
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.text.ITextComponent;
+
 /**
  * Interface for mods which want to handle or inhibit the saving of screenshots
  * 
@@ -24,5 +29,5 @@ public interface ScreenshotListener extends LiteMod
      * @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);
+    public boolean onSaveScreenshot(String screenshotName, int width, int height, Framebuffer fbo, ReturnValue<ITextComponent> message);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.Minecraft;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader;
  
 import net.minecraft.client.gui.ScaledResolution;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import com.mumfrey.liteloader.client.ducks.IClientNetLoginHandler;
@@ -9,11 +14,11 @@ import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
 import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.client.C17PacketCustomPayload;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.client.CPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketJoinGame;
  
 /**
  * Handler for client plugin channels
@@ -26,7 +31,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param netHandler
      * @param loginPacket
      */
-    void onPostLogin(INetHandlerLoginClient netHandler, S02PacketLoginSuccess loginPacket)
+    void onPostLogin(INetHandlerLoginClient netHandler, SPacketLoginSuccess loginPacket)
     {
         this.clearPluginChannels(netHandler);
     }
@@ -35,7 +40,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param netHandler
      * @param loginPacket
      */
-    void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
         this.sendRegisteredPluginChannels(netHandler);
     }
@@ -46,7 +51,7 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
      * @param customPayload
      */
     @Override
-    public void onPluginChannelMessage(S3FPacketCustomPayload customPayload)
+    public void onPluginChannelMessage(SPacketCustomPayload customPayload)
     {
         if (customPayload != null && customPayload.getChannelName() != null)
         {
@@ -67,11 +72,11 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
         if (netHandler instanceof INetHandlerLoginClient)
         {
             NetworkManager networkManager = ((IClientNetLoginHandler)netHandler).getNetMgr();
-            networkManager.sendPacket(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+            networkManager.sendPacket(new CPacketCustomPayload(CHANNEL_REGISTER, registrationData));
         }
         else if (netHandler instanceof INetHandlerPlayClient)
         {
-            ClientPluginChannelsClient.dispatch(new C17PacketCustomPayload(CHANNEL_REGISTER, registrationData));
+            ClientPluginChannelsClient.dispatch(new CPacketCustomPayload(CHANNEL_REGISTER, registrationData));
         }
     }
  
@@ -95,14 +100,14 @@ public class ClientPluginChannelsClient extends ClientPluginChannels
             throw new UnregisteredChannelException(channel);
         }
  
-        C17PacketCustomPayload payload = new C17PacketCustomPayload(channel, data);
+        CPacketCustomPayload payload = new CPacketCustomPayload(channel, data);
         return ClientPluginChannelsClient.dispatch(payload);
     }
  
     /**
      * @param payload
      */
-    static boolean dispatch(C17PacketCustomPayload payload)
+    static boolean dispatch(CPacketCustomPayload payload)
     {
         try
         {
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import java.io.File;
@@ -16,7 +21,7 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.WorldSettings;
  
 /**
@@ -165,18 +170,20 @@ public abstract class ClientProxy extends Proxy
         ClientProxy.broker.onRenderTerrain(partialTicks, pass, timeSlice);
     }
  
-    public static void onSaveScreenshot(CallbackInfoReturnable<IChatComponent> ci, File gameDir, String name, int width, int height,
+    public static void onSaveScreenshot(CallbackInfoReturnable<ITextComponent> ci, File gameDir, String name, int width, int height,
             Framebuffer fbo)
     {
         ClientProxy.broker.onScreenshot(ci, name, width, height, fbo);
     }
  
-    public static void onRenderEntity(RenderManager source, Render render, Entity entity, double x, double y, double z, float yaw, float pTicks)
+    public static <T extends Entity> void onRenderEntity(RenderManager source, Render<T> render, T entity, double x, double y, double z,
+            float yaw, float pTicks)
     {
         ClientProxy.broker.onRenderEntity(source, entity, x, y, z, yaw, pTicks, render);
     }
  
-    public static void onPostRenderEntity(RenderManager source, Render render, Entity entity, double x, double y, double z, float yaw, float pTicks)
+    public static <T extends Entity> void onPostRenderEntity(RenderManager source, Render<T> render, T entity, double x, double y, double z,
+            float yaw, float pTicks)
     {
         ClientProxy.broker.onPostRenderEntity(source, entity, x, y, z, yaw, pTicks, render);
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
  
+import com.mumfrey.liteloader.client.overlays.IMinecraft;
+import com.mumfrey.liteloader.common.GameEngine;
+import com.mumfrey.liteloader.common.Resources;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.SoundHandler;
 import net.minecraft.client.gui.GuiNewChat;
@@ -14,10 +23,6 @@ import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.server.integrated.IntegratedServer;
  
-import com.mumfrey.liteloader.client.overlays.IMinecraft;
-import com.mumfrey.liteloader.common.GameEngine;
-import com.mumfrey.liteloader.common.Resources;
-
 /**
  *
  * @author Adam Mummery-Smith
@@ -113,7 +118,7 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
  
     public ScaledResolution getScaledResolution()
     {
-        return new ScaledResolution(this.engine, this.engine.displayWidth, this.engine.displayHeight);
+        return new ScaledResolution(this.engine);
     }
  
     public GuiNewChat getChatGUI()
@@ -142,7 +147,7 @@ public class GameEngineClient implements GameEngine&lt;Minecraft, IntegratedServer&gt;
     @Override
     public List<KeyBinding> getKeyBindings()
     {
-        LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
+        ArrayList<KeyBinding> keyBindings = new ArrayList<KeyBinding>();
         keyBindings.addAll(Arrays.asList(this.engine.gameSettings.keyBindings));
         return keyBindings;
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 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;
-import net.minecraft.network.INetHandler;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.world.World;
-
 import com.mumfrey.liteloader.api.CoreProvider;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.common.Resources;
@@ -16,6 +13,14 @@ import com.mumfrey.liteloader.core.LiteLoaderMods;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.resources.InternalResourcePack;
  
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.play.server.SPacketJoinGame;
+import net.minecraft.world.World;
+
 /**
  * CoreProvider which fixes SoundManager derping up at startup
  * 
@@ -85,7 +90,7 @@ public class LiteLoaderCoreProviderClient implements CoreProvider
     }
  
     @Override
-    public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
+    public void onJoinGame(INetHandler netHandler, SPacketJoinGame loginPacket)
     {
     }
  
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import org.lwjgl.input.Mouse;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
  
-import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.ChatRenderListener;
+import com.mumfrey.liteloader.EntityRenderListener;
+import com.mumfrey.liteloader.FrameBufferListener;
+import com.mumfrey.liteloader.GameLoopListener;
+import com.mumfrey.liteloader.HUDRenderListener;
+import com.mumfrey.liteloader.InitCompleteListener;
+import com.mumfrey.liteloader.OutboundChatFilter;
+import com.mumfrey.liteloader.OutboundChatListener;
+import com.mumfrey.liteloader.PostRenderListener;
+import com.mumfrey.liteloader.PreRenderListener;
+import com.mumfrey.liteloader.RenderListener;
+import com.mumfrey.liteloader.ScreenshotListener;
+import com.mumfrey.liteloader.Tickable;
+import com.mumfrey.liteloader.ViewportListener;
 import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
@@ -28,10 +46,10 @@ import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.Entity;
-import net.minecraft.network.play.client.C01PacketChatMessage;
+import net.minecraft.network.play.client.CPacketChatMessage;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.util.Timer;
+import net.minecraft.util.text.ITextComponent;
  
 public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft, IntegratedServer> implements IResourceManagerReloadListener
 {
@@ -406,7 +424,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
         Minecraft minecraft = this.engine.getClient();
  
         // Flag indicates whether we are in game at the moment
-        Entity renderViewEntity = minecraft.getRenderViewEntity(); // TODO OBF MCPTEST func_175606_aa - getRenderViewEntity
+        Entity renderViewEntity = minecraft.getRenderViewEntity();
         boolean inGame = renderViewEntity != null && renderViewEntity.worldObj != null;
  
         this.profiler.startSection("loader");
@@ -434,7 +452,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param packet
      * @param message
      */
-    void onSendChatMessage(C01PacketChatMessage packet, String message)
+    void onSendChatMessage(CPacketChatMessage packet, String message)
     {
         this.outboundChatListeners.all().onSendChatMessage(packet, message);
     }
@@ -483,7 +501,6 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     void onRenderWorld(float partialTicks, long timeSlice)
     {
         this.preRenderListeners.all().onRenderWorld(partialTicks);
-        this.renderListeners.all().onRenderWorld();
     }
  
     /**
@@ -523,9 +540,9 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param height
      * @param fbo
      */
-    void onScreenshot(CallbackInfoReturnable<IChatComponent> ci, String name, int width, int height, Framebuffer fbo)
+    void onScreenshot(CallbackInfoReturnable<ITextComponent> ci, String name, int width, int height, Framebuffer fbo)
     {
-        ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>(ci.getReturnValue());
+        ReturnValue<ITextComponent> ret = new ReturnValue<ITextComponent>(ci.getReturnValue());
  
         if (!this.screenshotListeners.all().onSaveScreenshot(name, width, height, fbo, ret))
         {
@@ -543,8 +560,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 <T extends Entity> void onRenderEntity(RenderManager source, T entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks, Render<T> render)
     {
         this.entityRenderListeners.all().onRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
     }
@@ -559,8 +576,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 <T extends Entity> void onPostRenderEntity(RenderManager source, T entity, double xPos, double yPos, double zPos, float yaw,
+            float partialTicks, Render<T> render)
     {
         this.entityRenderListeners.all().onPostRenderEntity(render, entity, xPos, yPos, zPos, yaw, partialTicks);
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiIngameMenu;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.GuiOptions;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
@@ -20,6 +18,13 @@ import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiIngameMenu;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiOptions;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
 /**
  * Observer which handles the display of the mod panel
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import com.mojang.realmsclient.dto.RealmsServer;
-import com.mumfrey.liteloader.*;
+import com.mumfrey.liteloader.ChatFilter;
+import com.mumfrey.liteloader.ChatListener;
+import com.mumfrey.liteloader.JoinGameListener;
+import com.mumfrey.liteloader.PostLoginListener;
+import com.mumfrey.liteloader.PreJoinGameListener;
 import com.mumfrey.liteloader.common.ducks.IChatPacket;
 import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
@@ -21,14 +30,13 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.Packet;
 import net.minecraft.network.login.INetHandlerLoginClient;
-import net.minecraft.network.login.server.S02PacketLoginSuccess;
+import net.minecraft.network.login.server.SPacketLoginSuccess;
 import net.minecraft.network.play.INetHandlerPlayClient;
-import net.minecraft.network.play.server.S01PacketJoinGame;
-import net.minecraft.network.play.server.S02PacketChat;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.network.play.server.SPacketChat;
+import net.minecraft.network.play.server.SPacketJoinGame;
 import net.minecraft.util.IThreadListener;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
  
 /**
  * Client-side packet event handlers
@@ -107,7 +115,7 @@ public class PacketEventsClient extends PacketEvents
         this.postLoginListeners.add(postLoginListener);
     }
  
-    public static void onJoinRealm(long serverId, RealmsServer server)
+    public static void onJoinRealm(RealmsServer server)
     {
         PacketEventsClient.joiningRealm = server;
     }
@@ -115,22 +123,23 @@ public class PacketEventsClient extends PacketEvents
     @Override
     protected IThreadListener getPacketContextListener(Packets.Context context)
     {
+        Minecraft minecraft = Minecraft.getMinecraft();
         if (context == Packets.Context.SERVER)
         {
-            return MinecraftServer.getServer();
+            return minecraft.getIntegratedServer();
         }
  
-        return Minecraft.getMinecraft();
+        return minecraft;
     }
  
     /* (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)
+     *      net.minecraft.network.play.server.SPacketJoinGame)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet)
     {
         if (this.preJoinGame(e, netHandler, packet))
         {
@@ -149,7 +158,7 @@ public class PacketEventsClient extends PacketEvents
      * @param packet
      * @throws EventCancellationException
      */
-    private boolean preJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet) throws EventCancellationException
+    private boolean preJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet) throws EventCancellationException
     {
         if (!(netHandler instanceof INetHandlerPlayClient))
         {
@@ -166,7 +175,7 @@ public class PacketEventsClient extends PacketEvents
      * @param netHandler
      * @param packet
      */
-    private void postJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+    private void postJoinGame(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketJoinGame packet)
     {
         this.joinGameListeners.all().onJoinGame(netHandler, packet, Minecraft.getMinecraft().getCurrentServerData(), PacketEventsClient.joiningRealm);
         PacketEventsClient.joiningRealm = null;
@@ -185,7 +194,7 @@ public class PacketEventsClient extends PacketEvents
      *      net.minecraft.network.login.server.S02PacketLoginSuccess)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketLoginSuccess packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketLoginSuccess packet)
     {
         if (netHandler instanceof INetHandlerLoginClient)
         {
@@ -208,21 +217,21 @@ public class PacketEventsClient extends PacketEvents
      *      net.minecraft.network.play.server.S02PacketChat)
      */
     @Override
-    protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S02PacketChat packet)
+    protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, SPacketChat packet)
     {
         if (packet.getChatComponent() == null)
         {
             return;
         }
  
-        IChatComponent originalChat = packet.getChatComponent();
-        IChatComponent chat = originalChat;
+        ITextComponent originalChat = packet.getChatComponent();
+        ITextComponent chat = originalChat;
         String message = chat.getFormattedText();
  
         // Chat filters get a stab at the chat first, if any filter returns false the chat is discarded
         for (ChatFilter chatFilter : this.chatFilters)
         {
-            ReturnValue<IChatComponent> ret = new ReturnValue<IChatComponent>();
+            ReturnValue<ITextComponent> ret = new ReturnValue<ITextComponent>();
  
             if (chatFilter.onChat(chat, message, ret))
             {
@@ -231,7 +240,7 @@ public class PacketEventsClient extends PacketEvents
                     chat = ret.get();
                     if (chat == null)
                     {
-                        chat = new ChatComponentText("");
+                        chat = new TextComponentString("");
                     }
                     message = chat.getFormattedText();
                 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
  
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourcePack;
-
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.ModLoadObserver;
 import com.mumfrey.liteloader.common.Resources;
@@ -17,6 +19,9 @@ import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.resources.ModResourcePackDir;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+
 /**
  * Observer which handles registering mods on the client as resource packs
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.IResourcePack;
-
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.common.Resources;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.IResourcePack;
+
 public class ResourcesClient implements Resources<IResourceManager, IResourcePack>
 {
     private final Minecraft engine = Minecraft.getMinecraft();
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
 import java.util.List;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client;
  
-import net.minecraft.client.resources.I18n;
-
 import com.mumfrey.liteloader.api.TranslationProvider;
  
+import net.minecraft.client.resources.I18n;
+
 public class Translator implements TranslationProvider
 {
     /* (non-Javadoc)
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.api;
  
 import java.net.URI;
  
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-
 import com.mumfrey.liteloader.api.BrandingProvider;
 import com.mumfrey.liteloader.client.util.render.IconAbsolute;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.render.Icon;
  
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
 /**
  * LiteLoader's branding provider
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.api;
  
 import java.util.List;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.server.integrated.IntegratedServer;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ObjectArrays;
 import com.mumfrey.liteloader.api.CoreProvider;
@@ -20,6 +22,9 @@ import com.mumfrey.liteloader.interfaces.ObjectFactory;
 import com.mumfrey.liteloader.messaging.MessageBus;
 import com.mumfrey.liteloader.transformers.event.json.ModEvents;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.server.integrated.IntegratedServer;
+
 /**
  * Client side of the core API
  *
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.api;
  
 import java.util.List;
  
-import net.minecraft.client.resources.I18n;
-
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
 import com.mumfrey.liteloader.client.gui.modlist.GuiModListPanel;
@@ -12,6 +15,8 @@ import com.mumfrey.liteloader.client.util.render.IconAbsoluteClickable;
 import com.mumfrey.liteloader.core.ModInfo;
 import com.mumfrey.liteloader.util.render.IconTextured;
  
+import net.minecraft.client.resources.I18n;
+
 /**
  * ModInfo decorator
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.api;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.launchwrapper.Launch;
-import net.minecraft.server.integrated.IntegratedServer;
-
-import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ClientPluginChannelsClient;
 import com.mumfrey.liteloader.client.GameEngineClient;
+import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.LiteLoaderPanelManager;
 import com.mumfrey.liteloader.client.PacketEventsClient;
 import com.mumfrey.liteloader.client.gui.startup.LoadingBar;
 import com.mumfrey.liteloader.common.GameEngine;
 import com.mumfrey.liteloader.core.ClientPluginChannels;
-import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.LiteLoader;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import com.mumfrey.liteloader.core.PacketEvents;
 import com.mumfrey.liteloader.core.ServerPluginChannels;
-import com.mumfrey.liteloader.interfaces.PanelManager;
 import com.mumfrey.liteloader.interfaces.ObjectFactory;
+import com.mumfrey.liteloader.interfaces.PanelManager;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.permissions.PermissionsManagerClient;
@@ -26,6 +26,11 @@ import com.mumfrey.liteloader.permissions.PermissionsManagerServer;
 import com.mumfrey.liteloader.util.Input;
 import com.mumfrey.liteloader.util.InputManager;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.server.integrated.IntegratedServer;
+
 /**
  * Factory for lifetime loader objects for the client side
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.ducks;
  
 import net.minecraft.network.NetworkManager;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.ducks;
  
 public interface IFramebuffer
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.ducks;
+
+public interface IIntIdentityHashBiMap<V>
+{
+    public abstract void removeObject(V object);
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.ducks;
+
+public interface IMutableRegistry<K, V>
+{
+    public abstract V removeObjectFromRegistry(K key);
+}
-package com.mumfrey.liteloader.client.ducks;
-
-public interface INamespacedRegistry
-{
-    public abstract IObjectIntIdentityMap getUnderlyingMap();
-}
-package com.mumfrey.liteloader.client.ducks;
-
-import java.util.IdentityHashMap;
-import java.util.List;
-
-public interface IObjectIntIdentityMap
-{
-    public abstract <V> IdentityHashMap<V, Integer> getIdentityMap();
-
-    public abstract <V> List<V> getObjectList();
-}
-package com.mumfrey.liteloader.client.ducks;
-
-import java.util.Map;
-
-public interface IRegistrySimple
-{
-    public abstract <K, V> Map<K, V> getRegistryObjects();
-}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.ducks;
  
 import java.util.List;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.ducks;
  
 import java.util.Map;
@@ -7,5 +12,5 @@ import net.minecraft.entity.Entity;
  
 public interface IRenderManager
 {
-    public abstract Map<Class<? extends Entity>, Render> getRenderMap();
+    public abstract Map<Class<? extends Entity>, Render<? extends Entity>> getRenderMap();
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.ducks;
  
 import java.util.Map;
@@ -7,5 +12,5 @@ import net.minecraft.tileentity.TileEntity;
  
 public interface ITileEntityRendererDispatcher
 {
-    public abstract Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> getSpecialRenderMap();
+    public abstract Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> getSpecialRenderMap();
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
  
 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+
 /**
  * Super-simple implementation of a checkbox control
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
@@ -6,16 +11,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
  
@@ -35,6 +30,16 @@ import com.mumfrey.liteloader.modconfig.ConfigManager;
 import com.mumfrey.liteloader.modconfig.ConfigPanel;
 import com.mumfrey.liteloader.util.render.Icon;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
 /**
  * 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
@@ -280,7 +285,6 @@ public class GuiLiteLoaderPanel extends GuiScreen
     /* (non-Javadoc)
      * @see net.minecraft.client.gui.GuiScreen#initGui()
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void initGui()
     {
@@ -790,12 +794,12 @@ public class GuiLiteLoaderPanel extends GuiScreen
         glColor4f(1.0F, 1.0F, 1.0F, alpha);
  
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-        worldRenderer.startDrawingQuads();
-        worldRenderer.addVertexWithUV(x + 0,     y + height, 0, u , v2);
-        worldRenderer.addVertexWithUV(x + width, y + height, 0, u2, v2);
-        worldRenderer.addVertexWithUV(x + width, y + 0,      0, u2, v );
-        worldRenderer.addVertexWithUV(x + 0,     y + 0,      0, u , v );
+        VertexBuffer buf = tessellator.getBuffer();
+        buf.begin(GL_QUADS, VF_POSITION_TEX);
+        buf.pos(x + 0,     y + height, 0).tex(u , v2).endVertex();
+        buf.pos(x + width, y + height, 0).tex(u2, v2).endVertex();
+        buf.pos(x + width, y + 0,      0).tex(u2, v ).endVertex();
+        buf.pos(x + 0,     y + 0,      0).tex(u , v ).endVertex();
         tessellator.draw();
  
         glDisableBlend();
@@ -812,4 +816,4 @@ public class GuiLiteLoaderPanel extends GuiScreen
     {
         glDrawTexturedRect(x, y, icon.getIconWidth(), icon.getIconHeight(), icon.getMinU(), icon.getMinV(), icon.getMaxU(), icon.getMaxV(), alpha);
     }
-}
 \ No newline at end of file
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
  
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
  
+import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiButton;
  
-import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
-
 /**
  * Base class for panels
  *
@@ -30,7 +35,7 @@ public abstract class GuiPanel extends Gui
     /**
      * Buttons
      */
-    protected List<GuiButton> controls = new LinkedList<GuiButton>();
+    protected List<GuiButton> controls = new ArrayList<GuiButton>();
  
     /**
      * Current available width
@@ -100,7 +105,9 @@ public abstract class GuiPanel extends Gui
     void draw(int mouseX, int mouseY, float partialTicks)
     {
         for (GuiButton control : this.controls)
+        {
             control.drawButton(this.mc, mouseX, mouseY);
+        }
     }
  
     /**
@@ -206,4 +213,4 @@ public abstract class GuiPanel extends Gui
         glAlphaFunc(GL_GREATER, 0.1F); 
         glDisableBlend();
     }
-}
 \ No newline at end of file
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import java.net.URI;
@@ -6,12 +11,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.api.BrandingProvider;
@@ -22,6 +21,12 @@ import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.render.Icon;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.ResourceLocation;
+
 /**
  * "About LiteLoader" panel which docks in the mod info screen and lists
  * information about the installed APIs.
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.resources.I18n;
  
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.modconfig.ConfigPanel;
 import com.mumfrey.liteloader.modconfig.ConfigPanelHost;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+
 /**
  * Config panel container, this handles drawing the configuration panel chrome
  * and also hosts the configuration panels themselves to support scrolling and
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import java.io.PrintWriter;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
@@ -6,18 +11,18 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.Session;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 import com.mumfrey.liteloader.util.net.LiteLoaderLogUpload;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.util.Session;
+
 /**
  *
  * @author Adam Mummery-Smith
@@ -98,7 +103,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
  
         this.chkScale.checked = GuiPanelLiteLoaderLog.useNativeRes;
  
-        ScaledResolution res = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight);
+        ScaledResolution res = new ScaledResolution(this.mc);
         this.guiScale = res.getScaleFactor();
  
         this.scrollPane.setSizeAndPosition(MARGIN, TOP, this.width - (MARGIN * 2), this.height - TOP - BOTTOM);
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
@@ -5,10 +10,6 @@ import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
  
 import java.util.List;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.resources.I18n;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.LiteMod;
@@ -20,6 +21,10 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
 import com.mumfrey.liteloader.modconfig.ConfigPanel;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+
 /**
  * Mods panel
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import org.lwjgl.input.Keyboard;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import java.net.URI;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.I18n;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.core.LiteLoaderUpdateSite;
@@ -15,6 +14,12 @@ import com.mumfrey.liteloader.launch.ClassPathUtilities;
 import com.mumfrey.liteloader.launch.LoaderProperties;
 import com.mumfrey.liteloader.update.UpdateSite;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.resources.I18n;
+
 /**
  * "Check for updates" panel which docks in the mod info screen
  *
@@ -169,7 +174,7 @@ class GuiPanelUpdateCheck extends GuiPanel
             {
                 this.updateForced = true;
                 this.parentScreen.setToggleable(false);
-                ScaledResolution sr = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight);
+                ScaledResolution sr = new ScaledResolution(this.mc);
                 this.parentScreen.setWorldAndResolution(this.mc, sr.getScaledWidth(), sr.getScaledHeight());
             }
             else
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
  
 import org.lwjgl.input.Keyboard;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+
 /**
  * Basic non-interactive scrollable panel using OpenGL clipping planes
  * 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import net.minecraft.client.gui.Gui;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui;
  
 import net.minecraft.client.gui.GuiButton;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import static com.mumfrey.liteloader.gl.GL.*;
 import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.resources.I18n;
  
 import com.google.common.base.Strings;
 import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider;
@@ -14,6 +15,11 @@ import com.mumfrey.liteloader.client.util.render.IconAbsolute;
 import com.mumfrey.liteloader.core.ModInfo;
 import com.mumfrey.liteloader.util.render.IconTextured;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.resources.I18n;
+
 public class GuiModInfoPanel extends Gui
 {
     private static final int TITLE_COLOUR       = GuiModListPanel.WHITE;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import static com.mumfrey.liteloader.gl.GL.*;
@@ -6,16 +11,16 @@ import static com.mumfrey.liteloader.gl.GLClippingPlanes.*;
 import java.util.ArrayList;
 import java.util.List;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
 import com.mumfrey.liteloader.core.ModInfo;
 import com.mumfrey.liteloader.util.render.IconClickable;
 import com.mumfrey.liteloader.util.render.IconTextured;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+
 public class GuiModListPanel extends Gui
 {
     static final int BLACK                     = 0xFF000000;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import java.util.List;
  
-import net.minecraft.client.gui.FontRenderer;
-
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.core.ModInfo;
  
+import net.minecraft.client.gui.FontRenderer;
+
 public class GuiModListPanelInvalid extends GuiModListPanel
 {
     private static final int BAD_PANEL_HEIGHT = 22;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import java.util.ArrayList;
@@ -5,9 +10,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
  
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.I18n;
-
 import org.lwjgl.input.Keyboard;
  
 import com.mumfrey.liteloader.LiteMod;
@@ -20,6 +22,9 @@ import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.modconfig.ConfigManager;
  
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
 public class ModList
 {
     private final ModListContainer container;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.modlist;
  
 import java.util.List;
 import java.util.Set;
  
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.resources.I18n;
-
 import com.mumfrey.liteloader.LiteMod;
 import com.mumfrey.liteloader.api.ModInfoDecorator;
 import com.mumfrey.liteloader.core.LiteLoaderMods;
@@ -14,6 +16,9 @@ import com.mumfrey.liteloader.interfaces.Loadable;
 import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
  
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.resources.I18n;
+
 /**
  * Represents a mod in the mod info screen, keeps track of mod information and
  * provides methods for displaying the mod in the mod list and drawing the
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.gui.startup;
  
 import static com.mumfrey.liteloader.gl.GL.*;
@@ -10,11 +15,16 @@ import java.util.List;
  
 import javax.imageio.ImageIO;
  
+import org.lwjgl.opengl.Display;
+
+import com.mumfrey.liteloader.common.LoadingProgress;
+import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -23,11 +33,6 @@ import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.util.ResourceLocation;
  
-import org.lwjgl.opengl.Display;
-
-import com.mumfrey.liteloader.common.LoadingProgress;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
 /**
  * Crappy implementation of a "Mojang Screen" loading bar
  *
@@ -218,7 +223,7 @@ public class LoadingBar extends LoadingProgress
             }
         }
  
-        ScaledResolution scaledResolution = new ScaledResolution(this.minecraft, this.minecraft.displayWidth, this.minecraft.displayHeight);
+        ScaledResolution scaledResolution = new ScaledResolution(this.minecraft);
         int scaleFactor = scaledResolution.getScaleFactor();
         int scaledWidth = scaledResolution.getScaledWidth();
         int scaledHeight = scaledResolution.getScaledHeight();
@@ -254,13 +259,13 @@ public class LoadingBar extends LoadingProgress
  
         this.textureManager.bindTexture(this.textureLocation);
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-        worldRenderer.startDrawingQuads();
-        worldRenderer.setColorOpaque_I(0xFFFFFFFF); // TODO OBF MCPTEST func_178991_c - setColorOpaque_I
-        worldRenderer.addVertexWithUV(0.0D,        scaledHeight, 0.0D, 0.0D, 0.0D);
-        worldRenderer.addVertexWithUV(scaledWidth, scaledHeight, 0.0D, 0.0D, 0.0D);
-        worldRenderer.addVertexWithUV(scaledWidth, 0.0D,         0.0D, 0.0D, 0.0D);
-        worldRenderer.addVertexWithUV(0.0D,        0.0D,         0.0D, 0.0D, 0.0D);
+        VertexBuffer vertexBuffer = tessellator.getBuffer();
+        vertexBuffer.begin(GL_QUADS, VF_POSITION);
+        glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        vertexBuffer.pos(0.0D,        scaledHeight, 0.0D).endVertex();
+        vertexBuffer.pos(scaledWidth, scaledHeight, 0.0D).endVertex();
+        vertexBuffer.pos(scaledWidth, 0.0D,         0.0D).endVertex();
+        vertexBuffer.pos(0.0D,        0.0D,         0.0D).endVertex();
         tessellator.draw();
  
         glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -273,12 +278,11 @@ public class LoadingBar extends LoadingProgress
         int v2 = 256;
  
         float texMapScale = 0.00390625F;
-        worldRenderer.startDrawingQuads();
-        worldRenderer.setColorOpaque_I(0xFFFFFFFF); // TODO OBF MCPTEST func_178991_c - setColorOpaque_I
-        worldRenderer.addVertexWithUV(left + 0,  top + v2, 0.0D, (u1 + 0)  * texMapScale, (v1 + v2) * texMapScale);
-        worldRenderer.addVertexWithUV(left + u2, top + v2, 0.0D, (u1 + u2) * texMapScale, (v1 + v2) * texMapScale);
-        worldRenderer.addVertexWithUV(left + u2, top + 0, 0.0D,  (u1 + u2) * texMapScale, (v1 + 0)  * texMapScale);
-        worldRenderer.addVertexWithUV(left + 0,  top + 0, 0.0D,  (u1 + 0)  * texMapScale, (v1 + 0)  * texMapScale);
+        vertexBuffer.begin(GL_QUADS, VF_POSITION_TEX);
+        vertexBuffer.pos(left + 0,  top + v2, 0.0D).tex((u1 + 0)  * texMapScale, (v1 + v2) * texMapScale).endVertex();
+        vertexBuffer.pos(left + u2, top + v2, 0.0D).tex((u1 + u2) * texMapScale, (v1 + v2) * texMapScale).endVertex();
+        vertexBuffer.pos(left + u2, top + 0,  0.0D).tex((u1 + u2) * texMapScale, (v1 + 0)  * texMapScale).endVertex();
+        vertexBuffer.pos(left + 0,  top + 0,  0.0D).tex((u1 + 0)  * texMapScale, (v1 + 0)  * texMapScale).endVertex();
         tessellator.draw();
  
         glEnableTexture2D();
@@ -319,23 +323,25 @@ public class LoadingBar extends LoadingProgress
 //        tessellator.addVertex(0.0D,               scaledHeight - (scaledHeight / 3), 0.0D);
 //        tessellator.draw();
  
-        worldRenderer.startDrawingQuads();
-        worldRenderer.setColorRGBA(this.barLuma, this.barLuma, this.barLuma, 128); // TODO OBF MCPTEST func_178961_b - setColorRGBA
-        worldRenderer.addVertex(0.0D,               scaledHeight,             0.0D);
-        worldRenderer.addVertex(0.0D + scaledWidth, scaledHeight,             0.0D);
-        worldRenderer.addVertex(0.0D + scaledWidth, scaledHeight - barHeight, 0.0D);
-        worldRenderer.addVertex(0.0D,               scaledHeight - barHeight, 0.0D);
+        vertexBuffer.begin(GL_QUADS, VF_POSITION);
+        float luma = this.barLuma / 255.0F;
+        glColor4f(luma, luma, luma, 0.5F);
+        vertexBuffer.pos(0.0D,               scaledHeight,             0.0D).endVertex();
+        vertexBuffer.pos(0.0D + scaledWidth, scaledHeight,             0.0D).endVertex();
+        vertexBuffer.pos(0.0D + scaledWidth, scaledHeight - barHeight, 0.0D).endVertex();
+        vertexBuffer.pos(0.0D,               scaledHeight - barHeight, 0.0D).endVertex();
         tessellator.draw();
  
         barHeight -= 1;
  
-        worldRenderer.startDrawingQuads();
-        worldRenderer.setColorRGBA(this.r2, this.g2, this.b2, 255); // TODO OBF MCPTEST func_178961_b - setColorRGBA
-        worldRenderer.addVertex(1.0D + barWidth * progress, scaledHeight - 1,         1.0D);
-        worldRenderer.addVertex(1.0D + barWidth * progress, scaledHeight - barHeight, 1.0D);
-        worldRenderer.setColorRGBA(0, 0, 0, 255); // TODO OBF MCPTEST func_178961_b - setColorRGBA
-        worldRenderer.addVertex(1.0D,                       scaledHeight - barHeight, 1.0D);
-        worldRenderer.addVertex(1.0D,                       scaledHeight - 1,         1.0D);
+        vertexBuffer.begin(GL_QUADS, VF_POSITION_COLOR);
+        float r2 = this.r2 / 255.0F;
+        float g2 = this.g2 / 255.0F;
+        float b2 = this.b2 / 255.0F;
+        vertexBuffer.pos(1.0D + barWidth * progress, scaledHeight - 1,         1.0D).color(r2, g2, b2, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D + barWidth * progress, scaledHeight - barHeight, 1.0D).color(r2, g2, b2, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D,                       scaledHeight - barHeight, 1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
+        vertexBuffer.pos(1.0D,                       scaledHeight - 1,         1.0D).color(0.0F, 0.0F, 0.0F, 1.0F).endVertex();
         tessellator.draw();
  
         glAlphaFunc(GL_GREATER, 0.1F);
@@ -349,7 +355,7 @@ public class LoadingBar extends LoadingProgress
         glAlphaFunc(GL_GREATER, 0.1F);
 //        glFlush();
  
-        this.minecraft.updateDisplay(); // TODO OBF MCPTEST updateDisplay - func_175601_h
+        this.minecraft.updateDisplay();
     }
  
     private void renderLogTail(int yPos)
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  
 import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
  
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.util.ResourceLocation;
  
 @Mixin(EntityRenderer.class)
-public abstract class MixinEntityRenderer
+public abstract class MixinEntityRenderer implements IEntityRenderer
 {
-    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+    @Shadow private static ResourceLocation[] SHADERS_TEXTURES;
+    @Shadow private boolean useShader;
+    @Shadow private int shaderIndex;
+    
+    @Shadow abstract void loadShader(ResourceLocation resourceLocationIn);
+    @Shadow abstract float getFOVModifier(float partialTicks, boolean useFOVSetting);
+    @Shadow abstract void setupCameraTransform(float partialTicks, int pass);
+    
+    @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
         value = "INVOKE",
         shift = Shift.AFTER,
         target = "Lnet/minecraft/client/renderer/GlStateManager;clear(I)V"
     ))
-    private void onPreRenderGUI(float partialTicks, CallbackInfo ci)
+    private void onPreRenderGUI(float partialTicks, long nanoTime, CallbackInfo ci)
     {
         ClientProxy.preRenderGUI(partialTicks);
     }
  
-    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+    @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
         value = "INVOKE",
         target = "Lnet/minecraft/client/gui/GuiIngame;renderGameOverlay(F)V"
     ))
-    private void onRenderHUD(float partialTicks, CallbackInfo ci)
+    private void onRenderHUD(float partialTicks, long nanoTime, CallbackInfo ci)
     {
         ClientProxy.onRenderHUD(partialTicks);
     }
  
-    @Inject(method = "updateCameraAndRender(F)V", at = @At(
+    @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
         value = "INVOKE",
         shift = Shift.AFTER,
         target = "Lnet/minecraft/client/gui/GuiIngame;renderGameOverlay(F)V"
     ))
-    private void onPostRenderHUD(float partialTicks, CallbackInfo ci)
+    private void onPostRenderHUD(float partialTicks, long nanoTime, CallbackInfo ci)
     {
         ClientProxy.postRenderHUD(partialTicks);
     }
@@ -112,4 +128,53 @@ public abstract class MixinEntityRenderer
     {
         ClientProxy.onRenderClouds(renderGlobalIn, partialTicks, pass);
     }
+    
+    @Override
+    public boolean getUseShader()
+    {
+        return this.useShader;
+    }
+    
+    @Override
+    public void setUseShader(boolean useShader)
+    {
+        this.useShader = useShader;
+    }
+    
+    @Override
+    public ResourceLocation[] getShaders()
+    {
+        return MixinEntityRenderer.SHADERS_TEXTURES;
+    }
+    
+    @Override
+    public int getShaderIndex()
+    {
+        return this.shaderIndex;
+    }
+    
+    @Override
+    public void setShaderIndex(int shaderIndex)
+    {
+        this.shaderIndex = shaderIndex;
+    }
+    
+    @Override
+    public void selectShader(ResourceLocation shader)
+    {
+        this.loadShader(shader);
+    }
+    
+    @Override
+    public float getFOV(float partialTicks, boolean useFOVSetting)
+    {
+        return this.getFOVModifier(partialTicks, useFOVSetting);
+    }
+    
+    @Override
+    public void setupCamera(float partialTicks, int pass)
+    {
+        this.setupCameraTransform(partialTicks, pass);
+    }
+    
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -16,7 +22,7 @@ import net.minecraft.client.gui.GuiNewChat;
 @Mixin(GuiIngame.class)
 public abstract class MixinGuiIngame extends Gui
 {
-    @Shadow private GuiNewChat persistantChatGUI;
+    @Shadow @Final private GuiNewChat persistantChatGUI;
  
     @Inject(method = "renderGameOverlay(F)V", at = @At(
         value = "INVOKE",
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.overlays.IGuiTextField;
+
+import net.minecraft.client.gui.GuiTextField;
+
+@Mixin(GuiTextField.class)
+public abstract class MixinGuiTextField implements IGuiTextField
+{
+    @Shadow @Final @Mutable private int width;
+    @Shadow @Final @Mutable private int height;
+    @Shadow public int xPosition;
+    @Shadow public int yPosition;
+    @Shadow private int lineScrollOffset;
+    @Shadow private int enabledColor;
+    @Shadow private int disabledColor;
+    @Shadow private boolean isEnabled;
+    
+    @Override
+    public int getXPosition()
+    {
+        return this.xPosition;
+    }
+    
+    @Override
+    public void setXPosition(int xPosition)
+    {
+        this.xPosition = xPosition;
+    }
+    
+    @Override
+    public int getYPosition()
+    {
+        return this.yPosition;
+    }
+    
+    @Override
+    public void setYPosition(int yPosition)
+    {
+        this.yPosition = yPosition;
+    }
+    
+    @Override
+    public int getInternalWidth()
+    {
+        return this.width;
+                
+    }
+    
+    @Override
+    public void setInternalWidth(int width)
+    {
+        this.width = width;
+    }
+    
+    @Override
+    public int getHeight()
+    {
+        return this.height;
+    }
+    
+    @Override
+    public void setHeight(int height)
+    {
+        this.height = height;
+    }
+    
+    @Override
+    public boolean isEnabled()
+    {
+        return this.isEnabled;
+    }
+    
+    @Override
+    public int getLineScrollOffset()
+    {
+        return this.lineScrollOffset;
+    }
+    
+    @Override
+    public int getTextColor()
+    {
+        return this.enabledColor;
+    }
+    
+    @Override
+    public int getDisabledTextColour()
+    {
+        return this.disabledColor;
+    }
+    
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.ducks.IIntIdentityHashBiMap;
+
+import net.minecraft.util.IntIdentityHashBiMap;
+
+@Mixin(IntIdentityHashBiMap.class)
+public abstract class MixinIntIdentityHashBiMap<V> implements IIntIdentityHashBiMap<V>
+{
+    @Shadow private V[] objectArray;
+    @Shadow private int[] intKeys;
+    @Shadow private V[] intToObjects;
+    @Shadow private int field_186821_e;
+    @Shadow private int mapSize;
+    
+    @Shadow private int func_186816_b(V object, int hash)
+    {
+        return -1;
+    }
+    
+    @Shadow private int hashObject(V object)
+    {
+        return -1;
+    }
+
+    @Override
+    public void removeObject(V object)
+    {
+        int index = this.func_186816_b(object, this.hashObject(object));
+        int intKey = this.intKeys[index];
+        this.objectArray[index] = null;
+        this.intKeys[index] = 0;
+        this.intToObjects[intKey] = null;
+    }
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
@@ -6,11 +11,15 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Surrogate;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
 import com.mumfrey.liteloader.client.ClientProxy;
  
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.server.management.PlayerProfileCache;
 import net.minecraft.world.WorldSettings;
  
 @Mixin(IntegratedServer.class)
@@ -18,7 +27,7 @@ public abstract class MixinIntegratedServer extends MinecraftServer
 {
     public MixinIntegratedServer()
     {
-        super(null, null);
+        super(null, null, null, null, null, null, null);
     }
  
     @Inject(
@@ -26,7 +35,8 @@ public abstract class MixinIntegratedServer extends MinecraftServer
         at = @At("RETURN"),
         remap = false
     )
-    private void onConstructed(Minecraft mcIn, String folderName, String worldName, WorldSettings settings, CallbackInfo ci)
+    private void onConstructed(Minecraft mcIn, String folderName, String worldName, WorldSettings settings, YggdrasilAuthenticationService authSrv,
+            MinecraftSessionService sessionSrv, GameProfileRepository profileRepo, PlayerProfileCache profileCache, CallbackInfo ci)
     {
         ClientProxy.onCreateIntegratedServer((IntegratedServer)(Object)this, folderName, worldName, settings);
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
+import java.util.List;
+
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -8,14 +17,25 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  
 import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.overlays.IMinecraft;
  
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.Timer;
  
 @Mixin(Minecraft.class)
-public abstract class MixinMinecraft
+public abstract class MixinMinecraft implements IMinecraft
 {
+    @Shadow private Timer timer;
+    @Shadow volatile boolean running;
+    @Shadow @Final private List<IResourcePack> defaultResourcePacks;
+    @Shadow private String serverName;
+    @Shadow private int serverPort;
+    
+    @Shadow abstract void resize(int width, int height);
+    
     @Inject(method = "startGame()V", at = @At("RETURN"))
     private void onStartupComplete(CallbackInfo ci)
     {
@@ -37,7 +57,7 @@ public abstract class MixinMinecraft
     @Inject(method = "runGameLoop()V", at = @At(
         value = "INVOKE",
         shift = Shift.AFTER,
-        target = "Lnet/minecraft/client/renderer/EntityRenderer;updateCameraAndRender(F)V"
+        target = "Lnet/minecraft/client/renderer/EntityRenderer;updateCameraAndRender(FJ)V"
     ))
     private void onTick(CallbackInfo ci)
     {
@@ -82,4 +102,41 @@ public abstract class MixinMinecraft
     {
         ClientProxy.onRender();
     }
+
+    @Override
+    public Timer getTimer()
+    {
+        return this.timer;
+    }
+
+    @Override
+    public boolean isRunning()
+    {
+        return this.running;
+    }
+
+    @Override
+    public List<IResourcePack> getDefaultResourcePacks()
+    {
+        return this.defaultResourcePacks;
+    }
+
+    @Override
+    public String getServerName()
+    {
+        return this.serverName;
+    }
+
+    @Override
+    public int getServerPort()
+    {
+        return this.serverPort;
+    }
+
+    @Override
+    public void onResizeWindow(int width, int height)
+    {
+        this.resize(width, height);
+    }
+    
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
-package com.mumfrey.liteloader.client.mixin;
-
-import java.util.IdentityHashMap;
-import java.util.List;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
-
-import net.minecraft.util.ObjectIntIdentityMap;
-
-@Mixin(ObjectIntIdentityMap.class)
-public abstract class MixinObjectIntIdentityMap implements IObjectIntIdentityMap
-{
-    @Shadow private IdentityHashMap<?, Integer> identityMap;
-    @Shadow private List<?> objectList;
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public <V> IdentityHashMap<V, Integer> getIdentityMap()
-    {
-        return (IdentityHashMap<V, Integer>)this.identityMap;
-    }
-    
-    @SuppressWarnings("unchecked")
-    @Override
-    public <V> List<V> getObjectList()
-    {
-        return (List<V>)this.objectList;
-    }
-}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
  
 import com.mojang.realmsclient.RealmsMainScreen;
 import com.mojang.realmsclient.dto.RealmsServer;
@@ -15,12 +19,9 @@ import net.minecraft.realms.RealmsScreen;
 @Mixin(value = RealmsMainScreen.class, remap = false)
 public abstract class MixinRealmsMainScreen extends RealmsScreen
 {
-    @Inject(method = "play(J)V", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At(
-        value = "INVOKE",
-        target = "Lcom/mojang/realmsclient/RealmsMainScreen;stopRealmsFetcherAndPinger()V"
-    ))
-    private void onJoinRealm(long serverId, CallbackInfo ci, RealmsServer server)
+    @Inject(method = "play(Lcom/mojang/realmsclient/dto/RealmsServer;)V", at = @At("HEAD"))
+    private void onJoinRealm(RealmsServer server, CallbackInfo ci)
     {
-        PacketEventsClient.onJoinRealm(serverId, server);
+        PacketEventsClient.onJoinRealm(server);
     }
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
  
-import com.mumfrey.liteloader.client.ducks.INamespacedRegistry;
-import com.mumfrey.liteloader.client.ducks.IObjectIntIdentityMap;
+import com.mumfrey.liteloader.client.ducks.IIntIdentityHashBiMap;
  
-import net.minecraft.util.ObjectIntIdentityMap;
-import net.minecraft.util.RegistryNamespaced;
-import net.minecraft.util.RegistrySimple;
+import net.minecraft.util.IntIdentityHashBiMap;
+import net.minecraft.util.registry.RegistryNamespaced;
  
 @Mixin(RegistryNamespaced.class)
-public abstract class MixinRegistryNamespaced extends RegistrySimple implements INamespacedRegistry
+public abstract class MixinRegistryNamespaced<K, V> extends MixinRegistrySimple<K, V>
 {
-    @Shadow protected ObjectIntIdentityMap underlyingIntegerMap;
-    
+    @Shadow @Final protected IntIdentityHashBiMap<V> underlyingIntegerMap;
+
+    @SuppressWarnings("unchecked")
     @Override
-    public IObjectIntIdentityMap getUnderlyingMap()
+    public V removeObjectFromRegistry(K key)
     {
-        return (IObjectIntIdentityMap)this.underlyingIntegerMap;
+        V removed = super.removeObjectFromRegistry(key);
+        if (removed != null && this.underlyingIntegerMap instanceof IIntIdentityHashBiMap)
+        {
+            ((IIntIdentityHashBiMap<V>)this.underlyingIntegerMap).removeObject(removed);
+        }
+        return removed;
     }
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.util.Map;
  
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
  
-import com.mumfrey.liteloader.client.ducks.IRegistrySimple;
+import com.mumfrey.liteloader.client.ducks.IMutableRegistry;
  
-import net.minecraft.util.RegistrySimple;
+import net.minecraft.util.registry.RegistrySimple;
  
 @Mixin(RegistrySimple.class)
-public abstract class MixinRegistrySimple implements IRegistrySimple
+public abstract class MixinRegistrySimple<K, V> implements IMutableRegistry<K, V>
 {
-    @Shadow protected Map<?, ?> registryObjects;
+    @Shadow private Object[] values;
+    @Shadow @Final protected Map<K, V> registryObjects;
  
-    @SuppressWarnings("unchecked")
     @Override
-    public <K, V> Map<K, V> getRegistryObjects()
+    public V removeObjectFromRegistry(K key)
     {
-        return (Map<K, V>)this.registryObjects;
+        this.values = null;
+        return this.registryObjects.remove(key);
     }
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.util.Map;
@@ -17,19 +22,19 @@ import net.minecraft.entity.Entity;
 @Mixin(RenderManager.class)
 public abstract class MixinRenderManager implements IRenderManager
 {
-    @Shadow private Map<Class<? extends Entity>, Render> entityRenderMap;
+    @Shadow private Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap;
  
     @Override
-    public Map<Class<? extends Entity>, Render> getRenderMap()
+    public Map<Class<? extends Entity>, Render<? extends Entity>> getRenderMap()
     {
         return this.entityRenderMap;
     }
  
-    @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)Z", at = @At(
+    @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At(
         value = "INVOKE",
         target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V"
     ))
-    private void onRenderEntity(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks)
+    private <T extends Entity> void onRenderEntity(Render<T> render, T entity, double x, double y, double z, float entityYaw, float partialTicks)
     {
         RenderManager source = (RenderManager)(Object)this;
         ClientProxy.onRenderEntity(source, render, entity, x, y, z, entityYaw, partialTicks);
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.io.File;
@@ -10,22 +15,24 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import com.mumfrey.liteloader.client.ClientProxy;
  
 import net.minecraft.client.shader.Framebuffer;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ScreenShotHelper;
+import net.minecraft.util.text.ITextComponent;
  
 @Mixin(ScreenShotHelper.class)
 public abstract class MixinScreenShotHelper
 {
     @Inject(
-        method = "saveScreenshot(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/shader/Framebuffer;)Lnet/minecraft/util/IChatComponent;",
+        method = "saveScreenshot(Ljava/io/File;Ljava/lang/String;IILnet/minecraft/client/shader/Framebuffer;)"
+                + "Lnet/minecraft/util/text/ITextComponent;",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/client/renderer/OpenGlHelper;isFramebufferEnabled()Z",
+            target = "Lnet/minecraft/util/ScreenShotHelper;createScreenshot(IILnet/minecraft/client/shader/Framebuffer;)"
+                    + "Ljava/awt/image/BufferedImage;",
             ordinal = 0
         ),
         cancellable = true
     )
-    private static void onSaveScreenshot(File gameDir, String name, int width, int height, Framebuffer fbo, CallbackInfoReturnable<IChatComponent> ci)
+    private static void onSaveScreenshot(File gameDir, String name, int width, int height, Framebuffer fbo, CallbackInfoReturnable<ITextComponent> ci)
     {
         ClientProxy.onSaveScreenshot(ci, gameDir, name, width, height, fbo);
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.util.UUID;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.util.List;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
+package com.mumfrey.liteloader.client.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.mumfrey.liteloader.client.overlays.ISoundHandler;
+
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.audio.SoundList;
+import net.minecraft.util.ResourceLocation;
+
+@Mixin(SoundHandler.class)
+public abstract class MixinSoundHandler implements ISoundHandler
+{
+    
+    @Shadow abstract void loadSoundResource(ResourceLocation location, SoundList sounds);
+    
+    @Override
+    public void addSound(ResourceLocation sound, SoundList soundList)
+    {
+        this.loadSoundResource(sound, soundList);
+    }
+    
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.mixin;
  
 import java.util.Map;
@@ -14,10 +19,10 @@ import net.minecraft.tileentity.TileEntity;
 @Mixin(TileEntityRendererDispatcher.class)
 public abstract class MixinTileEntityRendererDispatcher implements ITileEntityRendererDispatcher
 {
-    @Shadow private Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> mapSpecialRenderers;
+    @Shadow private Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> mapSpecialRenderers;
  
     @Override
-    public Map<Class<? extends TileEntity>, TileEntitySpecialRenderer> getSpecialRenderMap()
+    public Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> getSpecialRenderMap()
     {
         return this.mapSpecialRenderers;
     }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.overlays;
  
 import net.minecraft.util.ResourceLocation;
  
-import com.mumfrey.liteloader.transformers.access.Accessor;
-import com.mumfrey.liteloader.transformers.access.Invoker;
-
 /**
  * Adapter for EntityRenderer to expose some private functionality
  *
  * @author Adam Mummery-Smith
  */
-@Accessor("EntityRenderer")
 public interface IEntityRenderer
 {
-    @Accessor("useShader") public abstract boolean getUseShader();
-    @Accessor("useShader") public abstract void setUseShader(boolean useShader);
+    public abstract boolean getUseShader();
+    public abstract void setUseShader(boolean useShader);
  
-    @Accessor("shaderResourceLocations") public abstract ResourceLocation[] getShaders();
+    public abstract ResourceLocation[] getShaders();
  
-    @Accessor("shaderIndex") public abstract int getShaderIndex();
-    @Accessor("shaderIndex") public abstract void setShaderIndex(int shaderIndex);
+    public abstract int getShaderIndex();
+    public abstract void setShaderIndex(int shaderIndex);
  
-    @Invoker("loadShader") public abstract void selectShader(ResourceLocation shader);
+    public abstract void selectShader(ResourceLocation shader);
  
-    @Invoker("getFOVModifier") public abstract float getFOV(float partialTicks, boolean armFOV);
+    public abstract float getFOV(float partialTicks, boolean armFOV);
  
-    @Invoker("setupCameraTransform") public abstract void setupCamera(float partialTicks, int pass);
+    public abstract void setupCamera(float partialTicks, int pass);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.overlays;
  
-import com.mumfrey.liteloader.transformers.access.Accessor;
-
 /**
  * Adapter for GuiTextField to expose internal properties, mainly to allow
  * sensible subclassing.
  * 
  * @author Adam Mummery-Smith
  */
-@Accessor("GuiTextField")
 public interface IGuiTextField
 {
-    @Accessor("#2")  public abstract int     getXPosition();
-    @Accessor("#2")  public abstract void    setXPosition(int xPosition);
-
-    @Accessor("#3")  public abstract int     getYPosition();
-    @Accessor("#3")  public abstract void    setYPosition(int yPosition);
-
-    @Accessor("#4")  public abstract int     getInternalWidth();
-    @Accessor("#4")  public abstract void    setInternalWidth(int width);
-
-    @Accessor("#5")  public abstract int     getHeight();
-    @Accessor("#5")  public abstract void    setHeight(int height);
-
-    @Accessor("#12") public abstract boolean isEnabled();
-//    @Accessor("#12") public abstract void    setEnabled(boolean enabled); // built in
-
-    @Accessor("#13") public abstract int     getLineScrollOffset();
-
-    @Accessor("#16") public abstract int     getTextColor();
-//    @Accessor("#16") public abstract void    setTextColor(int color); // built in
-
-    @Accessor("#17") public abstract int     getDisabledTextColour();
-//    @Accessor("#17") public abstract void    setDisabledTextColour(int color); // built in
+    public abstract int     getXPosition();
+    public abstract void    setXPosition(int xPosition);
+    public abstract int     getYPosition();
+    public abstract void    setYPosition(int yPosition);
+    public abstract int     getInternalWidth();
+    public abstract void    setInternalWidth(int width);
+    public abstract int     getHeight();
+    public abstract void    setHeight(int height);
+    public abstract boolean isEnabled();
+    public abstract int     getLineScrollOffset();
+    public abstract int     getTextColor();
+    public abstract int     getDisabledTextColour();
+    
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.overlays;
  
 import java.util.List;
@@ -5,48 +10,36 @@ import java.util.List;
 import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.util.Timer;
  
-import com.mumfrey.liteloader.core.runtime.Obf;
-import com.mumfrey.liteloader.transformers.access.Accessor;
-import com.mumfrey.liteloader.transformers.access.Invoker;
-import com.mumfrey.liteloader.transformers.access.ObfTableClass;
-
 /**
  * Interface containing injected accessors for Minecraft
  *
  * @author Adam Mummery-Smith
  */
-@ObfTableClass(Obf.class)
-@Accessor("Minecraft")
 public interface IMinecraft
 {
     /**
      * Get the timer instance
      */
-    @Accessor("timer")
     public abstract Timer getTimer();
  
     /**
      * Get the "running" flag
      */
-    @Accessor("running")
     public abstract boolean isRunning();
  
     /**
      * Get the default resource packs set
      */
-    @Accessor("defaultResourcePacks")
     public abstract List<IResourcePack> getDefaultResourcePacks();
  
     /**
      * Get the current server address (from connection)
      */
-    @Accessor("serverName")
     public abstract String getServerName();
  
     /**
      * Get the current server port (from connection)
      */
-    @Accessor("serverPort")
     public abstract int getServerPort();
  
     /**
@@ -55,6 +48,6 @@ public interface IMinecraft
      * @param width
      * @param height
      */
-    @Invoker("resize")
     public abstract void onResizeWindow(int width, int height);
+    
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.overlays;
  
 import net.minecraft.client.audio.SoundList;
 import net.minecraft.util.ResourceLocation;
  
-import com.mumfrey.liteloader.transformers.access.Accessor;
-import com.mumfrey.liteloader.transformers.access.Invoker;
-
-@Accessor("SoundHandler")
 public interface ISoundHandler
 {
-    @Invoker("loadSoundResource")
     public abstract void addSound(ResourceLocation sound, SoundList soundList);
 }
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.transformers;
  
 import java.util.ListIterator;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.transformers;
  
 import java.util.Iterator;
@@ -13,27 +18,19 @@ import org.objectweb.asm.tree.TypeInsnNode;
  
 import com.mumfrey.liteloader.core.runtime.Obf;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
-import com.mumfrey.liteloader.transformers.access.AccessorTransformer;
+import com.mumfrey.liteloader.transformers.ClassTransformer;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  
-public class MinecraftTransformer extends AccessorTransformer
+public class MinecraftTransformer extends ClassTransformer
 {
     private static final String TWEAKCLASS = LiteLoaderTweaker.class.getName().replace('.', '/');
-
-    @Override
-    protected void addAccessors()
-    {
-        this.addAccessor(Obf.IMinecraft.name);
-        this.addAccessor(Obf.IGuiTextField.name);
-        this.addAccessor(Obf.IEntityRenderer.name);
-        this.addAccessor(Obf.ISoundHandler.name);
-    }
-
+    
     @Override
-    protected void postTransform(String name, String transformedName, ClassNode classNode)
+    public byte[] transform(String name, String transformedName, byte[] basicClass)
     {
         if ((Obf.Minecraft.name.equals(transformedName) || Obf.Minecraft.obf.equals(transformedName)))
         {
+            ClassNode classNode = this.readClass(basicClass, true);
             for (MethodNode method : classNode.methods)
             {
                 if (Obf.startGame.obf.equals(method.name) || Obf.startGame.srg.equals(method.name) || Obf.startGame.name.equals(method.name))
@@ -41,9 +38,12 @@ public class MinecraftTransformer extends AccessorTransformer
                     this.transformStartGame(method);
                 }
             }
+            return this.writeClass(classNode);
         }
+        return basicClass;
     }
  
+
     private void transformStartGame(MethodNode method)
     {
         InsnList insns = new InsnList(); 
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.util;
  
 import java.util.Map;
@@ -19,4 +24,4 @@ public final class PrivateFieldsClient&lt;P, T&gt; extends PrivateFields&lt;P, T&gt;
  
     public static final PrivateFieldsClient<TileEntity, Map> tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityNameToClassMap);
     public static final PrivateFieldsClient<TileEntity, Map> tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityClassToNameMap);
-}
 \ No newline at end of file
+}
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.util.render;
  
 import com.mumfrey.liteloader.util.render.IconTextured;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.util.render;
  
-import net.minecraft.util.ResourceLocation;
-
 import com.mumfrey.liteloader.util.render.IconClickable;
  
+import net.minecraft.util.ResourceLocation;
+
 public abstract class IconAbsoluteClickable extends IconAbsolute implements IconClickable
 {
     public IconAbsoluteClickable(ResourceLocation textureResource, String displayText, int width, int height, float uCoord, float vCoord,
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.client.util.render;
  
 import com.mumfrey.liteloader.util.render.Icon;
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.gl;
  
 import java.nio.ByteBuffer;
@@ -5,12 +10,16 @@ import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
  
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.GlStateManager.TexGen;
-
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
  
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.GlStateManager.CullFace;
+import net.minecraft.client.renderer.GlStateManager.FogMode;
+import net.minecraft.client.renderer.GlStateManager.TexGen;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+
 /**
  * Convenience class for working with Mojang's GLStateManager:
  * 
@@ -42,6 +51,20 @@ import org.lwjgl.util.glu.GLU;
  */
 public class GL
 {
+    // Vertex Formats
+    public static final VertexFormat VF_BLOCK = DefaultVertexFormats.BLOCK;
+    public static final VertexFormat VF_ITEM = DefaultVertexFormats.ITEM;
+    public static final VertexFormat VF_OLDMODEL_POSITION_TEX_NORMAL = DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL;
+    public static final VertexFormat VF_PARTICLE_POSITION_TEX_COLOR_LMAP = DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP;
+    public static final VertexFormat VF_POSITION = DefaultVertexFormats.POSITION;
+    public static final VertexFormat VF_POSITION_COLOR = DefaultVertexFormats.POSITION_COLOR;
+    public static final VertexFormat VF_POSITION_TEX = DefaultVertexFormats.POSITION_TEX;
+    public static final VertexFormat VF_POSITION_NORMAL = DefaultVertexFormats.POSITION_NORMAL;
+    public static final VertexFormat VF_POSITION_TEX_COLOR = DefaultVertexFormats.POSITION_TEX_COLOR;
+    public static final VertexFormat VF_POSITION_TEX_NORMAL = DefaultVertexFormats.POSITION_TEX_NORMAL;
+    public static final VertexFormat VF_POSITION_TEX_LMAP_COLOR = DefaultVertexFormats.POSITION_TEX_LMAP_COLOR;
+    public static final VertexFormat VF_POSITION_TEX_COLOR_NORMAL = DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL;
+    
     // GL11
     public static final int GL_ACCUM = 0x100;
     public static final int GL_LOAD = 0x101;
@@ -855,12 +878,12 @@ public class GL
  
     public static void glEnableLight(int light)
     {
-        GlStateManager.enableLight(light); // TODO OBF MCPTEST enableBooleanStateAt - enableLight
+        GlStateManager.enableLight(light);
     }
  
     public static void glDisableLight(int light)
     {
-        GlStateManager.disableLight(light); // TODO OBF MCPTEST disableBooleanStateAt - disableLight
+        GlStateManager.disableLight(light);
     }
  
     public static void glLight(int light, int pname, FloatBuffer params)
@@ -943,7 +966,7 @@ public class GL
         GlStateManager.disableFog();
     }
  
-    public static void glSetFogMode(int mode)
+    public static void glSetFogMode(FogMode mode)
     {
         GlStateManager.setFog(mode);
     }
@@ -988,7 +1011,7 @@ public class GL
         GlStateManager.disableCull();
     }
  
-    public static void glCullFace(int mode)
+    public static void glCullFace(CullFace mode)
     {
         GlStateManager.cullFace(mode);
     }
@@ -1040,7 +1063,7 @@ public class GL
  
     public static void glTexGen(TexGen tex, int pname, FloatBuffer params)
     {
-        GlStateManager.func_179105_a(tex, pname, params);
+        GlStateManager.texGen(tex, pname, params);
     }
  
     public static void glSetActiveTextureUnit(int texture)
@@ -1050,27 +1073,27 @@ public class GL
  
     public static void glEnableTexture2D()
     {
-        GlStateManager.enableTexture2D(); // TODO OBF MCPTEST func_179098_w - enableTexture2D
+        GlStateManager.enableTexture2D();
     }
  
     public static void glDisableTexture2D()
     {
-        GlStateManager.disableTexture2D(); // TODO OBF MCPTEST func_179090_x - disableTexture2D
+        GlStateManager.disableTexture2D();
     }
  
     public static int glGenTextures()
     {
-        return GlStateManager.generateTexture(); // TODO OBF MCPTEST func_179146_y - generateTexture
+        return GlStateManager.generateTexture();
     }
  
     public static void glDeleteTextures(int textureName)
     {
-        GlStateManager.deleteTexture(textureName); // TODO OBF MCPTEST func_179150_h - deleteTexture
+        GlStateManager.deleteTexture(textureName);
     }
  
     public static void glBindTexture2D(int textureName)
     {
-        GlStateManager.bindTexture(textureName); // TODO OBF MCPTEST func_179144_i - bindTexture
+        GlStateManager.bindTexture(textureName);
     }
  
     public static void glEnableNormalize()
+/*
+ * This file is part of LiteLoader.
+ * Copyright (C) 2012-16 Adam Mummery-Smith
+ * All Rights Reserved.
+ */
 package com.mumfrey.liteloader.gl;
  
 import static org.lwjgl.opengl.GL11.*;