Bug fix: merge network dispatchers

9 files changed, 30 insertions, 53 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 3420298cfa..b1a71afb2f 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -10,6 +10,7 @@ import com.github.technus.tectech.loader.entity.EntityLoader;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.loader.mechanics.ElementalLoader;
+import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import com.github.technus.tectech.loader.recipe.RecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
 import com.github.technus.tectech.loader.thing.MachineLoader;
@@ -17,8 +18,6 @@ import com.github.technus.tectech.loader.thing.ThingsLoader;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.Textures;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_collider;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityPacketDispatcher;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.RotationPacketDispatcher;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -106,8 +105,7 @@ public final class MainLoader {
         LOGGER.info("Damage types addition Done");
 
         progressBarLoad.step("Register Packet Dispatcher");
-        new RotationPacketDispatcher();
-        new PipeActivityPacketDispatcher();
+        new NetworkDispatcher();
         LOGGER.info("Packet Dispatcher registered");
 
         progressBarLoad.step("Register GUI Handler");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/PipeActivityPacketDispatcher.java b/src/main/java/com/github/technus/tectech/loader/network/NetworkDispatcher.java
index 0cc5ab61ca..2ee027ddc8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/PipeActivityPacketDispatcher.java
+++ b/src/main/java/com/github/technus/tectech/loader/network/NetworkDispatcher.java
@@ -1,13 +1,11 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi.base.network;
-
-import eu.usrv.yamcore.network.PacketDispatcher;
+package com.github.technus.tectech.loader.network;
 
 import static com.github.technus.tectech.Reference.MODID;
 
-public class PipeActivityPacketDispatcher extends PacketDispatcher {
-    public static PipeActivityPacketDispatcher INSTANCE;
+public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher {
+    public static NetworkDispatcher INSTANCE;
 
-    public PipeActivityPacketDispatcher() {
+    public NetworkDispatcher() {
         super(MODID);
         INSTANCE = this;
         registerPackets();
@@ -17,5 +15,7 @@ public class PipeActivityPacketDispatcher extends PacketDispatcher {
     public void registerPackets() {
         registerMessage(PipeActivityMessage.ServerHandler.class, PipeActivityMessage.PipeActivityQuery.class);
         registerMessage(PipeActivityMessage.ClientHandler.class, PipeActivityMessage.PipeActivityData.class);
+        registerMessage(RotationMessage.ServerHandler.class, RotationMessage.RotationQuery.class);
+        registerMessage(RotationMessage.ClientHandler.class, RotationMessage.RotationData.class);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/PipeActivityMessage.java b/src/main/java/com/github/technus/tectech/loader/network/PipeActivityMessage.java
index 35ca167d9d..0323f19428 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/PipeActivityMessage.java
+++ b/src/main/java/com/github/technus/tectech/loader/network/PipeActivityMessage.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi.base.network;
+package com.github.technus.tectech.loader.network;
 
 import com.github.technus.tectech.thing.metaTileEntity.pipe.IActivePipe;
 import cpw.mods.fml.common.network.ByteBufUtils;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java b/src/main/java/com/github/technus/tectech/loader/network/RotationMessage.java
index 59b14c16ed..ec78021a60 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationMessage.java
+++ b/src/main/java/com/github/technus/tectech/loader/network/RotationMessage.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi.base.network;
+package com.github.technus.tectech.loader.network;
 
 import com.github.technus.tectech.thing.metaTileEntity.IFrontRotation;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 53e1803615..3b7d4233f2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -10,8 +10,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElement
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.thing.metaTileEntity.IFrontRotation;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.RotationMessage;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.RotationPacketDispatcher;
+import com.github.technus.tectech.loader.network.RotationMessage;
+import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedTexture;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -1127,14 +1127,14 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         frontRotation = rotation;
         IGregTechTileEntity base=getBaseMetaTileEntity();
         if(base.isClientSide()) {
-            base.getWorld().markBlockRangeForRenderUpdate(base.getXCoord(), base.getYCoord(), base.getZCoord(), base.getXCoord(), base.getYCoord(), base.getZCoord());
+            base.issueTextureUpdate();
         }
     }
 
     protected final void updateRotationOnClients(){
         if(getBaseMetaTileEntity().isServerSide()){
             IGregTechTileEntity base=getBaseMetaTileEntity();
-            RotationPacketDispatcher.INSTANCE.sendToAllAround(new RotationMessage.RotationData(this),
+            NetworkDispatcher.INSTANCE.sendToAllAround(new RotationMessage.RotationData(this),
                     base.getWorld().provider.dimensionId,
                     base.getXCoord(),
                     base.getYCoord(),
@@ -1229,7 +1229,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         isFacingValid(aBaseMetaTileEntity.getFrontFacing());
         if(getBaseMetaTileEntity().isClientSide()){
-            RotationPacketDispatcher.INSTANCE.sendToServer(new RotationMessage.RotationQuery(this));
+            NetworkDispatcher.INSTANCE.sendToServer(new RotationMessage.RotationQuery(this));
         }
         onFirstTick_EM(aBaseMetaTileEntity);
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationPacketDispatcher.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationPacketDispatcher.java
deleted file mode 100644
index 29a8f0bcf6..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/network/RotationPacketDispatcher.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi.base.network;
-
-import eu.usrv.yamcore.network.PacketDispatcher;
-
-import static com.github.technus.tectech.Reference.MODID;
-
-public class RotationPacketDispatcher extends PacketDispatcher {
-    public static RotationPacketDispatcher INSTANCE;
-
-    public RotationPacketDispatcher() {
-        super(MODID);
-        INSTANCE = this;
-        registerPackets();
-    }
-
-    @Override
-    public void registerPackets() {
-        registerMessage(RotationMessage.ServerHandler.class, RotationMessage.RotationQuery.class);
-        registerMessage(RotationMessage.ClientHandler.class, RotationMessage.RotationData.class);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
index adf8b1f127..4badeb2d7c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityMessage;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityPacketDispatcher;
+import com.github.technus.tectech.loader.network.PipeActivityMessage;
+import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
@@ -109,7 +109,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn
     @Override
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if(getBaseMetaTileEntity().isClientSide()){
-            PipeActivityPacketDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
+            NetworkDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
         }
         onPostTick(aBaseMetaTileEntity, 31);
     }
@@ -120,7 +120,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn
             if ((aTick & 31) == 31) {
                 if(active){
                     if(TecTech.RANDOM.nextInt(15)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),
@@ -130,7 +130,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn
                     active=false;
                 }else if(getActive()){
                     if(TecTech.RANDOM.nextInt(15)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
index 151718db6c..f6c0724546 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityMessage;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityPacketDispatcher;
+import com.github.technus.tectech.loader.network.PipeActivityMessage;
+import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
@@ -110,7 +110,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec
     @Override
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if(getBaseMetaTileEntity().isClientSide()){
-            PipeActivityPacketDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
+            NetworkDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
         }
         onPostTick(aBaseMetaTileEntity, 31);
     }
@@ -121,7 +121,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec
             if ((aTick & 31) == 31) {
                 if(active){
                     if(TecTech.RANDOM.nextInt(7)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),
@@ -131,7 +131,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec
                     active=false;
                 }else if(getActive()){
                     if(TecTech.RANDOM.nextInt(7)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
index 715e79ffbb..8ee90c6954 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityMessage;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.PipeActivityPacketDispatcher;
+import com.github.technus.tectech.loader.network.PipeActivityMessage;
+import com.github.technus.tectech.loader.network.NetworkDispatcher;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
@@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo
     @Override
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if(getBaseMetaTileEntity().isClientSide()){
-            PipeActivityPacketDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
+            NetworkDispatcher.INSTANCE.sendToServer(new PipeActivityMessage.PipeActivityQuery(this));
         }
         onPostTick(aBaseMetaTileEntity, 31);
     }
@@ -117,7 +117,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo
             if ((aTick & 31) == 31) {
                 if(active){
                     if(TecTech.RANDOM.nextInt(31)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),
@@ -127,7 +127,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo
                     active=false;
                 }else if(getActive()){
                     if(TecTech.RANDOM.nextInt(31)==0) {
-                        PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
+                        NetworkDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this),
                                 aBaseMetaTileEntity.getWorld().provider.dimensionId,
                                 aBaseMetaTileEntity.getXCoord(),
                                 aBaseMetaTileEntity.getYCoord(),