Minor fix to how Common/Client Proxy handles init

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
index 9e0758b8dbca864bae3a76cb8f269709cbf9b311..35a13679724baf4acb2d73b1e244e576f51e9532 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
@@ -18,9 +18,8 @@ public class ClientProxy extends CommonProxy
     private Battle localBattle = null;
     
     @Override
-    public void initialize()
+    protected void initializeClient()
     {
-        super.initialize();
         battleGui = new BattleGui();
         battleMusic = null; // will be initialized in postInit()
         battleMusicCount = 0;
@@ -84,9 +83,8 @@ public class ClientProxy extends CommonProxy
     }
 
     @Override
-    public void postInit()
+    protected void postInitClient()
     {
-        super.postInit();
         battleMusic = new BattleMusic(getLogger());
     }
 

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
index bd1d968417a38a7ce26712a59c3254522fa370bb..a954e574f12046ea0288e61ab7cc176fce2e39f2 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
@@ -17,11 +17,14 @@ public class CommonProxy
     private Config config = null;
     private Logger logger = null;
     
-    public void initialize()
+    public final void initialize()
     {
         attackerViaBow = new HashSet<AttackerViaBow>();
+        initializeClient();
     }
     
+    protected void initializeClient() {}
+    
     public final boolean initializeBattleManager()
     {
         if(battleManager == null)
@@ -57,11 +60,14 @@ public class CommonProxy
     
     public void battleEnded() {}
     
-    public void postInit()
+    public final void postInit()
     {
         config = new Config(logger);
+        postInitClient();
     }
     
+    protected void postInitClient() {}
+    
     public final void setLogger(Logger logger)
     {
         this.logger = logger;