From 9ace6b46fa6583f9d6a6fa930b8520ff8a3a3216 Mon Sep 17 00:00:00 2001
From: Leon <lehjr1@gmail.com>
Date: Fri, 17 Feb 2017 12:25:45 -0500
Subject: [PATCH] ModularPowersuits-0.11.1.111 fix stuff broken in proxy
 refactoring

---
 .../powersuits/common/proxy/ClientProxy.java        |  7 +++++--
 .../powersuits/common/proxy/CommonProxy.java        |  8 ++++----
 .../powersuits/common/proxy/ServerProxy.java        | 13 +------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java b/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java
index 05269a0..ed6b26f 100644
--- a/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java
+++ b/src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java
@@ -45,9 +45,8 @@ import java.net.URL;
 public class ClientProxy extends CommonProxy {
     @Override
     public void registerEvents() {
+        super.registerEvents();
         MinecraftForge.EVENT_BUS.register(new SoundDictionary());
-        MinecraftForge.EVENT_BUS.register(new RenderEventHandler());
-        MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
     }
 
     /**
@@ -55,6 +54,7 @@ public class ClientProxy extends CommonProxy {
      */
     @Override
     public void registerRenderers() {
+        super.registerRenderers();
         MinecraftForgeClient.registerItemRenderer(MPSItems.getInstance().powerTool, new ToolRenderer());
         int tinkTableRenderID = RenderingRegistry.getNextAvailableRenderId();
         TinkerTableRenderer tinkTableRenderer = new TinkerTableRenderer(tinkTableRenderID);
@@ -69,6 +69,7 @@ public class ClientProxy extends CommonProxy {
         RenderingRegistry.registerEntityRenderingHandler(EntityPlasmaBolt.class, new RenderPlasmaBolt());
         RenderingRegistry.registerEntityRenderingHandler(EntitySpinningBlade.class, new RenderSpinningBlade());
         RenderingRegistry.registerEntityRenderingHandler(EntityLuxCapacitor.class, new RenderLuxCapacitorEntity());
+        MinecraftForge.EVENT_BUS.register(new RenderEventHandler());
         URL resource = ClientProxy.class.getResource("/assets/powersuits/models/modelspec.xml");
         ModelSpecXMLReader.getINSTANCE().parseFile(resource);
         URL otherResource = ClientProxy.class.getResource("/assets/powersuits/models/armor2.xml");
@@ -81,6 +82,8 @@ public class ClientProxy extends CommonProxy {
      */
     @Override
     public void registerHandlers() {
+        super.registerHandlers();
+        MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
         FMLCommonHandler.instance().bus().register(new KeybindKeyHandler());
         FMLCommonHandler.instance().bus().register(new ClientTickHandler());
     }
diff --git a/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java b/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java
index a7826a7..d89543b 100644
--- a/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java
+++ b/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java
@@ -30,7 +30,7 @@ import java.io.File;
  *
  * Ported to Java by lehjr on 11/14/16.
  */
-public abstract class CommonProxy {
+public class CommonProxy {
     public void preInit(FMLPreInitializationEvent event) {
         File newConfig = new File(event.getModConfigurationDirectory() + "/machinemuse/powersuits.cfg");
         Config.init(new Configuration(newConfig));
@@ -77,9 +77,9 @@ public abstract class CommonProxy {
         MinecraftForge.EVENT_BUS.register(new MovementManager());
     }
 
-    public abstract void registerHandlers();
+    public void registerHandlers() {};
 
-    public abstract void registerRenderers();
+    public void registerRenderers() {};
 
-    public abstract void sendModeChange(int dMode, String newMode);
+    public void sendModeChange(int dMode, String newMode) {};
 }
\ No newline at end of file
diff --git a/src/main/java/net/machinemuse/powersuits/common/proxy/ServerProxy.java b/src/main/java/net/machinemuse/powersuits/common/proxy/ServerProxy.java
index 5b59bd6..df112f4 100644
--- a/src/main/java/net/machinemuse/powersuits/common/proxy/ServerProxy.java
+++ b/src/main/java/net/machinemuse/powersuits/common/proxy/ServerProxy.java
@@ -17,21 +17,10 @@ public class ServerProxy extends CommonProxy{
     public void registerEvents() {
         super.registerEvents();
         FMLCommonHandler.instance().bus().register(new PlayerLoginHandlerThingy());
-        MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
     }
 
     @Override
     public void registerHandlers() {
-
-    }
-
-    @Override
-    public void registerRenderers() {
-
-    }
-
-    @Override
-    public void sendModeChange(int dMode, String newMode) {
-
+        MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
     }
 }
\ No newline at end of file