diff --git a/src/minecraft/mekanism/client/ClientPlayerTickHandler.java b/src/minecraft/mekanism/client/ClientPlayerTickHandler.java index 503014e50..09ccf94f9 100644 --- a/src/minecraft/mekanism/client/ClientPlayerTickHandler.java +++ b/src/minecraft/mekanism/client/ClientPlayerTickHandler.java @@ -3,7 +3,6 @@ package mekanism.client; import java.util.EnumSet; import mekanism.api.EnumColor; -import mekanism.common.EnumPacketType; import mekanism.common.ItemConfigurator; import mekanism.common.ItemElectricBow; import mekanism.common.PacketHandler; @@ -49,7 +48,7 @@ public class ClientPlayerTickHandler implements ITickHandler if(!lastTickConfiguratorChange) { item.setState(stack, (byte)(item.getState(stack) < 3 ? item.getState(stack)+1 : 0)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState(item.getState(stack))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketConfiguratorState().setParams(item.getState(stack))); entityPlayer.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Configure State: " + item.getColor(item.getState(stack)) + item.getState(item.getState(stack))); lastTickConfiguratorChange = true; } @@ -67,7 +66,7 @@ public class ClientPlayerTickHandler implements ITickHandler if(!lastTickElectricBowChange) { item.setFireState(stack, !item.getFireState(stack)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState(item.getFireState(stack))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricBowState().setParams(item.getFireState(stack))); entityPlayer.sendChatToPlayer(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + "Fire Mode: " + (item.getFireState(stack) ? (EnumColor.DARK_GREEN + "ON") : (EnumColor.DARK_RED + "OFF"))); lastTickElectricBowChange = true; } diff --git a/src/minecraft/mekanism/client/GuiControlPanel.java b/src/minecraft/mekanism/client/GuiControlPanel.java index 18c1e7223..263646f3f 100644 --- a/src/minecraft/mekanism/client/GuiControlPanel.java +++ b/src/minecraft/mekanism/client/GuiControlPanel.java @@ -164,7 +164,7 @@ public class GuiControlPanel extends GuiScreen return; } - PacketHandler.sendPacket(Transmission.SERVER, new PacketControlPanel(gui.getClassPath(), gui.getInstanceName(), new Object3D(Integer.parseInt(xField.getText()), Integer.parseInt(yField.getText()), Integer.parseInt(zField.getText())), gui.getGuiID())); + PacketHandler.sendPacket(Transmission.SERVER, new PacketControlPanel().setParams(gui.getClassPath(), gui.getInstanceName(), new Object3D(Integer.parseInt(xField.getText()), Integer.parseInt(yField.getText()), Integer.parseInt(zField.getText())), gui.getGuiID())); usingPlayer.openGui(instance, gui.getGuiID(), worldObj, Integer.parseInt(xField.getText()), Integer.parseInt(yField.getText()), Integer.parseInt(zField.getText())); } catch(Exception e) { System.err.println("[Mekanism] Error while handling Control Panel GUI request."); diff --git a/src/minecraft/mekanism/client/GuiElectricChest.java b/src/minecraft/mekanism/client/GuiElectricChest.java index cddbae5f1..3f01bd95c 100644 --- a/src/minecraft/mekanism/client/GuiElectricChest.java +++ b/src/minecraft/mekanism/client/GuiElectricChest.java @@ -112,10 +112,10 @@ public class GuiElectricChest extends GuiContainer if(isBlock) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.LOCK, !getLocked(), true, Object3D.get(tileEntity))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.LOCK, !getLocked(), true, Object3D.get(tileEntity))); } else { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.LOCK, !getLocked(), false)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.LOCK, !getLocked(), false)); ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); ((IElectricChest)stack.getItem()).setLocked(stack, !getLocked()); diff --git a/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java b/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java index dcb259d68..79d1472f8 100644 --- a/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java +++ b/src/minecraft/mekanism/client/GuiMetallurgicInfuser.java @@ -50,7 +50,7 @@ public class GuiMetallurgicInfuser extends GuiContainer ArrayList data = new ArrayList(); data.add(0); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/minecraft/mekanism/client/GuiPasswordEnter.java b/src/minecraft/mekanism/client/GuiPasswordEnter.java index 10804a825..aa7cd34ec 100644 --- a/src/minecraft/mekanism/client/GuiPasswordEnter.java +++ b/src/minecraft/mekanism/client/GuiPasswordEnter.java @@ -132,11 +132,11 @@ public class GuiPasswordEnter extends GuiScreen if(isBlock) { tileEntity.setEnergy(tileEntity.getEnergy() - 100); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, true, true, Object3D.get(tileEntity))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, true, true, Object3D.get(tileEntity))); } else { ((IEnergizedItem)itemStack.getItem()).setEnergy(itemStack, ((IEnergizedItem)itemStack.getItem()).getEnergy(itemStack) - 100); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, true, false)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, true, false)); } } } diff --git a/src/minecraft/mekanism/client/GuiPasswordModify.java b/src/minecraft/mekanism/client/GuiPasswordModify.java index 592761b2d..ff3c0da7c 100644 --- a/src/minecraft/mekanism/client/GuiPasswordModify.java +++ b/src/minecraft/mekanism/client/GuiPasswordModify.java @@ -162,13 +162,13 @@ public class GuiPasswordModify extends GuiScreen else { if(isBlock) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), true, Object3D.get(tileEntity))); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, false, true, Object3D.get(tileEntity))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), true, Object3D.get(tileEntity))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, false, true, Object3D.get(tileEntity))); } else { ((IElectricChest)itemStack.getItem()).setPassword(itemStack, confirmPasswordField.getText()); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), false)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest(ElectricChestPacketType.SERVER_OPEN, false, false)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.PASSWORD, confirmPasswordField.getText(), false)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketElectricChest().setParams(ElectricChestPacketType.SERVER_OPEN, false, false)); } } } diff --git a/src/minecraft/mekanism/client/GuiPortableTeleporter.java b/src/minecraft/mekanism/client/GuiPortableTeleporter.java index 39e7cd87f..484f2b58f 100644 --- a/src/minecraft/mekanism/client/GuiPortableTeleporter.java +++ b/src/minecraft/mekanism/client/GuiPortableTeleporter.java @@ -1,6 +1,5 @@ package mekanism.client; -import mekanism.common.EnumPacketType; import mekanism.common.ItemPortableTeleporter; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -96,25 +95,25 @@ public class GuiPortableTeleporter extends GuiScreen if(xAxis > 23 && xAxis < 37 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate(0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0)))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 0, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 0))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 62 && xAxis < 76 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate(1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1)))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 1, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 1))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 101 && xAxis < 115 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate(2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2)))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 2, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 2))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 140 && xAxis < 154 && yAxis > 44 && yAxis < 58) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate(3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3)))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDigitUpdate().setParams(3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3)))); ((ItemPortableTeleporter)itemStack.getItem()).setDigit(itemStack, 3, getIncrementedNumber(((ItemPortableTeleporter)itemStack.getItem()).getDigit(itemStack, 3))); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/minecraft/mekanism/client/GuiRobitCrafting.java b/src/minecraft/mekanism/client/GuiRobitCrafting.java index c40bfdbd3..376afda91 100644 --- a/src/minecraft/mekanism/client/GuiRobitCrafting.java +++ b/src/minecraft/mekanism/client/GuiRobitCrafting.java @@ -1,7 +1,6 @@ package mekanism.client; import mekanism.common.ContainerRobitCrafting; -import mekanism.common.EnumPacketType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -9,7 +8,6 @@ import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -102,7 +100,7 @@ public class GuiRobitCrafting extends GuiContainer if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 0, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) @@ -112,19 +110,19 @@ public class GuiRobitCrafting extends GuiContainer else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 2, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 3, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 4, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, entityId, 0, 0); } } diff --git a/src/minecraft/mekanism/client/GuiRobitInventory.java b/src/minecraft/mekanism/client/GuiRobitInventory.java index 6efb7b0f0..ea1bf5b5a 100644 --- a/src/minecraft/mekanism/client/GuiRobitInventory.java +++ b/src/minecraft/mekanism/client/GuiRobitInventory.java @@ -101,13 +101,13 @@ public class GuiRobitInventory extends GuiContainer if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 0, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 1, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) @@ -117,13 +117,13 @@ public class GuiRobitInventory extends GuiContainer else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 3, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 4, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.entityId, 0, 0); } } diff --git a/src/minecraft/mekanism/client/GuiRobitMain.java b/src/minecraft/mekanism/client/GuiRobitMain.java index fcb390698..dc48826f8 100644 --- a/src/minecraft/mekanism/client/GuiRobitMain.java +++ b/src/minecraft/mekanism/client/GuiRobitMain.java @@ -2,7 +2,6 @@ package mekanism.client; import mekanism.common.ContainerRobitMain; import mekanism.common.EntityRobit; -import mekanism.common.EnumPacketType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -49,7 +48,7 @@ public class GuiRobitMain extends GuiContainer { if(nameChangeField.getText() != null && !nameChangeField.getText().isEmpty()) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.NAME, nameChangeField.getText(), robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.NAME, nameChangeField.getText(), robit.entityId)); toggleNameChange(); nameChangeField.setText(""); } @@ -261,31 +260,31 @@ public class GuiRobitMain extends GuiContainer else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 1, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 2, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 3, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 4, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.FOLLOW, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.FOLLOW, robit.entityId)); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { @@ -295,12 +294,12 @@ public class GuiRobitMain extends GuiContainer else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GO_HOME, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GO_HOME, robit.entityId)); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.DROP_PICKUP, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.DROP_PICKUP, robit.entityId)); } } } diff --git a/src/minecraft/mekanism/client/GuiRobitRepair.java b/src/minecraft/mekanism/client/GuiRobitRepair.java index df6a7daba..54bb4d33c 100644 --- a/src/minecraft/mekanism/client/GuiRobitRepair.java +++ b/src/minecraft/mekanism/client/GuiRobitRepair.java @@ -144,25 +144,25 @@ public class GuiRobitRepair extends GuiContainer implements ICrafting if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 0, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 1, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 2, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 3, entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 3, entityId)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) diff --git a/src/minecraft/mekanism/client/GuiRobitSmelting.java b/src/minecraft/mekanism/client/GuiRobitSmelting.java index d14d2c167..ce927957a 100644 --- a/src/minecraft/mekanism/client/GuiRobitSmelting.java +++ b/src/minecraft/mekanism/client/GuiRobitSmelting.java @@ -110,19 +110,19 @@ public class GuiRobitSmelting extends GuiContainer if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 0, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 0, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 1, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 1, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 2, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 2, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) @@ -132,7 +132,7 @@ public class GuiRobitSmelting extends GuiContainer else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit(RobitPacketType.GUI, 4, robit.entityId)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketRobit().setParams(RobitPacketType.GUI, 4, robit.entityId)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.entityId, 0, 0); } } diff --git a/src/minecraft/mekanism/client/GuiStopwatch.java b/src/minecraft/mekanism/client/GuiStopwatch.java index a513d913c..32abe3c43 100644 --- a/src/minecraft/mekanism/client/GuiStopwatch.java +++ b/src/minecraft/mekanism/client/GuiStopwatch.java @@ -1,6 +1,5 @@ package mekanism.client; -import mekanism.common.EnumPacketType; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -73,25 +72,25 @@ public class GuiStopwatch extends GuiScreen if(guibutton.id == 0) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTime(0)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTime().setParams(0)); mc.displayGuiScreen(null); } if(guibutton.id == 1) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTime(6)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTime().setParams(6)); mc.displayGuiScreen(null); } if(guibutton.id == 2) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTime(12)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTime().setParams(12)); mc.displayGuiScreen(null); } if(guibutton.id == 3) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTime(18)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTime().setParams(18)); mc.displayGuiScreen(null); } if(guibutton.id == 4) diff --git a/src/minecraft/mekanism/client/GuiTeleporter.java b/src/minecraft/mekanism/client/GuiTeleporter.java index fffb850df..2107ca91b 100644 --- a/src/minecraft/mekanism/client/GuiTeleporter.java +++ b/src/minecraft/mekanism/client/GuiTeleporter.java @@ -61,7 +61,7 @@ public class GuiTeleporter extends GuiContainer data.add(0); data.add(getIncrementedNumber(tileEntity.code.digitOne)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); tileEntity.code.digitOne = getIncrementedNumber(tileEntity.code.digitOne); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -70,7 +70,7 @@ public class GuiTeleporter extends GuiContainer data.add(1); data.add(getIncrementedNumber(tileEntity.code.digitTwo)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); tileEntity.code.digitTwo = getIncrementedNumber(tileEntity.code.digitTwo); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -79,7 +79,7 @@ public class GuiTeleporter extends GuiContainer data.add(2); data.add(getIncrementedNumber(tileEntity.code.digitThree)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); tileEntity.code.digitThree = getIncrementedNumber(tileEntity.code.digitThree); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } @@ -88,7 +88,7 @@ public class GuiTeleporter extends GuiContainer data.add(3); data.add(getIncrementedNumber(tileEntity.code.digitFour)); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); tileEntity.code.digitFour = getIncrementedNumber(tileEntity.code.digitFour); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } diff --git a/src/minecraft/mekanism/client/GuiWeatherOrb.java b/src/minecraft/mekanism/client/GuiWeatherOrb.java index a3b2bfc24..8c3af9228 100644 --- a/src/minecraft/mekanism/client/GuiWeatherOrb.java +++ b/src/minecraft/mekanism/client/GuiWeatherOrb.java @@ -1,6 +1,5 @@ package mekanism.client; -import mekanism.common.EnumPacketType; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; @@ -74,25 +73,25 @@ public class GuiWeatherOrb extends GuiScreen if(guibutton.id == 0) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather(WeatherType.CLEAR)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather().setParams(WeatherType.CLEAR)); mc.displayGuiScreen(null); } if(guibutton.id == 1) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather(WeatherType.STORM)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather().setParams(WeatherType.STORM)); mc.displayGuiScreen(null); } if(guibutton.id == 2) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather(WeatherType.HAZE)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather().setParams(WeatherType.HAZE)); mc.displayGuiScreen(null); } if(guibutton.id == 3) { MekanismUtils.doFakeEntityExplosion(player); - PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather(WeatherType.RAIN)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketWeather().setParams(WeatherType.RAIN)); mc.displayGuiScreen(null); } if(guibutton.id == 4) diff --git a/src/minecraft/mekanism/common/BlockBasic.java b/src/minecraft/mekanism/common/BlockBasic.java index 76b1676c1..04d438313 100644 --- a/src/minecraft/mekanism/common/BlockBasic.java +++ b/src/minecraft/mekanism/common/BlockBasic.java @@ -184,7 +184,7 @@ public class BlockBasic extends Block if(!manageInventory(entityplayer, tileEntity)) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); entityplayer.openGui(Mekanism.instance, 18, world, x, y, z); } else { diff --git a/src/minecraft/mekanism/common/BlockMachine.java b/src/minecraft/mekanism/common/BlockMachine.java index d7c2feb24..48a3bfb13 100644 --- a/src/minecraft/mekanism/common/BlockMachine.java +++ b/src/minecraft/mekanism/common/BlockMachine.java @@ -595,10 +595,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds } else if(!electricChest.authenticated) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Object3D.get(electricChest)), entityplayer); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Object3D.get(electricChest)), entityplayer); } else { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Object3D.get(electricChest)), entityplayer); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Object3D.get(electricChest)), entityplayer); } return true; diff --git a/src/minecraft/mekanism/common/CableUtils.java b/src/minecraft/mekanism/common/CableUtils.java index c5a252577..399d962c9 100644 --- a/src/minecraft/mekanism/common/CableUtils.java +++ b/src/minecraft/mekanism/common/CableUtils.java @@ -9,11 +9,10 @@ import java.util.ArrayList; import mekanism.api.ICableOutputter; import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.IUniversalCable; +import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.block.IConnectionProvider; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerReceptor; public final class CableUtils @@ -29,7 +28,7 @@ public final class CableUtils for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity acceptor = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity acceptor = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); if(acceptor instanceof IStrictEnergyAcceptor || acceptor instanceof IEnergySink || (acceptor instanceof IPowerReceptor && !(acceptor instanceof IUniversalCable) && Mekanism.hooks.BuildCraftLoaded)) { @@ -51,7 +50,7 @@ public final class CableUtils for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity cable = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity cable = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); if(cable instanceof IUniversalCable && ((IUniversalCable)cable).canTransferEnergy(tileEntity)) { @@ -73,7 +72,7 @@ public final class CableUtils for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity outputter = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity outputter = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); if(outputter instanceof ICableOutputter && ((ICableOutputter)outputter).canOutputTo(orientation.getOpposite()) || outputter instanceof IEnergySource && ((IEnergySource)outputter).emitsEnergyTo(tileEntity, MekanismUtils.toIC2Direction(orientation.getOpposite()))) { @@ -92,7 +91,7 @@ public final class CableUtils */ public static boolean canConnectToAcceptor(ForgeDirection side, TileEntity tile) { - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(tile.worldObj, new Vector3(tile.xCoord, tile.yCoord, tile.zCoord), side); + TileEntity tileEntity = Object3D.get(tile).getFromSide(side).getTileEntity(tile.worldObj); if(tileEntity instanceof IStrictEnergyAcceptor && ((IStrictEnergyAcceptor)tileEntity).canReceiveEnergy(side.getOpposite())) { @@ -137,7 +136,7 @@ public final class CableUtils */ public static double emitEnergyToNetwork(double amount, TileEntity sender, ForgeDirection facing) { - TileEntity pointer = VectorHelper.getTileEntityFromSide(sender.worldObj, new Vector3(sender.xCoord, sender.yCoord, sender.zCoord), facing); + TileEntity pointer = Object3D.get(sender).getFromSide(facing).getTileEntity(sender.worldObj); if(pointer instanceof IUniversalCable) { diff --git a/src/minecraft/mekanism/common/CommonPlayerTickHandler.java b/src/minecraft/mekanism/common/CommonPlayerTickHandler.java index a663e7e68..2a8149fd7 100644 --- a/src/minecraft/mekanism/common/CommonPlayerTickHandler.java +++ b/src/minecraft/mekanism/common/CommonPlayerTickHandler.java @@ -41,14 +41,14 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 2) { item.setStatus(itemstack, 2); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate(2), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(2), player); } } else { if(item.getStatus(itemstack) != 1) { item.setStatus(itemstack, 1); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate(1), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(1), player); } } return; @@ -58,7 +58,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 3) { item.setStatus(itemstack, 3); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate(3), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(3), player); } return; } @@ -66,7 +66,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate(4), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(4), player); } return; } @@ -75,7 +75,7 @@ public class CommonPlayerTickHandler implements ITickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate(4), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketStatusUpdate().setParams(4), player); } return; } diff --git a/src/minecraft/mekanism/common/EnumPacketType.java b/src/minecraft/mekanism/common/EnumPacketType.java deleted file mode 100644 index 200d8561d..000000000 --- a/src/minecraft/mekanism/common/EnumPacketType.java +++ /dev/null @@ -1,82 +0,0 @@ -package mekanism.common; - -/** - * This class is designated to provide easy packet management in PacketHandler. Each type of packet is assigned to a - * unique ID, which is sent to the server or client as a data int and then handled in PacketHandler along with it's - * corresponding data. - * @author AidanBrady - * - */ -public enum EnumPacketType -{ - /** Used for sending a time update to the server. Send this along with an int between 0 and 24. */ - TIME(0), - - /** Used for sending a weather update to the server. Send this along with an EnumWeatherType. */ - WEATHER(1), - - /** Used for sending a tile entity update to all clients. Send this along with x, y, and z coordinates of the block. */ - TILE_ENTITY(2), - - /** Used for sending a control panel GUI request to the server. */ - CONTROL_PANEL(3), - - /** Used to send a portal FX packet to all clients. */ - PORTAL_FX(4), - - /** Used to send a teleport packet from an ItemStack to the server. */ - PORTABLE_TELEPORT(5), - - /** Used to send a digit update packet from a portable teleporter to the server. */ - DIGIT_UPDATE(6), - - /** Used to send a status update packet from a portable teleporter to the client. */ - STATUS_UPDATE(7), - - /** Used to request data from the server by tile entities. */ - DATA_REQUEST(8), - - /** Used to change a Configurator's state on the server side. */ - CONFIGURATOR_STATE(9), - - /** Used to change an Electric Bow's state on the server side. */ - ELECTRIC_BOW_STATE(10), - - /** Used to open an Electric Chest's GUI on the server side. */ - ELECTRIC_CHEST_SERVER_OPEN(11), - - /** Used to open an Electric Chest's GUI on the client side. */ - ELECTRIC_CHEST_CLIENT_OPEN(12), - - /** Used to send a password update packet to the server. */ - ELECTRIC_CHEST_PASSWORD(13), - - /** Used to send a lock update packet to the server. */ - ELECTRIC_CHEST_LOCK(14), - - /** Used to send a liquid transfer update packet to all clients. */ - LIQUID_TRANSFER_UPDATE(15), - - /** Used to send an energy transfer update packet to all clients. */ - ENERGY_TRANSFER_UPDATE(16), - - /** Used to send a gas transfer update packet to all clients. */ - GAS_TRANSFER_UPDATE(17), - - /** Used to send an electrolytic separator particle to all clients. */ - ELECTROLYTIC_SEPARATOR_PARTICLE(18), - - /** Robit-based packets. */ - ROBIT(19), - - /** A custom packet type. Handled in PacketHandler. */ - CUSTOM(-1); - - /** The ID of the packet type */ - public final int id; - - private EnumPacketType(int i) - { - id = i; - } -} diff --git a/src/minecraft/mekanism/common/ItemBlockEnergyCube.java b/src/minecraft/mekanism/common/ItemBlockEnergyCube.java index edbc51551..e93fd69af 100644 --- a/src/minecraft/mekanism/common/ItemBlockEnergyCube.java +++ b/src/minecraft/mekanism/common/ItemBlockEnergyCube.java @@ -150,7 +150,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, II if(!world.isRemote) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); } } diff --git a/src/minecraft/mekanism/common/ItemBlockMachine.java b/src/minecraft/mekanism/common/ItemBlockMachine.java index 21e7b3876..dede00cbe 100644 --- a/src/minecraft/mekanism/common/ItemBlockMachine.java +++ b/src/minecraft/mekanism/common/ItemBlockMachine.java @@ -481,11 +481,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem { if(!getAuthenticated(itemstack)) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, false), entityplayer); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 2, 0, false), entityplayer); } else if(getLocked(itemstack) && getJoules(itemstack) > 0) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, false), entityplayer); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 1, 0, false), entityplayer); } else { InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); diff --git a/src/minecraft/mekanism/common/ItemConfigurator.java b/src/minecraft/mekanism/common/ItemConfigurator.java index ced88e990..5cd1cd930 100644 --- a/src/minecraft/mekanism/common/ItemConfigurator.java +++ b/src/minecraft/mekanism/common/ItemConfigurator.java @@ -47,7 +47,7 @@ public class ItemConfigurator extends ItemEnergized { TileEntityMechanicalPipe tileEntity = (TileEntityMechanicalPipe)world.getBlockTileEntity(x, y, z); tileEntity.isActive = !tileEntity.isActive; - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); return true; } else if(world.getBlockTileEntity(x, y, z) instanceof TileEntityElectricPump) @@ -82,7 +82,7 @@ public class ItemConfigurator extends ItemEnergized if(config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Object3D.get(tileEntity), 50D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Object3D.get(tileEntity), 50D); } return true; } diff --git a/src/minecraft/mekanism/common/Mekanism.java b/src/minecraft/mekanism/common/Mekanism.java index 766e9956d..dba506e00 100644 --- a/src/minecraft/mekanism/common/Mekanism.java +++ b/src/minecraft/mekanism/common/Mekanism.java @@ -1188,18 +1188,18 @@ public class Mekanism @ForgeSubscribe public void onGasTransferred(GasTransferEvent event) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate(TransmitterTransferType.GAS, event.transferProtocol.pointer, event.transferProtocol.transferType)); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate().setParams(TransmitterTransferType.GAS, event.transferProtocol.pointer, event.transferProtocol.transferType)); } @ForgeSubscribe public void onLiquidTransferred(LiquidTransferEvent event) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate(TransmitterTransferType.LIQUID, event.transferProtocol.pointer, event.liquidSent)); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate().setParams(TransmitterTransferType.LIQUID, event.transferProtocol.pointer, event.liquidSent)); } @ForgeSubscribe public void onEnergyTransferred(EnergyTransferEvent event) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate(TransmitterTransferType.ENERGY, event.transferProtocol.pointer)); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTransmitterTransferUpdate().setParams(TransmitterTransferType.ENERGY, event.transferProtocol.pointer)); } } \ No newline at end of file diff --git a/src/minecraft/mekanism/common/MekanismUtils.java b/src/minecraft/mekanism/common/MekanismUtils.java index 016fc510b..610684649 100644 --- a/src/minecraft/mekanism/common/MekanismUtils.java +++ b/src/minecraft/mekanism/common/MekanismUtils.java @@ -135,21 +135,25 @@ public final class MekanismUtils BufferedReader rd; String line; String result = ""; + try { url = new URL(urlToRead); conn = (HttpURLConnection) url.openConnection(); conn.setRequestMethod("GET"); rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); - while ((line = rd.readLine()) != null) + + while((line = rd.readLine()) != null) { result += line; sb.append(line); } + rd.close(); } catch (Exception e) { result = "null"; System.err.println("[Mekanism] An error occured while connecting to URL '" + urlToRead + ".'"); } + return result; } @@ -740,10 +744,10 @@ public final class MekanismUtils if(isBlock) { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 0, id, true, Object3D.get(tileEntity)), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 0, id, true, Object3D.get(tileEntity)), player); } else { - PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 0, id, false), player); + PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketElectricChest().setParams(ElectricChestPacketType.CLIENT_OPEN, 0, id, false), player); } player.openContainer = new ContainerElectricChest(player.inventory, tileEntity, inventory, isBlock); diff --git a/src/minecraft/mekanism/common/PacketHandler.java b/src/minecraft/mekanism/common/PacketHandler.java index ceaf363c3..2d6903777 100644 --- a/src/minecraft/mekanism/common/PacketHandler.java +++ b/src/minecraft/mekanism/common/PacketHandler.java @@ -78,18 +78,11 @@ public class PacketHandler implements IPacketHandler packets.add(packetClass); } - public static void encode(Object[] dataValues, DataOutputStream output, int ignore) + public static void encode(Object[] dataValues, DataOutputStream output) { - int iterations = 0; - try { for(Object data : dataValues) { - if(iterations++ < ignore) - { - continue; - } - if(data instanceof Integer) { output.writeInt((Integer)data); @@ -130,7 +123,7 @@ public class PacketHandler implements IPacketHandler } else if(data instanceof ArrayList) { - encode(((ArrayList)data).toArray(), output, 0); + encode(((ArrayList)data).toArray(), output); } } } catch(Exception e) { diff --git a/src/minecraft/mekanism/common/PipeUtils.java b/src/minecraft/mekanism/common/PipeUtils.java index 548126628..4427d0fa0 100644 --- a/src/minecraft/mekanism/common/PipeUtils.java +++ b/src/minecraft/mekanism/common/PipeUtils.java @@ -1,11 +1,10 @@ package mekanism.common; import mekanism.api.IMechanicalPipe; +import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ITankContainer; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; public final class PipeUtils { @@ -16,19 +15,19 @@ public final class PipeUtils */ public static TileEntity[] getConnectedPipes(TileEntity tileEntity) { - TileEntity[] tubes = new TileEntity[] {null, null, null, null, null, null}; + TileEntity[] pipes = new TileEntity[] {null, null, null, null, null, null}; for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tube = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity pipe = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); - if(tube instanceof IMechanicalPipe && ((IMechanicalPipe)tube).canTransferLiquids(tileEntity)) + if(pipe instanceof IMechanicalPipe && ((IMechanicalPipe)pipe).canTransferLiquids(tileEntity)) { - tubes[orientation.ordinal()] = tube; + pipes[orientation.ordinal()] = pipe; } } - return tubes; + return pipes; } /** @@ -42,7 +41,7 @@ public final class PipeUtils for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity acceptor = VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), orientation); + TileEntity acceptor = Object3D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.worldObj); if(acceptor instanceof ITankContainer) { diff --git a/src/minecraft/mekanism/common/TileEntityBasicBlock.java b/src/minecraft/mekanism/common/TileEntityBasicBlock.java index 5b07e02b3..ea4de4050 100644 --- a/src/minecraft/mekanism/common/TileEntityBasicBlock.java +++ b/src/minecraft/mekanism/common/TileEntityBasicBlock.java @@ -41,7 +41,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench { if(playersUsing.size() > 0) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); } packetTick++; @@ -68,7 +68,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench if(worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest(Object3D.get(this))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Object3D.get(this))); } } @@ -111,7 +111,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench facing = direction; } - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } /** diff --git a/src/minecraft/mekanism/common/TileEntityBasicMachine.java b/src/minecraft/mekanism/common/TileEntityBasicMachine.java index f36fd76fa..3b2fedafd 100644 --- a/src/minecraft/mekanism/common/TileEntityBasicMachine.java +++ b/src/minecraft/mekanism/common/TileEntityBasicMachine.java @@ -268,7 +268,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp if(prevActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevActive = active; diff --git a/src/minecraft/mekanism/common/TileEntityBoundingBlock.java b/src/minecraft/mekanism/common/TileEntityBoundingBlock.java index 60c614548..ed3b08ca1 100644 --- a/src/minecraft/mekanism/common/TileEntityBoundingBlock.java +++ b/src/minecraft/mekanism/common/TileEntityBoundingBlock.java @@ -25,7 +25,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork mainY = y; mainZ = z; - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } } @@ -36,7 +36,7 @@ public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork if(worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest(Object3D.get(this))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Object3D.get(this))); } } diff --git a/src/minecraft/mekanism/common/TileEntityChargepad.java b/src/minecraft/mekanism/common/TileEntityChargepad.java index 7107534ab..97120f69d 100644 --- a/src/minecraft/mekanism/common/TileEntityChargepad.java +++ b/src/minecraft/mekanism/common/TileEntityChargepad.java @@ -180,7 +180,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct if(prevActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevActive = active; diff --git a/src/minecraft/mekanism/common/TileEntityCombiner.java b/src/minecraft/mekanism/common/TileEntityCombiner.java index 11e9881e1..2de92ba47 100644 --- a/src/minecraft/mekanism/common/TileEntityCombiner.java +++ b/src/minecraft/mekanism/common/TileEntityCombiner.java @@ -28,6 +28,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine { return 200; } + return 0; } } diff --git a/src/minecraft/mekanism/common/TileEntityControlPanel.java b/src/minecraft/mekanism/common/TileEntityControlPanel.java index bd45fd3b0..2c9a8008f 100644 --- a/src/minecraft/mekanism/common/TileEntityControlPanel.java +++ b/src/minecraft/mekanism/common/TileEntityControlPanel.java @@ -31,11 +31,11 @@ public class TileEntityControlPanel extends TileEntity implements ITileNetwork if(packetTick == 5 && !worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } if(packetTick % 20 == 0 && worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } } diff --git a/src/minecraft/mekanism/common/TileEntityDynamicTank.java b/src/minecraft/mekanism/common/TileEntityDynamicTank.java index 90b6ceeb0..cc41b9063 100644 --- a/src/minecraft/mekanism/common/TileEntityDynamicTank.java +++ b/src/minecraft/mekanism/common/TileEntityDynamicTank.java @@ -147,7 +147,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(structure != null && isRendering && packetTick % 20 == 0) { sendStructure = true; - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); } if(prevStructure != (structure != null)) @@ -159,7 +159,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock sendStructure = true; } - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevStructure = structure != null; @@ -226,7 +226,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock structure.liquidStored = null; } - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } } } @@ -285,7 +285,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock } } - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } } } @@ -423,7 +423,7 @@ public class TileEntityDynamicTank extends TileEntityContainerBlock if(tileEntity != null && tileEntity.isRendering) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList()))); } } } diff --git a/src/minecraft/mekanism/common/TileEntityElectricPump.java b/src/minecraft/mekanism/common/TileEntityElectricPump.java index 4814e72a4..72553e823 100644 --- a/src/minecraft/mekanism/common/TileEntityElectricPump.java +++ b/src/minecraft/mekanism/common/TileEntityElectricPump.java @@ -27,8 +27,6 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import universalelectricity.core.item.IItemElectric; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -100,7 +98,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(suck(true)) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList())), Object3D.get(this), 50D); } clean(true); @@ -113,7 +111,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(xCoord, yCoord, zCoord), orientation); + TileEntity tileEntity = Object3D.get(this).getFromSide(orientation).getTileEntity(worldObj); if(tileEntity instanceof ITankContainer) { diff --git a/src/minecraft/mekanism/common/TileEntityEnergyCube.java b/src/minecraft/mekanism/common/TileEntityEnergyCube.java index 7751bd1a6..dc0b9f7ea 100644 --- a/src/minecraft/mekanism/common/TileEntityEnergyCube.java +++ b/src/minecraft/mekanism/common/TileEntityEnergyCube.java @@ -16,6 +16,7 @@ import java.util.HashSet; import mekanism.api.ICableOutputter; import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.IUniversalCable; +import mekanism.api.Object3D; import mekanism.common.Tier.EnergyCubeTier; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -29,8 +30,6 @@ import universalelectricity.core.block.IVoltage; import universalelectricity.core.electricity.ElectricityNetworkHelper; import universalelectricity.core.electricity.IElectricityNetwork; import universalelectricity.core.item.IItemElectric; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerProvider; @@ -67,7 +66,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn if(!worldObj.isRemote) { - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); if(electricityStored > 0) { @@ -98,23 +97,23 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IEn if(tileEntity instanceof IConductor) { ForgeDirection outputDirection = ForgeDirection.getOrientation(facing); + ArrayList inputNetworks = new ArrayList(); for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { if(direction != outputDirection) { - IElectricityNetwork network = ElectricityNetworkHelper.getNetworkFromTileEntity(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), direction), direction); + IElectricityNetwork network = ElectricityNetworkHelper.getNetworkFromTileEntity(Object3D.get(this).getFromSide(direction).getTileEntity(worldObj), direction); + if(network != null) { inputNetworks.add(network); } } } - - TileEntity outputTile = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); - IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(outputTile, outputDirection); + IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(tileEntity, outputDirection); if(outputNetwork != null && !inputNetworks.contains(outputNetwork)) { diff --git a/src/minecraft/mekanism/common/TileEntityFactory.java b/src/minecraft/mekanism/common/TileEntityFactory.java index d1960223d..51b7e07d8 100644 --- a/src/minecraft/mekanism/common/TileEntityFactory.java +++ b/src/minecraft/mekanism/common/TileEntityFactory.java @@ -683,7 +683,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg if(prevActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevActive = active; diff --git a/src/minecraft/mekanism/common/TileEntityGasTank.java b/src/minecraft/mekanism/common/TileEntityGasTank.java index 8ecadae4e..b6c86a493 100644 --- a/src/minecraft/mekanism/common/TileEntityGasTank.java +++ b/src/minecraft/mekanism/common/TileEntityGasTank.java @@ -8,12 +8,11 @@ import mekanism.api.IGasAcceptor; import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; import mekanism.api.ITubeConnection; +import mekanism.api.Object3D; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -111,7 +110,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS { setGas(gasType, gasStored - (Math.min(gasStored, output) - GasTransmission.emitGasToNetwork(gasType, Math.min(gasStored, output), this, ForgeDirection.getOrientation(facing)))); - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); if(tileEntity instanceof IGasAcceptor) { diff --git a/src/minecraft/mekanism/common/TileEntityMechanicalPipe.java b/src/minecraft/mekanism/common/TileEntityMechanicalPipe.java index d6ecaaac0..0faddfd62 100644 --- a/src/minecraft/mekanism/common/TileEntityMechanicalPipe.java +++ b/src/minecraft/mekanism/common/TileEntityMechanicalPipe.java @@ -16,8 +16,6 @@ import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -78,7 +76,7 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP for(ITankContainer container : connectedAcceptors) { - ForgeDirection side = ForgeDirection.getOrientation(Arrays.asList(connectedAcceptors).indexOf(container)).getOpposite(); + ForgeDirection side = ForgeDirection.getOrientation(Arrays.asList(connectedAcceptors).indexOf(container)); if(container != null) { @@ -86,7 +84,7 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP if(received != null && received.amount != 0) { - container.drain(side, new LiquidTransferProtocol(this, VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), side.getOpposite()), received).calculate(), true); + container.drain(side, new LiquidTransferProtocol(this, Object3D.get(this).getFromSide(side).getTileEntity(worldObj), received).calculate(), true); } } } @@ -107,7 +105,7 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP if(worldObj.isRemote) { - PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest(Object3D.get(this))); + PacketHandler.sendPacket(Transmission.SERVER, new PacketDataRequest().setParams(Object3D.get(this))); } } @@ -152,7 +150,7 @@ public class TileEntityMechanicalPipe extends TileEntity implements IMechanicalP { if(!isActive) { - return new LiquidTransferProtocol(this, VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), from), resource).calculate(); + return new LiquidTransferProtocol(this, Object3D.get(this).getFromSide(from).getTileEntity(worldObj), resource).calculate(); } return 0; diff --git a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java index 0b78564a2..f34e86dbf 100644 --- a/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java @@ -574,7 +574,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem if(prevActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevActive = active; diff --git a/src/minecraft/mekanism/common/TileEntityTeleporter.java b/src/minecraft/mekanism/common/TileEntityTeleporter.java index 8bf18a9b9..00ae79474 100644 --- a/src/minecraft/mekanism/common/TileEntityTeleporter.java +++ b/src/minecraft/mekanism/common/TileEntityTeleporter.java @@ -209,7 +209,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IEn for(Object3D coords : Mekanism.teleporters.get(code)) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX(coords), coords, 40D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX().setParams(coords), coords, 40D); } } } diff --git a/src/minecraft/mekanism/common/TileEntityUniversalCable.java b/src/minecraft/mekanism/common/TileEntityUniversalCable.java index 6e77fb050..eba2cd12a 100644 --- a/src/minecraft/mekanism/common/TileEntityUniversalCable.java +++ b/src/minecraft/mekanism/common/TileEntityUniversalCable.java @@ -3,11 +3,10 @@ package mekanism.common; import java.util.ArrayList; import mekanism.api.IUniversalCable; +import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerFramework; @@ -78,8 +77,8 @@ public class TileEntityUniversalCable extends TileEntity implements IUniversalCa public int powerRequest(ForgeDirection from) { ArrayList ignored = new ArrayList(); - ignored.add(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(xCoord, yCoord, zCoord), from)); - return canTransferEnergy(VectorHelper.getTileEntityFromSide(worldObj, new Vector3(xCoord, yCoord, zCoord), from)) ? (int)Math.min(100, new EnergyTransferProtocol(this, this, ignored).neededEnergy()) : 0; + ignored.add(Object3D.get(this).getFromSide(from).getTileEntity(worldObj)); + return canTransferEnergy(Object3D.get(this).getFromSide(from).getTileEntity(worldObj)) ? (int)Math.min(100, new EnergyTransferProtocol(this, this, ignored).neededEnergy()) : 0; } @Override @@ -103,7 +102,7 @@ class CablePowerProvider extends PowerProvider public void receiveEnergy(float quantity, ForgeDirection from) { ArrayList ignored = new ArrayList(); - ignored.add(VectorHelper.getTileEntityFromSide(tileEntity.worldObj, new Vector3(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord), from)); + ignored.add(Object3D.get(tileEntity).getFromSide(from).getTileEntity(tileEntity.worldObj)); CableUtils.emitEnergyFromAllSidesIgnore(quantity*Mekanism.FROM_BC, tileEntity, ignored); } } \ No newline at end of file diff --git a/src/minecraft/mekanism/common/network/IMekanismPacket.java b/src/minecraft/mekanism/common/network/IMekanismPacket.java index 6b28d5203..aacd50c3f 100644 --- a/src/minecraft/mekanism/common/network/IMekanismPacket.java +++ b/src/minecraft/mekanism/common/network/IMekanismPacket.java @@ -9,9 +9,31 @@ import com.google.common.io.ByteArrayDataInput; public interface IMekanismPacket { + /** + * Gets this packet's identifier. This will show up in console logs to specify packet types. + * @return this packet's identifier + */ public String getName(); + /** + * Sets the parameters of this packet for writing. + * @param data - data to set + */ + public IMekanismPacket setParams(Object... data); + + /** + * Reads this packet's data from a ByteArrayDataInput, and handles it as needed. + * @param dataStream - data stream being sent + * @param player - player this packet was sent to, or sent by + * @param world - world this packet was handled in + * @throws Exception - the exception thrown in case anything goes wrong + */ public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception; + /** + * Writes this packet's data to a DataOutputStream. + * @param dataStream - data stream being sent + * @throws Exception - the exception thrown in case anything goes wrong + */ public void write(DataOutputStream dataStream) throws Exception; } diff --git a/src/minecraft/mekanism/common/network/PacketConfiguratorState.java b/src/minecraft/mekanism/common/network/PacketConfiguratorState.java index dd36a47a5..4d1a8dbdf 100644 --- a/src/minecraft/mekanism/common/network/PacketConfiguratorState.java +++ b/src/minecraft/mekanism/common/network/PacketConfiguratorState.java @@ -14,18 +14,19 @@ public class PacketConfiguratorState implements IMekanismPacket { public byte state; - public PacketConfiguratorState(byte b) - { - state = b; - } - - public PacketConfiguratorState() {} - @Override public String getName() { return "ConfiguratorState"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + state = (Byte)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketControlPanel.java b/src/minecraft/mekanism/common/network/PacketControlPanel.java index b29b4aa81..d79f2bc86 100644 --- a/src/minecraft/mekanism/common/network/PacketControlPanel.java +++ b/src/minecraft/mekanism/common/network/PacketControlPanel.java @@ -17,23 +17,24 @@ public class PacketControlPanel implements IMekanismPacket public int guiId; - public PacketControlPanel(String mClass, String mInstance, Object3D obj, int id) - { - modClass = mClass; - modInstance = mInstance; - - object3D = obj; - - guiId = id; - } - - public PacketControlPanel() {} - @Override public String getName() { return "ControlPanel"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + modClass = (String)data[0]; + modInstance = (String)data[1]; + + object3D = (Object3D)data[2]; + + guiId = (Integer)data[3]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketDataRequest.java b/src/minecraft/mekanism/common/network/PacketDataRequest.java index 92e4ad38c..f8ab4f43b 100644 --- a/src/minecraft/mekanism/common/network/PacketDataRequest.java +++ b/src/minecraft/mekanism/common/network/PacketDataRequest.java @@ -18,18 +18,19 @@ public class PacketDataRequest implements IMekanismPacket { public Object3D object3D; - public PacketDataRequest(Object3D obj) - { - object3D = obj; - } - - public PacketDataRequest() {} - @Override public String getName() { return "DataRequest"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + object3D = (Object3D)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception @@ -44,7 +45,7 @@ public class PacketDataRequest implements IMekanismPacket if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof ITileNetwork) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(worldServer.getBlockTileEntity(x, y, z)), ((ITileNetwork)worldServer.getBlockTileEntity(x, y, z)).getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(worldServer.getBlockTileEntity(x, y, z)), ((ITileNetwork)worldServer.getBlockTileEntity(x, y, z)).getNetworkedData(new ArrayList()))); } } diff --git a/src/minecraft/mekanism/common/network/PacketDigitUpdate.java b/src/minecraft/mekanism/common/network/PacketDigitUpdate.java index d23e2f182..418f22cdd 100644 --- a/src/minecraft/mekanism/common/network/PacketDigitUpdate.java +++ b/src/minecraft/mekanism/common/network/PacketDigitUpdate.java @@ -14,19 +14,20 @@ public class PacketDigitUpdate implements IMekanismPacket public int index; public int digit; - public PacketDigitUpdate(int i, int j) - { - index = i; - digit = j; - } - - public PacketDigitUpdate() {} - @Override public String getName() { return "DigitUpdate"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + index = (Integer)data[0]; + digit = (Integer)data[1]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketElectricBowState.java b/src/minecraft/mekanism/common/network/PacketElectricBowState.java index 7a02cb04d..9da569b42 100644 --- a/src/minecraft/mekanism/common/network/PacketElectricBowState.java +++ b/src/minecraft/mekanism/common/network/PacketElectricBowState.java @@ -14,18 +14,19 @@ public class PacketElectricBowState implements IMekanismPacket { public boolean fireMode; - public PacketElectricBowState(boolean fire) - { - fireMode = fire; - } - - public PacketElectricBowState() {} - @Override public String getName() { return "ElectricBowState"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + fireMode = (Boolean)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketElectricChest.java b/src/minecraft/mekanism/common/network/PacketElectricChest.java index 36ea2f884..e5984eaab 100644 --- a/src/minecraft/mekanism/common/network/PacketElectricChest.java +++ b/src/minecraft/mekanism/common/network/PacketElectricChest.java @@ -33,63 +33,64 @@ public class PacketElectricChest implements IMekanismPacket public Object3D obj; - public PacketElectricChest(ElectricChestPacketType type, Object... params) - { - activeType = type; - - switch(activeType) - { - case LOCK: - locked = (Boolean)params[0]; - isBlock = (Boolean)params[1]; - - if(isBlock) - { - obj = (Object3D)params[2]; - } - - break; - case PASSWORD: - password = (String)params[0]; - isBlock = (Boolean)params[1]; - - if(isBlock) - { - obj = (Object3D)params[2]; - } - - break; - case CLIENT_OPEN: - guiType = (Integer)params[0]; - windowId = (Integer)params[1]; - isBlock = (Boolean)params[2]; - - if(isBlock) - { - obj = (Object3D)params[3]; - } - - break; - case SERVER_OPEN: - useEnergy = (Boolean)params[0]; - isBlock = (Boolean)params[1]; - - if(isBlock) - { - obj = (Object3D)params[2]; - } - - break; - } - } - - public PacketElectricChest() {} - @Override public String getName() { return "ElectricChest"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + activeType = (ElectricChestPacketType)data[0]; + + switch(activeType) + { + case LOCK: + locked = (Boolean)data[1]; + isBlock = (Boolean)data[2]; + + if(isBlock) + { + obj = (Object3D)data[3]; + } + + break; + case PASSWORD: + password = (String)data[1]; + isBlock = (Boolean)data[2]; + + if(isBlock) + { + obj = (Object3D)data[3]; + } + + break; + case CLIENT_OPEN: + guiType = (Integer)data[1]; + windowId = (Integer)data[2]; + isBlock = (Boolean)data[3]; + + if(isBlock) + { + obj = (Object3D)data[4]; + } + + break; + case SERVER_OPEN: + useEnergy = (Boolean)data[1]; + isBlock = (Boolean)data[2]; + + if(isBlock) + { + obj = (Object3D)data[3]; + } + + break; + } + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketPortableTeleport.java b/src/minecraft/mekanism/common/network/PacketPortableTeleport.java index 5c276e3af..e1356a5b9 100644 --- a/src/minecraft/mekanism/common/network/PacketPortableTeleport.java +++ b/src/minecraft/mekanism/common/network/PacketPortableTeleport.java @@ -24,6 +24,12 @@ public class PacketPortableTeleport implements IMekanismPacket { return "PortableTeleport"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception @@ -48,7 +54,7 @@ public class PacketPortableTeleport implements IMekanismPacket ((EntityPlayerMP)player).playerNetServerHandler.setPlayerLocation(coords.xCoord+0.5, coords.yCoord+1, coords.zCoord+0.5, player.rotationYaw, player.rotationPitch); world.playSoundAtEntity(player, "mob.endermen.portal", 1.0F, 1.0F); - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX(coords), coords, 40D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketPortalFX().setParams(coords), coords, 40D); } } } diff --git a/src/minecraft/mekanism/common/network/PacketPortalFX.java b/src/minecraft/mekanism/common/network/PacketPortalFX.java index a43d1bd89..eb124dee3 100644 --- a/src/minecraft/mekanism/common/network/PacketPortalFX.java +++ b/src/minecraft/mekanism/common/network/PacketPortalFX.java @@ -13,18 +13,19 @@ public class PacketPortalFX implements IMekanismPacket { public Object3D object3D; - public PacketPortalFX(Object3D obj) - { - object3D = obj; - } - - public PacketPortalFX() {} - @Override public String getName() { return "PortalFX"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + object3D = (Object3D)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketRobit.java b/src/minecraft/mekanism/common/network/PacketRobit.java index 7d403bb9e..6eec890cf 100644 --- a/src/minecraft/mekanism/common/network/PacketRobit.java +++ b/src/minecraft/mekanism/common/network/PacketRobit.java @@ -18,39 +18,40 @@ public class PacketRobit implements IMekanismPacket public String name; - public PacketRobit(RobitPacketType type, Object... params) - { - activeType = type; - - switch(activeType) - { - case GUI: - guiType = (Integer)params[0]; - entityId = (Integer)params[1]; - break; - case FOLLOW: - entityId = (Integer)params[0]; - break; - case NAME: - name = (String)params[0]; - entityId = (Integer)params[1]; - break; - case GO_HOME: - entityId = (Integer)params[0]; - break; - case DROP_PICKUP: - entityId = (Integer)params[0]; - break; - } - } - - public PacketRobit() {} - @Override public String getName() { return "Robit"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + activeType = (RobitPacketType)data[0]; + + switch(activeType) + { + case GUI: + guiType = (Integer)data[1]; + entityId = (Integer)data[2]; + break; + case FOLLOW: + entityId = (Integer)data[1]; + break; + case NAME: + name = (String)data[1]; + entityId = (Integer)data[2]; + break; + case GO_HOME: + entityId = (Integer)data[1]; + break; + case DROP_PICKUP: + entityId = (Integer)data[1]; + break; + } + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketStatusUpdate.java b/src/minecraft/mekanism/common/network/PacketStatusUpdate.java index aeafe6ff0..95165f604 100644 --- a/src/minecraft/mekanism/common/network/PacketStatusUpdate.java +++ b/src/minecraft/mekanism/common/network/PacketStatusUpdate.java @@ -13,18 +13,19 @@ public class PacketStatusUpdate implements IMekanismPacket { public int status; - public PacketStatusUpdate(int i) - { - status = i; - } - - public PacketStatusUpdate() {} - @Override public String getName() { return "StatusUpdate"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + status = (Integer)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketTileEntity.java b/src/minecraft/mekanism/common/network/PacketTileEntity.java index 8647e63dc..9d89719d3 100644 --- a/src/minecraft/mekanism/common/network/PacketTileEntity.java +++ b/src/minecraft/mekanism/common/network/PacketTileEntity.java @@ -1,6 +1,7 @@ package mekanism.common.network; import java.io.DataOutputStream; +import java.util.ArrayList; import mekanism.api.Object3D; import mekanism.common.ITileNetwork; @@ -15,21 +16,22 @@ public class PacketTileEntity implements IMekanismPacket { public Object3D object3D; - public Object[] parameters; - - public PacketTileEntity(Object3D obj, Object... params) - { - object3D = obj; - parameters = params; - } - - public PacketTileEntity() {} + public ArrayList parameters; @Override public String getName() { return "TileEntity"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + object3D = (Object3D)data[0]; + parameters = (ArrayList)data[1]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception @@ -53,6 +55,6 @@ public class PacketTileEntity implements IMekanismPacket dataStream.writeInt(object3D.yCoord); dataStream.writeInt(object3D.zCoord); - PacketHandler.encode(parameters, dataStream, 0); + PacketHandler.encode(new Object[] {parameters}, dataStream); } } diff --git a/src/minecraft/mekanism/common/network/PacketTime.java b/src/minecraft/mekanism/common/network/PacketTime.java index d51fdbaa9..e5edafeb7 100644 --- a/src/minecraft/mekanism/common/network/PacketTime.java +++ b/src/minecraft/mekanism/common/network/PacketTime.java @@ -12,18 +12,19 @@ public class PacketTime implements IMekanismPacket { public int hourToSet; - public PacketTime(int hour) - { - hourToSet = hour; - } - - public PacketTime() {} - @Override public String getName() { return "Time"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + hourToSet = (Integer)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java b/src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java index a4f01cbcf..274df0bce 100644 --- a/src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java +++ b/src/minecraft/mekanism/common/network/PacketTransmitterTransferUpdate.java @@ -24,32 +24,32 @@ public class PacketTransmitterTransferUpdate implements IMekanismPacket public LiquidStack liquidStack; - public PacketTransmitterTransferUpdate(TransmitterTransferType type, Object... params) - { - tileEntity = (TileEntity)params[0]; - - activeType = type; - - switch(type) - { - case ENERGY: - break; - case GAS: - gasName = ((EnumGas)params[1]).name; - break; - case LIQUID: - liquidStack = (LiquidStack)params[1]; - break; - } - } - - public PacketTransmitterTransferUpdate() {} - @Override public String getName() { return "TransmitterTransferUpdate"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + activeType = (TransmitterTransferType)data[0]; + tileEntity = (TileEntity)data[1]; + + switch(activeType) + { + case ENERGY: + break; + case GAS: + gasName = ((EnumGas)data[2]).name; + break; + case LIQUID: + liquidStack = (LiquidStack)data[2]; + break; + } + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception diff --git a/src/minecraft/mekanism/common/network/PacketWeather.java b/src/minecraft/mekanism/common/network/PacketWeather.java index 81cd2e1c0..7e4a9739c 100644 --- a/src/minecraft/mekanism/common/network/PacketWeather.java +++ b/src/minecraft/mekanism/common/network/PacketWeather.java @@ -11,18 +11,19 @@ public class PacketWeather implements IMekanismPacket { public WeatherType activeType; - public PacketWeather(WeatherType type) - { - activeType = type; - } - - public PacketWeather() {} - @Override public String getName() { return "Weather"; } + + @Override + public IMekanismPacket setParams(Object... data) + { + activeType = (WeatherType)data[0]; + + return this; + } @Override public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception @@ -59,10 +60,13 @@ public class PacketWeather implements IMekanismPacket { /** Clears the world of all weather effects, including rain, lightning, and clouds. */ CLEAR, + /** Sets the world's weather to thunder. This may or may not include rain. */ STORM, + /** Sets the world's weather to both thunder AND rain. */ HAZE, + /** Sets the world's weather to rain. */ RAIN } diff --git a/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java b/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java index e692cf269..c60a47f5e 100644 --- a/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/client/GuiElectrolyticSeparator.java @@ -62,7 +62,7 @@ public class GuiElectrolyticSeparator extends GuiContainer data.add((byte)0); data.add(nameToSet); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } else if(xAxis > 8 && xAxis < 17 && yAxis > 73 && yAxis < 82) @@ -86,7 +86,7 @@ public class GuiElectrolyticSeparator extends GuiContainer data.add((byte)1); data.add(nameToSet); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity(Object3D.get(tileEntity), data)); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F); } } diff --git a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java index 7c9f79b1c..8c889c585 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java @@ -36,8 +36,6 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; import universalelectricity.core.item.IItemElectric; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import com.google.common.io.ByteArrayDataInput; @@ -181,7 +179,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { setGas(outputType, getGas(outputType) - (Math.min(getGas(outputType), output) - GasTransmission.emitGasToNetwork(outputType, Math.min(getGas(outputType), output), this, ForgeDirection.getOrientation(facing)))); - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); if(tileEntity instanceof IGasAcceptor) { @@ -210,7 +208,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(new Random().nextInt(3) == 2) { - PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketElectrolyticSeparatorParticle(this), Object3D.get(this), 40D); + PacketHandler.sendPacket(Transmission.CLIENTS_RANGE, new PacketElectrolyticSeparatorParticle().setParams(this), Object3D.get(this), 40D); } } } diff --git a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java index 95e738548..989c03698 100644 --- a/src/minecraft/mekanism/generators/common/TileEntityGenerator.java +++ b/src/minecraft/mekanism/generators/common/TileEntityGenerator.java @@ -19,8 +19,8 @@ import mekanism.common.IActiveState; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; -import mekanism.common.TileEntityElectricBlock; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.TileEntityElectricBlock; import mekanism.common.network.PacketTileEntity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -30,8 +30,6 @@ import net.minecraftforge.common.MinecraftForge; import universalelectricity.core.block.IConductor; import universalelectricity.core.electricity.ElectricityNetworkHelper; import universalelectricity.core.electricity.IElectricityNetwork; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; import buildcraft.api.power.IPowerProvider; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerProvider; @@ -85,7 +83,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(!worldObj.isRemote) { - TileEntity tileEntity = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), ForgeDirection.getOrientation(facing)); + TileEntity tileEntity = Object3D.get(this).getFromSide(ForgeDirection.getOrientation(facing)).getTileEntity(worldObj); if(electricityStored > 0) { @@ -119,9 +117,8 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(!worldObj.isRemote && tileEntity instanceof IConductor) { ForgeDirection outputDirection = ForgeDirection.getOrientation(facing); - TileEntity outputTile = VectorHelper.getTileEntityFromSide(worldObj, new Vector3(this), outputDirection); - IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(outputTile, outputDirection); + IElectricityNetwork outputNetwork = ElectricityNetworkHelper.getNetworkFromTileEntity(tileEntity, outputDirection); if(outputNetwork != null) { @@ -214,7 +211,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(prevActive != active) { - PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity(Object3D.get(this), getNetworkedData(new ArrayList()))); + PacketHandler.sendPacket(Transmission.ALL_CLIENTS, new PacketTileEntity().setParams(Object3D.get(this), getNetworkedData(new ArrayList()))); } prevActive = active; diff --git a/src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java b/src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java index ad09737dc..b1935c8b5 100644 --- a/src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java +++ b/src/minecraft/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java @@ -11,17 +11,16 @@ import com.google.common.io.ByteArrayDataInput; public class PacketElectrolyticSeparatorParticle implements IMekanismPacket { - public int packetId; - public TileEntityElectrolyticSeparator tileEntity; - public PacketElectrolyticSeparatorParticle(TileEntityElectrolyticSeparator tile) + @Override + public IMekanismPacket setParams(Object... data) { - tileEntity = tile; + tileEntity = (TileEntityElectrolyticSeparator)data[0]; + + return this; } - public PacketElectrolyticSeparatorParticle() {} - @Override public String getName() {