diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index f7bf39b36..74bb6ed66 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -165,27 +165,6 @@ public class GuiChemicalCrystallizer extends GuiMekanism stackIndex = -1; } - @Override - protected void mouseClicked(int x, int y, int button) - { - super.mouseClicked(x, y, button); - - if(button == 0) - { - int xAxis = (x - (width - xSize) / 2); - int yAxis = (y - (height - ySize) / 2); - - if(xAxis > 24 && xAxis < 42 && yAxis > 56 && yAxis < 64) - { - ArrayList data = new ArrayList(); - data.add(0); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } - } - } - @Override public void updateScreen() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index a53cf1d01..08ea8a8a2 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -131,33 +131,4 @@ public class GuiChemicalInfuser extends GuiMekanism super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } - - @Override - protected void mouseClicked(int x, int y, int button) - { - super.mouseClicked(x, y, button); - - if(button == 0) - { - int xAxis = (x - (width - xSize) / 2); - int yAxis = (y - (height - ySize) / 2); - - if(xAxis > 44 && xAxis < 62 && yAxis > 13 && yAxis < 21) - { - ArrayList data = new ArrayList(); - data.add(0); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } - else if(xAxis > 114 && xAxis < 132 && yAxis > 13 && yAxis < 21) - { - ArrayList data = new ArrayList(); - data.add(1); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } - } - } } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 36a9e1002..847fb2648 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -127,26 +127,4 @@ public class GuiChemicalWasher extends GuiMekanism super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } - - @Override - protected void mouseClicked(int x, int y, int button) - { - super.mouseClicked(x, y, button); - - if(button == 0) - { - int xAxis = (x - (width - xSize) / 2); - int yAxis = (y - (height - ySize) / 2); - - if(xAxis > 45 && xAxis < 63 && yAxis > 13 && yAxis < 21) - { - ArrayList data = new ArrayList(); - data.add(0); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - SoundHandler.playSound("gui.button.press"); - } - } - } - } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 8f6ff8eeb..093c85784 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -209,23 +209,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) - { - int type = dataStream.readInt(); - - if(type == 0) - { - inputTank.setGas(null); - } - - for(EntityPlayer player : playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); - } - - return; - } - super.handlePacketData(dataStream); isActive = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 7e431ecff..31f0e4847 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -215,27 +215,6 @@ public class TileEntityChemicalInfuser extends TileEntityNoisyElectricBlock impl @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) - { - int type = dataStream.readInt(); - - if(type == 0) - { - leftTank.setGas(null); - } - else if(type == 1) - { - rightTank.setGas(null); - } - - for(EntityPlayer player : playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); - } - - return; - } - super.handlePacketData(dataStream); isActive = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 70936cf43..8e44c03d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -278,23 +278,6 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple @Override public void handlePacketData(ByteBuf dataStream) { - if(!worldObj.isRemote) - { - int type = dataStream.readInt(); - - if(type == 0) - { - inputTank.setGas(null); - } - - for(EntityPlayer player : playersUsing) - { - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); - } - - return; - } - super.handlePacketData(dataStream); isActive = dataStream.readBoolean(); diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png index cd0dc63d8..73d93bc45 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png index be049f05a..8e8fed47d 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png index 91b4073e0..77507901f 100644 Binary files a/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/GuiChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png index 8340ad259..10f170ece 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png index e57d1c332..7f6713a99 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png index 0cfd11b87..c32e6088c 100644 Binary files a/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png and b/src/main/resources/assets/mekanism/gui/nei/GuiChemicalWasher.png differ