Remove legacy proxy objects and move all logic into relevant mixins

Mumfrey
1 parent af8f47e8
Showing 18 changed files with 191 additions and 474 deletions
src/client/java/com/mumfrey/liteloader/client/ClientProxy.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityPlayerSP.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityRenderer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinFramebuffer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinGuiIngame.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinIntegratedServer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRenderManager.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinScreenShotHelper.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinMinecraftServer.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinNetHandlerPlayServer.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerInteractionManager.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerList.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
src/main/java/com/mumfrey/liteloader/core/Proxy.java
src/main/java/com/mumfrey/liteloader/crashreport/CrashSectionLaunchWrapper.java
-/*
- * 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
-import com.mumfrey.liteloader.client.ducks.IFramebuffer;
-import com.mumfrey.liteloader.core.Proxy;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiNewChat;
-import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.entity.Render;
-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.text.ITextComponent;
-import net.minecraft.world.WorldSettings;
-
-/**
- * Proxy class which handles the redirected calls from the injected callbacks
- * and routes them to the relevant liteloader handler classes. We do this rather
- * than patching a bunch of bytecode into the packet classes themselves because
- * this is easier to maintain.
- * 
- * @author Adam Mummery-Smith
- */
-public abstract class ClientProxy extends Proxy
-{
-    private static LiteLoaderEventBrokerClient broker;
-
-    private ClientProxy() {}
-
-    public static void onStartupComplete()
-    {
-        Proxy.onStartupComplete();
-
-        ClientProxy.broker = LiteLoaderEventBrokerClient.getInstance();
-
-        if (ClientProxy.broker == null)
-        {
-            throw new RuntimeException("LiteLoader failed to start up properly."
-                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
-        }
-
-        ClientProxy.broker.onStartupComplete();
-    }
-
-    public static void onTimerUpdate()
-    {
-        ClientProxy.broker.onTimerUpdate();
-    }
-
-    public static void newTick()
-    {
-    }
-
-    public static void onTick()
-    {
-        ClientProxy.broker.onTick();
-    }
-
-    public static void onRender()
-    {
-        ClientProxy.broker.onRender();
-    }
-
-    public static void preRenderGUI(float partialTicks)
-    {
-        ClientProxy.broker.preRenderGUI(partialTicks);
-    }
-
-    public static void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.onSetupCameraTransform(pass, partialTicks, timeSlice);
-    }
-
-    public static void postRenderEntities(int pass, float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.postRenderEntities(partialTicks, timeSlice);
-    }
-
-    public static void postRender(float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.postRender(partialTicks, timeSlice);
-    }
-
-    public static void onRenderHUD(float partialTicks)
-    {
-        ClientProxy.broker.onRenderHUD(partialTicks);
-    }
-
-    public static void onRenderChat(GuiNewChat chatGui, float partialTicks)
-    {
-        ClientProxy.broker.onRenderChat(chatGui, partialTicks);
-    }
-
-    public static void postRenderChat(GuiNewChat chatGui, float partialTicks)
-    {
-        ClientProxy.broker.postRenderChat(chatGui, partialTicks);
-    }
-
-    public static void postRenderHUD(float partialTicks)
-    {
-        ClientProxy.broker.postRenderHUD(partialTicks);
-    }
-
-    public static void onCreateIntegratedServer(IntegratedServer server, String folderName, String worldName, WorldSettings worldSettings)
-    {
-        ClientProxy.broker.onStartServer(server, folderName, worldName, worldSettings);
-    }
-
-    public static void onOutboundChat(CallbackInfo e, String message)
-    {
-        ClientProxy.broker.onSendChatMessage(e, message);
-    }
-
-    public static void onResize(Minecraft mc)
-    {
-        if (ClientProxy.broker == null) return;
-        ClientProxy.broker.onResize(mc);
-    }
-
-    public static void preRenderFBO(Framebuffer frameBufferMc)
-    {
-        if (ClientProxy.broker == null) return;
-        if (frameBufferMc instanceof IFramebuffer)
-        {
-            ((IFramebuffer)frameBufferMc).setDispatchRenderEvent(true);            
-        }
-        ClientProxy.broker.preRenderFBO(frameBufferMc);
-    }
-
-    public static void postRenderFBO(Framebuffer frameBufferMc)
-    {
-        if (ClientProxy.broker == null) return;
-        ClientProxy.broker.postRenderFBO(frameBufferMc);
-    }
-
-    public static void renderFBO(Framebuffer frameBufferMc, int width, int height, boolean flag)
-    {
-        if (ClientProxy.broker == null) return;
-        ClientProxy.broker.onRenderFBO(frameBufferMc, width, height);
-    }
-
-    public static void onRenderWorld(float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.onRenderWorld(partialTicks, timeSlice);
-    }
-
-    public static void onRenderSky(int pass, float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.onRenderSky(partialTicks, pass, timeSlice);
-    }
-
-    public static void onRenderClouds(RenderGlobal renderGlobalIn, float partialTicks, int pass)
-    {
-        ClientProxy.broker.onRenderClouds(partialTicks, pass, renderGlobalIn);
-    }
-
-    public static void onRenderTerrain(int pass, float partialTicks, long timeSlice)
-    {
-        ClientProxy.broker.onRenderTerrain(partialTicks, pass, timeSlice);
-    }
-
-    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 <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 <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);
-    }
-
-    public static boolean onClickMouse(EntityPlayerSP player, MouseButton button)
-    {
-        return ClientProxy.broker.onClickMouse(player, button);
-    }
-
-    public static boolean onMouseHeld(EntityPlayerSP player, MouseButton button)
-    {
-        return ClientProxy.broker.onMouseHeld(player, button);
-    }
-}
@@ -286,7 +286,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * Late initialisation callback
      */
     @Override
-    protected void onStartupComplete()
+    public void onStartupComplete()
     {
         this.engine.getResources().refreshResources(false);
@@ -328,7 +328,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback from the tick hook, pre render
      */
-    void onRender()
+    public void onRender()
     {
         this.renderListeners.all().onRender();
     }
@@ -339,7 +339,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param partialTicks
      * @param timeSlice 
      */
-    void postRenderEntities(float partialTicks, long timeSlice)
+    public void postRenderEntities(float partialTicks, long timeSlice)
     {
         this.postRenderListeners.all().onPostRenderEntities(partialTicks);
     }
@@ -350,7 +350,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param partialTicks 
      * @param timeSlice 
      */
-    void postRender(float partialTicks, long timeSlice)
+    public void postRender(float partialTicks, long timeSlice)
     {
         ((IEntityRenderer)this.engineClient.getClient().entityRenderer).setupCamera(partialTicks, 0);
         this.postRenderListeners.all().onPostRender(partialTicks);
@@ -359,7 +359,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Called immediately before the current GUI is rendered
      */
-    void preRenderGUI(float partialTicks)
+    public void preRenderGUI(float partialTicks)
     {
         this.renderListeners.all().onRenderGui(this.engineClient.getCurrentScreen());
     }
@@ -371,7 +371,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param timeSlice 
      * @param partialTicks 
      */
-    void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
+    public void onSetupCameraTransform(int pass, float partialTicks, long timeSlice)
     {
         this.renderListeners.all().onSetupCameraTransform();
         this.preRenderListeners.all().onSetupCameraTransform(partialTicks, pass, timeSlice);
@@ -383,7 +383,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param chatGui 
      * @param partialTicks 
      */
-    void onRenderChat(GuiNewChat chatGui, float partialTicks)
+    public void onRenderChat(GuiNewChat chatGui, float partialTicks)
     {
         this.chatRenderListeners.all().onPreRenderChat(this.screenWidth, this.screenHeight, chatGui);
     }
@@ -394,7 +394,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param chatGui 
      * @param partialTicks 
      */
-    void postRenderChat(GuiNewChat chatGui, float partialTicks)
+    public void postRenderChat(GuiNewChat chatGui, float partialTicks)
     {
         this.chatRenderListeners.all().onPostRenderChat(this.screenWidth, this.screenHeight, chatGui);
     }
@@ -402,7 +402,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback when about to render the HUD
      */
-    void onRenderHUD(float partialTicks)
+    public void onRenderHUD(float partialTicks)
     {
         this.hudRenderListeners.all().onPreRenderHUD(this.screenWidth, this.screenHeight);
     }
@@ -410,7 +410,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback when the HUD has just been rendered
      */
-    void postRenderHUD(float partialTicks)
+    public void postRenderHUD(float partialTicks)
     {
         this.hudRenderListeners.all().onPostRenderHUD(this.screenWidth, this.screenHeight);
     }
@@ -418,7 +418,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback from the tick hook, called every frame when the timer is updated
      */
-    void onTimerUpdate()
+    public void onTimerUpdate()
     {
         Minecraft minecraft = this.engine.getClient();
         this.loopListeners.all().onRunGameLoop(minecraft);
@@ -427,7 +427,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * Callback from the tick hook, ticks all tickable mods
      */
-    void onTick()
+    public void onTick()
     {
         this.profiler.endStartSection("litemods");
@@ -474,7 +474,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * @param message
      */
-    void onSendChatMessage(CallbackInfo e, String message)
+    public void onSendChatMessage(CallbackInfo e, String message)
     {
         if (!this.outboundChatFilters.all().onSendChatMessage(message))
         {
@@ -485,7 +485,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * @param framebuffer
      */
-    void preRenderFBO(Framebuffer framebuffer)
+    public void preRenderFBO(Framebuffer framebuffer)
     {
         this.frameBufferListeners.all().preRenderFBO(framebuffer);
     }
@@ -495,7 +495,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param width
      * @param height
      */
-    void onRenderFBO(Framebuffer framebuffer, int width, int height)
+    public void onRenderFBO(Framebuffer framebuffer, int width, int height)
     {
         this.frameBufferListeners.all().onRenderFBO(framebuffer, width, height);
     }
@@ -503,7 +503,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
     /**
      * @param framebuffer
      */
-    void postRenderFBO(Framebuffer framebuffer)
+    public void postRenderFBO(Framebuffer framebuffer)
     {
         this.frameBufferListeners.all().postRenderFBO(framebuffer);
     }
@@ -512,7 +512,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param partialTicks
      * @param timeSlice
      */
-    void onRenderWorld(float partialTicks, long timeSlice)
+    public void onRenderWorld(float partialTicks, long timeSlice)
     {
         this.preRenderListeners.all().onRenderWorld(partialTicks);
     }
@@ -522,7 +522,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param pass
      * @param timeSlice
      */
-    void onRenderSky(float partialTicks, int pass, long timeSlice)
+    public void onRenderSky(float partialTicks, int pass, long timeSlice)
     {
         this.preRenderListeners.all().onRenderSky(partialTicks, pass);
     }
@@ -532,7 +532,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param pass
      * @param renderGlobal
      */
-    void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal)
+    public void onRenderClouds(float partialTicks, int pass, RenderGlobal renderGlobal)
     {
         this.preRenderListeners.all().onRenderClouds(partialTicks, pass, renderGlobal);
     }
@@ -542,7 +542,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param pass
      * @param timeSlice
      */
-    void onRenderTerrain(float partialTicks, int pass, long timeSlice)
+    public void onRenderTerrain(float partialTicks, int pass, long timeSlice)
     {
         this.preRenderListeners.all().onRenderTerrain(partialTicks, pass);
     }
@@ -554,7 +554,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker&lt;Minecraft
      * @param height
      * @param fbo
      */
-    void onScreenshot(CallbackInfoReturnable<ITextComponent> ci, String name, int width, int height, Framebuffer fbo)
+    public void onScreenshot(CallbackInfoReturnable<ITextComponent> ci, String name, int width, int height, Framebuffer fbo)
     {
         ReturnValue<ITextComponent> ret = new ReturnValue<ITextComponent>(ci.getReturnValue());
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 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.LiteLoaderEventBrokerClient;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.entity.EntityPlayerSP;
@@ -26,6 +26,6 @@ public abstract class MixinEntityPlayerSP extends AbstractClientPlayer
     @Inject(method = "sendChatMessage(Ljava/lang/String;)V", at = { @At("HEAD") }, cancellable = true)
     public void onSendChatMessage(String message, CallbackInfo ci)
     {
-        ClientProxy.onOutboundChat(ci, message);
+        LiteLoaderEventBrokerClient.getInstance().onSendChatMessage(ci, message);
     }
 }
@@ -13,7 +13,7 @@ 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.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.overlays.IEntityRenderer;
 import net.minecraft.client.renderer.EntityRenderer;
@@ -33,6 +33,8 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     @Shadow abstract float getFOVModifier(float partialTicks, boolean useFOVSetting);
     @Shadow abstract void setupCameraTransform(float partialTicks, int pass);
+    private LiteLoaderEventBrokerClient broker = LiteLoaderEventBrokerClient.getInstance();
+    
     @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
         value = "INVOKE",
         shift = Shift.AFTER,
@@ -40,7 +42,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onPreRenderGUI(float partialTicks, long nanoTime, CallbackInfo ci)
     {
-        ClientProxy.preRenderGUI(partialTicks);
+        this.broker.preRenderGUI(partialTicks);
     }
     @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
@@ -49,7 +51,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onRenderHUD(float partialTicks, long nanoTime, CallbackInfo ci)
     {
-        ClientProxy.onRenderHUD(partialTicks);
+        this.broker.onRenderHUD(partialTicks);
     }
     @Inject(method = "updateCameraAndRender(FJ)V", at = @At(
@@ -59,7 +61,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onPostRenderHUD(float partialTicks, long nanoTime, CallbackInfo ci)
     {
-        ClientProxy.postRenderHUD(partialTicks);
+        this.broker.postRenderHUD(partialTicks);
     }
     @Inject(method = "renderWorld(FJ)V", at = @At(
@@ -69,7 +71,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onRenderWorld(float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.onRenderWorld(partialTicks, timeSlice);
+        this.broker.onRenderWorld(partialTicks, timeSlice);
     }
     @Inject(method = "renderWorld(FJ)V", at = @At(
@@ -79,7 +81,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onPostRender(float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.postRender(partialTicks, timeSlice);
+        this.broker.postRender(partialTicks, timeSlice);
     }
     @Inject(method = "renderWorldPass(IFJ)V", at = @At(
@@ -89,7 +91,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onSetupCameraTransform(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.onSetupCameraTransform(pass, partialTicks, timeSlice);
+        this.broker.onSetupCameraTransform(pass, partialTicks, timeSlice);
     }
     @Inject(method = "renderWorldPass(IFJ)V", at = @At(
@@ -99,7 +101,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onRenderSky(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.onRenderSky(pass, partialTicks, timeSlice);
+        this.broker.onRenderSky(partialTicks, pass, timeSlice);
     }
     @Inject(method = "renderWorldPass(IFJ)V", at = @At(
@@ -109,8 +111,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onRenderTerrain(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.onRenderTerrain(pass, partialTicks, timeSlice);
-        
+        this.broker.onRenderTerrain(partialTicks, pass, timeSlice);
     }
     @Inject(method = "renderWorldPass(IFJ)V", at = @At(
@@ -120,7 +121,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onPostRenderEntities(int pass, float partialTicks, long timeSlice, CallbackInfo ci)
     {
-        ClientProxy.postRenderEntities(pass, partialTicks, timeSlice);
+        this.broker.postRenderEntities(partialTicks, timeSlice);
     }
     @Inject(method = "renderCloudsCheck(Lnet/minecraft/client/renderer/RenderGlobal;FIDDD)V", at = @At(
@@ -129,7 +130,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
     ))
     private void onRenderClouds(RenderGlobal renderGlobalIn, float partialTicks, int pass, double x, double y, double z, CallbackInfo ci)
     {
-        ClientProxy.onRenderClouds(renderGlobalIn, partialTicks, pass);
+        this.broker.onRenderClouds(partialTicks, pass, renderGlobalIn);
     }
     @Override
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.At;
 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.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ducks.IFramebuffer;
 import net.minecraft.client.shader.Framebuffer;
@@ -18,6 +18,8 @@ import net.minecraft.client.shader.Framebuffer;
 @Mixin(Framebuffer.class)
 public abstract class MixinFramebuffer implements IFramebuffer
 {
+    private LiteLoaderEventBrokerClient broker;
+    
     private boolean dispatchRenderEvent;
     @Override
@@ -39,10 +41,15 @@ public abstract class MixinFramebuffer implements IFramebuffer
     ))
     private void onRenderFBO(int width, int height, boolean flag, CallbackInfo ci)
     {
-        if (this.dispatchRenderEvent)
+        if (this.broker == null)
+        {
+            this.broker = LiteLoaderEventBrokerClient.getInstance();
+        }
+        
+        if (this.dispatchRenderEvent && this.broker != null)
         {
-            ClientProxy.renderFBO((Framebuffer)(Object)this, width, height, flag);
-            this.dispatchRenderEvent = false;
+            this.broker.onRenderFBO((Framebuffer)(Object)this, width, height);
         }
+        this.dispatchRenderEvent = false;
     }
 }
@@ -13,7 +13,7 @@ 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.LiteLoaderEventBrokerClient;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiIngame;
@@ -24,13 +24,15 @@ public abstract class MixinGuiIngame extends Gui
 {
     @Shadow @Final private GuiNewChat persistantChatGUI;
+    private LiteLoaderEventBrokerClient broker = LiteLoaderEventBrokerClient.getInstance();
+    
     @Inject(method = "renderGameOverlay(F)V", at = @At(
         value = "INVOKE",
         target = "Lnet/minecraft/client/gui/GuiNewChat;drawChat(I)V"
     ))
     private void onRenderChat(float partialTicks, CallbackInfo ci)
     {
-        ClientProxy.onRenderChat(this.persistantChatGUI, partialTicks);
+        this.broker.onRenderChat(this.persistantChatGUI, partialTicks);
     }
     @Inject(method = "renderGameOverlay(F)V", at = @At(
@@ -40,6 +42,6 @@ public abstract class MixinGuiIngame extends Gui
     ))
     private void postRenderChat(float partialTicks, CallbackInfo ci)
     {
-        ClientProxy.postRenderChat(this.persistantChatGUI, partialTicks);
+        this.broker.postRenderChat(this.persistantChatGUI, partialTicks);
     }
 }
@@ -14,7 +14,7 @@ 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 com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.server.MinecraftServer;
@@ -25,6 +25,8 @@ import net.minecraft.world.WorldSettings;
 @Mixin(IntegratedServer.class)
 public abstract class MixinIntegratedServer extends MinecraftServer
 {
+    private LiteLoaderEventBrokerClient broker = LiteLoaderEventBrokerClient.getInstance();
+    
     public MixinIntegratedServer()
     {
         super(null, null, null, null, null, null, null);
@@ -38,7 +40,7 @@ public abstract class MixinIntegratedServer extends MinecraftServer
     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.broker.onStartServer(this, folderName, worldName, settings);
     }
     @Surrogate
@@ -17,7 +17,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton;
-import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
+import com.mumfrey.liteloader.client.ducks.IFramebuffer;
 import com.mumfrey.liteloader.client.overlays.IMinecraft;
 import net.minecraft.client.Minecraft;
@@ -40,22 +41,35 @@ public abstract class MixinMinecraft implements IMinecraft
     @Shadow private void rightClickMouse() {}
     @Shadow private void middleClickMouse() {}
+    private LiteLoaderEventBrokerClient broker;
+    
     @Inject(method = "init()V", at = @At("RETURN"))
     private void onStartupComplete(CallbackInfo ci)
     {
-        ClientProxy.onStartupComplete();
+        this.broker = LiteLoaderEventBrokerClient.getInstance();
+
+        if (this.broker == null)
+        {
+            throw new RuntimeException("LiteLoader failed to start up properly."
+                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
+        }
+
+        this.broker.onStartupComplete();
     }
     @Inject(method = "updateFramebufferSize()V", at = @At("HEAD"))
     private void onResize(CallbackInfo ci)
     {
-        ClientProxy.onResize((Minecraft)(Object)this);
+        if (this.broker != null)
+        {
+            this.broker.onResize((Minecraft)(Object)this);
+        }
     }
     @Inject(method = "runTick()V", at = @At("HEAD"))
     private void newTick(CallbackInfo ci)
     {
-        ClientProxy.newTick();
+//        ClientProxy.newTick();
     }
     @Inject(method = "runGameLoop()V", at = @At(
@@ -65,7 +79,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onTick(CallbackInfo ci)
     {
-        ClientProxy.onTick();
+        this.broker.onTick();
     }
     @Redirect(method = "runGameLoop()V", at = @At(
@@ -75,11 +89,17 @@ public abstract class MixinMinecraft implements IMinecraft
     private void renderFBO(Framebuffer framebufferMc, int width, int height)
     {
         boolean fboEnabled = OpenGlHelper.isFramebufferEnabled();
-        if (fboEnabled)
+        if (fboEnabled && this.broker != null)
         {
-            ClientProxy.preRenderFBO(framebufferMc);
+            if (framebufferMc instanceof IFramebuffer)
+            {
+                ((IFramebuffer)framebufferMc).setDispatchRenderEvent(true);            
+            }
+            this.broker.preRenderFBO(framebufferMc);
+            
             framebufferMc.framebufferRender(width, height);
-            ClientProxy.preRenderFBO(framebufferMc);
+            
+            this.broker.postRenderFBO(framebufferMc);
         }
         else
         {
@@ -94,7 +114,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onTimerUpdate(CallbackInfo ci)
     {
-        ClientProxy.onTimerUpdate();
+        this.broker.onTimerUpdate();
     }
     @Inject(method = "runGameLoop()V", at = @At(
@@ -104,7 +124,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onRender(CallbackInfo ci)
     {
-        ClientProxy.onRender();
+        this.broker.onRender();
     }
     @Redirect(method = "processKeyBinds()V", at = @At(
@@ -113,7 +133,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onClickMouse(Minecraft self)
     {
-        if (ClientProxy.onClickMouse(self.player, MouseButton.LEFT))
+        if (this.broker.onClickMouse(self.player, MouseButton.LEFT))
         {
             this.clickMouse();
         }
@@ -128,7 +148,7 @@ public abstract class MixinMinecraft implements IMinecraft
     )
     private void onMouseHeld(boolean leftClick, CallbackInfo ci)
     {
-        if (!ClientProxy.onMouseHeld(((Minecraft)(Object)this).player, MouseButton.LEFT))
+        if (!this.broker.onMouseHeld(((Minecraft)(Object)this).player, MouseButton.LEFT))
         {
             ci.cancel();
         }
@@ -141,7 +161,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onRightClickMouse(Minecraft self)
     {
-        if (ClientProxy.onClickMouse(self.player, MouseButton.RIGHT))
+        if (this.broker.onClickMouse(self.player, MouseButton.RIGHT))
         {
             this.rightClickMouse();
         }
@@ -154,7 +174,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onRightMouseHeld(Minecraft self)
     {
-        if (ClientProxy.onMouseHeld(self.player, MouseButton.RIGHT))
+        if (this.broker.onMouseHeld(self.player, MouseButton.RIGHT))
         {
             this.rightClickMouse();
         }
@@ -166,7 +186,7 @@ public abstract class MixinMinecraft implements IMinecraft
     ))
     private void onMiddleClickMouse(Minecraft self)
     {
-        if (ClientProxy.onClickMouse(self.player, MouseButton.MIDDLE))
+        if (this.broker.onClickMouse(self.player, MouseButton.MIDDLE))
         {
             this.middleClickMouse();
         }
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import com.mumfrey.liteloader.client.ducks.IRenderManager;
 import net.minecraft.client.renderer.entity.Render;
@@ -25,6 +25,8 @@ public abstract class MixinRenderManager implements IRenderManager
 {
     @Shadow @Final private Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap;
+    private LiteLoaderEventBrokerClient broker;
+    
     @Override
     public Map<Class<? extends Entity>, Render<? extends Entity>> getRenderMap()
     {
@@ -37,9 +39,13 @@ public abstract class MixinRenderManager implements IRenderManager
     ))
     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);
+        if (this.broker == null)
+        {
+            this.broker = LiteLoaderEventBrokerClient.getInstance();
+        }
+
+        this.broker.onRenderEntity((RenderManager)(Object)this, entity, x, y, z, entityYaw, partialTicks, render);
         render.doRender(entity, x, y, z, entityYaw, partialTicks);
-        ClientProxy.onPostRenderEntity(source, render, entity, x, y, z, entityYaw, partialTicks);
+        this.broker.onPostRenderEntity((RenderManager)(Object)this, entity, x, y, z, entityYaw, partialTicks, render);
     }
 }
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.mumfrey.liteloader.client.ClientProxy;
+import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.util.ScreenShotHelper;
@@ -34,6 +34,6 @@ public abstract class MixinScreenShotHelper
     )
     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);
+        LiteLoaderEventBrokerClient.getInstance().onScreenshot(ci, name, width, height, fbo);
     }
 }
@@ -10,16 +10,18 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import com.mumfrey.liteloader.core.Proxy;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import net.minecraft.server.MinecraftServer;
 @Mixin(MinecraftServer.class)
 public abstract class MixinMinecraftServer
 {
+    LiteLoaderEventBroker<?, ?> broker = LiteLoaderEventBroker.getCommonBroker();
+    
     @Inject(method = "updateTimeLightAndEntities()V", at = @At("HEAD"))
     private void onServerTick(CallbackInfo ci)
     {
-        Proxy.onServerTick((MinecraftServer)(Object)this);
+        this.broker.onServerTick((MinecraftServer)(Object)this);
     }
 }
@@ -15,12 +15,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import com.mumfrey.liteloader.common.ducks.ITeleportHandler;
-import com.mumfrey.liteloader.core.Proxy;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.play.client.CPacketAnimation;
 import net.minecraft.network.play.client.CPacketPlayer;
 import net.minecraft.network.play.client.CPacketPlayerDigging;
+import net.minecraft.network.play.client.CPacketPlayerDigging.Action;
 import net.minecraft.network.play.client.CPacketPlayerTryUseItem;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.WorldServer;
@@ -30,6 +33,9 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
 {
     @Shadow private int teleportId;
     @Shadow private Vec3d targetPos;
+    @Shadow public EntityPlayerMP playerEntity;;
+    
+    LiteLoaderEventBroker<?, ?> broker = LiteLoaderEventBroker.getCommonBroker();
     @Inject(
         method = "processTryUseItem(Lnet/minecraft/network/play/client/CPacketPlayerTryUseItem;)V",
@@ -43,7 +49,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
     )
     private void onPlaceBlock(CPacketPlayerTryUseItem packetIn, CallbackInfo ci)
     {
-        Proxy.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+//        this.onPlaceBlock(ci, (NetHandlerPlayServer)(Object)this, packetIn);
     }
     @Inject(
@@ -58,7 +64,10 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
     )
     private void onClickedAir(CPacketAnimation packetIn, CallbackInfo ci)
     {
-        Proxy.onClickedAir(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+        if (!this.broker.onClickedAir(InteractType.LEFT_CLICK, ((NetHandlerPlayServer)(Object)this).playerEntity, packetIn.getHand()))
+        {
+            ci.cancel();
+        }
     }
     @Inject(
@@ -73,7 +82,26 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
     )
     private void onPlayerDigging(CPacketPlayerDigging packetIn, CallbackInfo ci)
     {
-        Proxy.onPlayerDigging(ci, (NetHandlerPlayServer)(Object)this, packetIn);
+        NetHandlerPlayServer netHandler = (NetHandlerPlayServer)(Object)this;
+        Action action = packetIn.getAction();
+        if (action == Action.START_DESTROY_BLOCK)
+        {
+            if (!this.broker.onPlayerDigging(InteractType.DIG_BLOCK_MAYBE, this.playerEntity, netHandler, packetIn.getPosition()))
+            {
+                ci.cancel();
+            }
+        }
+        else if (action == Action.ABORT_DESTROY_BLOCK || action == Action.STOP_DESTROY_BLOCK)
+        {
+            this.broker.onPlayerDigging(InteractType.DIG_BLOCK_END, this.playerEntity, netHandler, packetIn.getPosition());
+        }
+        else if (action == Action.SWAP_HELD_ITEMS)
+        {
+            if (!this.broker.onPlayerSwapItems(this.playerEntity))
+            {
+                ci.cancel();
+            }
+        }
     }
     @Inject(
@@ -89,7 +117,10 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
     )
     private void onPlayerMoved(CPacketPlayer packetIn, CallbackInfo ci, WorldServer world)
     {
-        Proxy.onPlayerMoved(ci, (NetHandlerPlayServer)(Object)this, packetIn, world);
+        if (!this.broker.onPlayerMove((NetHandlerPlayServer)(Object)this, packetIn, this.playerEntity, world))
+        {
+            ci.cancel();
+        }
     }
     @Override
@@ -11,9 +11,11 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.mumfrey.liteloader.core.Proxy;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.management.PlayerInteractionManager;
 import net.minecraft.util.EnumActionResult;
@@ -25,6 +27,8 @@ import net.minecraft.world.World;
 @Mixin(value = PlayerInteractionManager.class, priority = 2000)
 public abstract class MixinPlayerInteractionManager
 {
+    LiteLoaderEventBroker<?, ?> broker = LiteLoaderEventBroker.getCommonBroker();
+
     @Inject(
         method = "onBlockClicked(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)V",
         cancellable = true,
@@ -32,7 +36,10 @@ public abstract class MixinPlayerInteractionManager
     )
     private void onBlockClicked(BlockPos pos, EnumFacing side, CallbackInfo ci)
     {
-        Proxy.onBlockClicked(ci, (PlayerInteractionManager)(Object)this, pos, side);
+        if (!this.broker.onBlockClicked(pos, side, (PlayerInteractionManager)(Object)this))
+        {
+            ci.cancel();
+        }
     }
     @Inject(
@@ -45,7 +52,15 @@ public abstract class MixinPlayerInteractionManager
     private void onRightClickBlock(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, BlockPos pos, EnumFacing side,
             float offsetX, float offsetY, float offsetZ, CallbackInfoReturnable<EnumActionResult> cir)
     {
-        Proxy.onRightClickBlock(cir, player, worldIn, stack, hand, pos, side, offsetX, offsetY, offsetZ);
+        if (!(player instanceof EntityPlayerMP))
+        {
+            return;
+        }
+
+        if (!this.broker.onUseItem((EntityPlayerMP)player, hand, stack, pos, side))
+        {
+            cir.setReturnValue(EnumActionResult.FAIL);
+        }
     }
 //    @Inject(
@@ -58,7 +73,12 @@ public abstract class MixinPlayerInteractionManager
 //    private void postRightClickBlock(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, BlockPos pos, EnumFacing side,
 //            float offsetX, float offsetY, float offsetZ, CallbackInfoReturnable<EnumActionResult> cir)
 //    {
-//        Proxy.postRightClickBlock(cir, player, worldIn, stack, hand, pos, side, offsetX, offsetY, offsetZ);
+//        if (!(player instanceof EntityPlayerMP))
+//        {
+//            return;
+//        }
+//        
+//        System.err.printf("@@ postRightClickBlock: %s\n", cir.getReturnValue());
 //    }
     @Inject(
@@ -69,6 +89,14 @@ public abstract class MixinPlayerInteractionManager
             )
     private void onRightClick(EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand, CallbackInfoReturnable<EnumActionResult> cir)
     {
-        Proxy.onRightClick(cir, player, worldIn, stack, hand);
+        if (!(player instanceof EntityPlayerMP))
+        {
+            return;
+        }
+
+        if (!this.broker.onClickedAir(InteractType.RIGHT_CLICK, (EntityPlayerMP)player, hand))
+        {
+            cir.setReturnValue(EnumActionResult.FAIL);
+        }
     }
 }
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.core.Proxy;
+import com.mumfrey.liteloader.core.LiteLoaderEventBroker;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.NetHandlerPlayServer;
@@ -29,26 +29,26 @@ public abstract class MixinPlayerList
     )
     private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
+        LiteLoaderEventBroker.getCommonBroker().onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
     }
     // Because, forge
     @Surrogate
     private void onInitializePlayerConnection(NetworkManager netManager, EntityPlayerMP player, NetHandlerPlayServer nhps, CallbackInfo ci)
     {
-        Proxy.onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
+        LiteLoaderEventBroker.getCommonBroker().onInitializePlayerConnection((PlayerList)(Object)this, netManager, player);
     }
     @Inject(method = "playerLoggedIn(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
     private void onPlayerLogin(EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onPlayerLogin((PlayerList)(Object)this, player);
+        LiteLoaderEventBroker.getCommonBroker().onPlayerLogin((PlayerList)(Object)this, player);
     }
     @Inject(method = "playerLoggedOut(Lnet/minecraft/entity/player/EntityPlayerMP;)V", at = @At("RETURN"))
     private void onPlayerLogout(EntityPlayerMP player, CallbackInfo ci)
     {
-        Proxy.onPlayerLogout((PlayerList)(Object)this, player);
+        LiteLoaderEventBroker.getCommonBroker().onPlayerLogout((PlayerList)(Object)this, player);
     }
     @Inject(
@@ -58,7 +58,7 @@ public abstract class MixinPlayerList
     )
     private void onSpawnPlayer(GameProfile profile, CallbackInfoReturnable<EntityPlayerMP> cir)
     {
-        Proxy.onSpawnPlayer(cir, (PlayerList)(Object)this, profile);
+        LiteLoaderEventBroker.getCommonBroker().onSpawnPlayer((PlayerList)(Object)this, cir.getReturnValue(), profile);
     }
     @Inject(
@@ -68,6 +68,6 @@ public abstract class MixinPlayerList
     )
     private void onRespawnPlayer(EntityPlayerMP player, int dimension, boolean conqueredEnd, CallbackInfoReturnable<EntityPlayerMP> cir)
     {
-        Proxy.onRespawnPlayer(cir, (PlayerList)(Object)this, player, dimension, conqueredEnd);
+        LiteLoaderEventBroker.getCommonBroker().onRespawnPlayer((PlayerList)(Object)this, cir.getReturnValue(), player, dimension, conqueredEnd);
     }
 }
@@ -636,6 +636,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
         }
     }
+    @SuppressWarnings("deprecation")
     private void addMixinsFrom(MixinContainer<File> container)
     {
         try
@@ -118,7 +118,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
     /**
      * Singleton
      */
-    static LiteLoaderEventBroker<?, ?> broker; 
+    protected static LiteLoaderEventBroker<?, ?> broker; 
     /**
      * Reference to the loader instance
@@ -191,6 +191,12 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
         LiteLoaderEventBroker.broker = this;
     }
+    
+    @SuppressWarnings("unchecked")
+    public static <TClient, TServer extends MinecraftServer> LiteLoaderEventBroker<TClient, TServer> getCommonBroker()
+    {
+        return (LiteLoaderEventBroker<TClient, TServer>)LiteLoaderEventBroker.broker;
+    }
     /**
      * @param mods
-/*
- * This file is part of LiteLoader.
- * Copyright (C) 2012-16 Adam Mummery-Smith
- * All Rights Reserved.
- */
-package com.mumfrey.liteloader.core;
-
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.mojang.authlib.GameProfile;
-import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.client.CPacketAnimation;
-import net.minecraft.network.play.client.CPacketPlayer;
-import net.minecraft.network.play.client.CPacketPlayerDigging;
-import net.minecraft.network.play.client.CPacketPlayerDigging.Action;
-import net.minecraft.network.play.client.CPacketPlayerTryUseItem;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.PlayerInteractionManager;
-import net.minecraft.server.management.PlayerList;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-
-public abstract class Proxy
-{
-    private static LiteLoaderEventBroker<?, ?> broker;
-
-    protected Proxy() {}
-
-    protected static void onStartupComplete()
-    {
-        Proxy.broker = LiteLoaderEventBroker.broker;
-
-        if (Proxy.broker == null)
-        {
-            throw new RuntimeException("LiteLoader failed to start up properly."
-                    + " The game is in an unstable state and must shut down now. Check the developer log for startup errors");
-        }
-    }
-
-    public static void onInitializePlayerConnection(PlayerList source, NetworkManager netManager, EntityPlayerMP player)
-    {
-        Proxy.broker.onInitializePlayerConnection(source, netManager, player);
-    }
-
-    public static void onPlayerLogin(PlayerList source, EntityPlayerMP player)
-    {
-        Proxy.broker.onPlayerLogin(source, player);
-    }
-
-    public static void onPlayerLogout(PlayerList source, EntityPlayerMP player)
-    {
-        Proxy.broker.onPlayerLogout(source, player);
-    }
-
-    public static void onSpawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, PlayerList source, GameProfile profile)
-    {
-        Proxy.broker.onSpawnPlayer(source, cir.getReturnValue(), profile);
-    }
-
-    public static void onRespawnPlayer(CallbackInfoReturnable<EntityPlayerMP> cir, PlayerList source, EntityPlayerMP oldPlayer,
-            int dimension, boolean won)
-    {
-        Proxy.broker.onRespawnPlayer(source, cir.getReturnValue(), oldPlayer, dimension, won);
-    }
-
-    public static void onServerTick(MinecraftServer mcServer)
-    {
-        Proxy.broker.onServerTick(mcServer);
-    }
-
-    public static void onPlaceBlock(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerTryUseItem packet)
-    {
-        // Potentially not needed any more
-//        if (!Proxy.broker.onPlaceBlock(netHandler, netHandler.playerEntity, packet.getPosition(),
-//                EnumFacing.getFront(packet.getPlacedBlockDirection())))
-//        {
-//            ci.cancel();
-//        }
-    }
-
-    public static void onClickedAir(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketAnimation packet)
-    {
-        if (!Proxy.broker.onClickedAir(InteractType.LEFT_CLICK, netHandler.playerEntity, packet.getHand()))
-        {
-            ci.cancel();
-        }
-    }
-
-    public static void onPlayerDigging(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayerDigging packet)
-    {
-        Action action = packet.getAction();
-        EntityPlayerMP player = netHandler.playerEntity;
-        if (action == Action.START_DESTROY_BLOCK)
-        {
-            if (!Proxy.broker.onPlayerDigging(InteractType.DIG_BLOCK_MAYBE, player, netHandler, packet.getPosition()))
-            {
-                ci.cancel();
-            }
-        }
-        else if (action == Action.ABORT_DESTROY_BLOCK || action == Action.STOP_DESTROY_BLOCK)
-        {
-            Proxy.broker.onPlayerDigging(InteractType.DIG_BLOCK_END, player, netHandler, packet.getPosition());
-        }
-        else if (action == Action.SWAP_HELD_ITEMS)
-        {
-            if (!Proxy.broker.onPlayerSwapItems(player))
-            {
-                ci.cancel();
-            }
-        }
-    }
-
-    public static void onRightClickBlock(CallbackInfoReturnable<EnumActionResult> ci, EntityPlayer player, World world, ItemStack stack,
-            EnumHand hand, BlockPos pos, EnumFacing side, float offsetX, float offsetY, float offsetZ)
-    {
-        if (!(player instanceof EntityPlayerMP))
-        {
-            return;
-        }
-
-        if (!Proxy.broker.onUseItem((EntityPlayerMP)player, hand, stack, pos, side))
-        {
-            ci.setReturnValue(EnumActionResult.FAIL);
-        }
-    }
-
-    public static void postRightClickBlock(CallbackInfoReturnable<EnumActionResult> cir, EntityPlayer player, World world, ItemStack stack,
-            EnumHand hand, BlockPos pos, EnumFacing side, float offsetX, float offsetY, float offsetZ)
-    {
-        if (!(player instanceof EntityPlayerMP))
-        {
-            return;
-        }
-        
-        System.err.printf("@@ postRightClickBlock: %s\n", cir.getReturnValue());
-    }
-
-    public static void onRightClick(CallbackInfoReturnable<EnumActionResult> cir, EntityPlayer player, World worldIn, ItemStack stack, EnumHand hand)
-    {
-        if (!(player instanceof EntityPlayerMP))
-        {
-            return;
-        }
-
-        if (!Proxy.broker.onClickedAir(InteractType.RIGHT_CLICK, (EntityPlayerMP)player, hand))
-        {
-            cir.setReturnValue(EnumActionResult.FAIL);
-        }
-    }
-
-    public static void onBlockClicked(CallbackInfo ci, PlayerInteractionManager manager, BlockPos pos, EnumFacing side)
-    {
-        if (!Proxy.broker.onBlockClicked(pos, side, manager))
-        {
-            ci.cancel();
-        }
-    }
-
-    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayer packet, WorldServer world, double oldPosX,
-            double oldPosY, double oldPosZ)
-    {
-        if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
-        {
-            ci.cancel();
-        }
-    }
-
-    public static void onPlayerMoved(CallbackInfo ci, NetHandlerPlayServer netHandler, CPacketPlayer packet, WorldServer world)
-    {
-        if (!Proxy.broker.onPlayerMove(netHandler, packet, netHandler.playerEntity, world))
-        {
-            ci.cancel();
-        }
-    }
-}
@@ -6,7 +6,6 @@
 package com.mumfrey.liteloader.crashreport;
 import java.util.List;
-import java.util.concurrent.Callable;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.launchwrapper.IClassTransformer;