diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
index 9a308533..80075f50 100644
--- a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
+++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java
@@ -5,13 +5,9 @@ import java.util.Set;
 
 import javax.annotation.Nullable;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
@@ -32,20 +28,14 @@ import appeng.parts.misc.PartInterface;
 import appeng.tile.misc.TileInterface;
 import appeng.util.InventoryAdaptor;
 
-import com.glodblock.github.FluidCraft;
 import com.glodblock.github.client.gui.GuiFluidCraftConfirm;
-import com.glodblock.github.client.gui.GuiInterfaceTerminalWireless;
 import com.glodblock.github.common.item.ItemFluidDrop;
 import com.glodblock.github.common.item.ItemFluidPacket;
-import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal;
-import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
 import com.glodblock.github.common.parts.PartFluidInterface;
 import com.glodblock.github.common.tile.TileFluidInterface;
 import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor;
 import com.glodblock.github.inventory.FluidConvertingInventoryCrafting;
-import com.glodblock.github.inventory.gui.GuiType;
 import com.glodblock.github.loader.ItemAndBlockHolder;
-import com.glodblock.github.network.CPacketSwitchGuis;
 import com.glodblock.github.util.Ae2Reflect;
 import com.glodblock.github.util.SetBackedMachineSet;
 import com.google.common.collect.Sets;
@@ -198,19 +188,4 @@ public class CoreModHooks {
         }
         return true;
     }
-
-    public static void clientPacketData(NBTTagCompound data) {
-        GuiScreen gs = Minecraft.getMinecraft().currentScreen;
-        if (gs instanceof GuiInterfaceTerminalWireless) {
-            ((GuiInterfaceTerminalWireless) gs).postUpdate(data);
-        }
-    }
-
-    public static void reopenInterfaceTerminal() {
-        EntityPlayer p = Minecraft.getMinecraft().thePlayer;
-        ItemStack c = p.getCurrentEquippedItem();
-        if (c.getItem() instanceof ItemWirelessInterfaceTerminal || c.getItem() instanceof ItemWirelessUltraTerminal) {
-            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.WIRELESS_INTERFACE_TERMINAL, true));
-        }
-    }
 }
diff --git a/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java
new file mode 100644
index 00000000..0f3aef1f
--- /dev/null
+++ b/src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java
@@ -0,0 +1,37 @@
+package com.glodblock.github.coremod.hooker;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.client.gui.GuiInterfaceTerminalWireless;
+import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal;
+import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
+import com.glodblock.github.inventory.gui.GuiType;
+import com.glodblock.github.network.CPacketSwitchGuis;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class CoreModHooksClient {
+
+    public static void clientPacketData(NBTTagCompound data) {
+        GuiScreen gs = Minecraft.getMinecraft().currentScreen;
+        if (gs instanceof GuiInterfaceTerminalWireless) {
+            ((GuiInterfaceTerminalWireless) gs).postUpdate(data);
+        }
+    }
+
+    public static void reopenInterfaceTerminal() {
+        EntityPlayer p = Minecraft.getMinecraft().thePlayer;
+        ItemStack c = p.getCurrentEquippedItem();
+        if (c.getItem() instanceof ItemWirelessInterfaceTerminal || c.getItem() instanceof ItemWirelessUltraTerminal) {
+            FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(GuiType.WIRELESS_INTERFACE_TERMINAL, true));
+        }
+    }
+
+}
diff --git a/src/main/java/com/glodblock/github/coremod/transform/GuiRenamerTransformer.java b/src/main/java/com/glodblock/github/coremod/transform/GuiRenamerTransformer.java
index 3173b768..f3d7aa4a 100644
--- a/src/main/java/com/glodblock/github/coremod/transform/GuiRenamerTransformer.java
+++ b/src/main/java/com/glodblock/github/coremod/transform/GuiRenamerTransformer.java
@@ -48,7 +48,7 @@ public class GuiRenamerTransformer extends FCClassTransformer.ClassMapper {
             if (owner.equals("net/minecraft/client/entity/EntityClientPlayerMP") && name.equals("closeScreen")) {
                 super.visitMethodInsn(
                         Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
+                        "com/glodblock/github/coremod/hooker/CoreModHooksClient",
                         "reopenInterfaceTerminal",
                         "()V",
                         false);
diff --git a/src/main/java/com/glodblock/github/coremod/transform/PacketCompressedNBTTransformer.java b/src/main/java/com/glodblock/github/coremod/transform/PacketCompressedNBTTransformer.java
index bd2548ac..0d92f73a 100644
--- a/src/main/java/com/glodblock/github/coremod/transform/PacketCompressedNBTTransformer.java
+++ b/src/main/java/com/glodblock/github/coremod/transform/PacketCompressedNBTTransformer.java
@@ -51,7 +51,7 @@ public class PacketCompressedNBTTransformer extends FCClassTransformer.ClassMapp
                     "Lnet/minecraft/nbt/NBTTagCompound;");
             super.visitMethodInsn(
                     Opcodes.INVOKESTATIC,
-                    "com/glodblock/github/coremod/hooker/CoreModHooks",
+                    "com/glodblock/github/coremod/hooker/CoreModHooksClient",
                     "clientPacketData",
                     "(Lnet/minecraft/nbt/NBTTagCompound;)V",
                     false);