2 files changed, 3 insertions, 64 deletions
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
index 017a3704f8..1cfe59743c 100644
--- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
+++ b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit.java
@@ -2,6 +2,7 @@ package gregtech.api.net;
 
 import com.google.common.io.ByteArrayDataInput;
 import cpw.mods.fml.common.network.ByteBufUtils;
+import gregtech.api.interfaces.metatileentity.IConfigurationCircuitSupport;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
@@ -80,7 +81,6 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
                 aData.readInt(),
                 aData.readShort(),
                 aData.readInt(),
-
                 ISerializableObject.readItemStackFromGreggyByteBuf(aData));
     }
 
@@ -91,8 +91,8 @@ public class GT_Packet_SetConfigurationCircuit extends GT_Packet_New {
         TileEntity tile = world.getTileEntity(mX, mY, mZ);
         if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead()) return;
         IMetaTileEntity mte = ((IGregTechTileEntity) tile).getMetaTileEntity();
-        if (!(mte instanceof GT_MetaTileEntity_BasicMachine)) return;
-        GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mte;
+        if (!(mte instanceof IConfigurationCircuitSupport)) return;
+        IConfigurationCircuitSupport machine = (IConfigurationCircuitSupport) mte;
         if (!machine.allowSelectCircuit()) return;
         machine.getConfigurationCircuits().stream()
                 .filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit_Bus.java b/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit_Bus.java
deleted file mode 100644
index 06344f1656..0000000000
--- a/src/main/java/gregtech/api/net/GT_Packet_SetConfigurationCircuit_Bus.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gregtech.api.net;
-
-import com.google.common.io.ByteArrayDataInput;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import net.minecraftforge.common.DimensionManager;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.util.GT_Utility;
-import gregtech.api.util.ISerializableObject;
-import gregtech.common.gui.GT_Container_InputBus_ME;
-
-public class GT_Packet_SetConfigurationCircuit_Bus extends GT_Packet_SetConfigurationCircuit {
-    public GT_Packet_SetConfigurationCircuit_Bus() {
-        super();
-    }
-
-    public GT_Packet_SetConfigurationCircuit_Bus(IGregTechTileEntity tile, ItemStack circuit) {
-        super(tile, circuit);
-    }
-
-    public GT_Packet_SetConfigurationCircuit_Bus(int x, short y, int z, ItemStack circuit) {
-        super(x, y, z, circuit);
-    }
-
-    @Override
-    public byte getPacketID() {
-        return 18;
-    }
-    @Override
-    public void process(IBlockAccess aWorld) {
-        World world = DimensionManager.getWorld(dimId);
-        if (world == null) return;
-        TileEntity tile = world.getTileEntity(mX, mY, mZ);
-        if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead())
-            return;
-        IMetaTileEntity mte = ((IGregTechTileEntity) tile).getMetaTileEntity();
-        if (!(mte instanceof GT_MetaTileEntity_Hatch)) return;
-        GT_MetaTileEntity_Hatch hatch = (GT_MetaTileEntity_Hatch) mte;
-        GregTech_API.getConfigurationCircuitList(hatch.mTier).stream()
-            .filter(stack -> GT_Utility.areStacksEqual(stack, circuit))
-            .findFirst()
-            .ifPresent(stack -> ((IGregTechTileEntity) tile).setInventorySlotContents(hatch.getCircuitSlot(), stack));
-    }
-
-    @Override
-    public GT_Packet_New decode(ByteArrayDataInput aData) {
-        return new GT_Packet_SetConfigurationCircuit_Bus(
-            aData.readInt(),
-            aData.readShort(),
-            aData.readInt(),
-            ISerializableObject.readItemStackFromGreggyByteBuf(aData));
-    }
-}