diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index e9a117f9d..575f24455 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -46,7 +46,7 @@ public class GuiRobitMain extends GuiMekanism { if(nameChangeField.getText() != null && !nameChangeField.getText().isEmpty()) { - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.NAME, nameChangeField.getText(), robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.NAME, robit.getEntityId(), 0, nameChangeField.getText())); toggleNameChange(); nameChangeField.setText(""); } @@ -271,31 +271,31 @@ public class GuiRobitMain extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 1, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 22, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, robit.getEntityId(), 0, 0); } else if(xAxis >= 152 && xAxis <= 170 && yAxis >= 54 && yAxis <= 72) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.FOLLOW, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.FOLLOW, robit.getEntityId(), 0, null)); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 54 && yAxis <= 72) { @@ -305,13 +305,13 @@ public class GuiRobitMain extends GuiMekanism else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 16 && yAxis <= 34) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GO_HOME, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GO_HOME, robit.getEntityId(), 0, null)); mc.displayGuiScreen(null); } else if(xAxis >= 6 && xAxis <= 24 && yAxis >= 35 && yAxis <= 53) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.DROP_PICKUP, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.DROP_PICKUP, robit.getEntityId(), 0, null)); } } } diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 7052c2eb0..2ac1f958c 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -47,14 +47,14 @@ public class CommonPlayerTickHandler if(item.getStatus(itemstack) != 2) { item.setStatus(itemstack, 2); - Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(2), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(2), (EntityPlayerMP)player); } } else { if(item.getStatus(itemstack) != 1) { item.setStatus(itemstack, 1); - Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(1), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(1), (EntityPlayerMP)player); } } return; @@ -64,7 +64,7 @@ public class CommonPlayerTickHandler if(item.getStatus(itemstack) != 3) { item.setStatus(itemstack, 3); - Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(3), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(3), (EntityPlayerMP)player); } return; } @@ -72,7 +72,7 @@ public class CommonPlayerTickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), (EntityPlayerMP)player); } return; } @@ -81,7 +81,7 @@ public class CommonPlayerTickHandler if(item.getStatus(itemstack) != 4) { item.setStatus(itemstack, 4); - Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), player); + Mekanism.packetPipeline.sendTo(new PacketStatusUpdate(4), (EntityPlayerMP)player); } return; } diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 9d73ad956..81791b09d 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,6 +6,7 @@ import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; @@ -23,10 +24,10 @@ public class CommonPlayerTracker { if(!player.worldObj.isRemote) { - Mekanism.packetPipeline.sendTo(new PacketConfigSync(), player); - Mekanism.packetPipeline.sendTo(new PacketBoxBlacklist(), player); - Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), player); - Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketConfigSync(), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketBoxBlacklist(), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), (EntityPlayerMP)player); Mekanism.logger.info((String) "Sent config to '" + player.getDisplayName() + ".'"); } @@ -51,8 +52,8 @@ public class CommonPlayerTracker if(!event.player.worldObj.isRemote) { - Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), event.player); - Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), event.player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), (EntityPlayerMP)event.player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), (EntityPlayerMP)event.player); } } @@ -62,8 +63,8 @@ public class CommonPlayerTracker if(!player.worldObj.isRemote) { - Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), player); - Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 739b63e0e..83e862552 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -742,10 +742,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer } else if(!electricChest.authenticated) { - Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Coord4D.get(electricChest)), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 2, 0, true, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); } else { - Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Coord4D.get(electricChest)), entityplayer); + Mekanism.packetPipeline.sendTo(new PacketElectricChest(ElectricChestPacketType.CLIENT_OPEN, 1, 0, true, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); } return true; diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index f2fd35ba7..8d2520b90 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -121,7 +121,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter refreshConnections(); tile().notifyPartChange(this); player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); - Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tile()), getNetworkedData(new ArrayList())), Coord4D.get(tile()).getTargetPoint(50D)); return true; } diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 1846b22ea..e60285e5d 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -1,5 +1,8 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.io.DataOutputStream; import java.util.ArrayList; @@ -11,13 +14,12 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketConfigurationUpdate extends MekanismPacket { @@ -89,7 +91,7 @@ public class PacketConfigurationUpdate extends MekanismPacket ((IInvConfiguration)tile).getConfiguration()[configIndex] = 0; } - Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), coord4D, 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), coord4D.getTargetPoint(50D)); } else if(packetType == ConfigurationPacket.EJECT_COLOR) { @@ -135,7 +137,7 @@ public class PacketConfigurationUpdate extends MekanismPacket for(EntityPlayer p : ((TileEntityBasicBlock)config).playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), p); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(coord4D, ((ITileNetwork) tile).getNetworkedData(new ArrayList())), (EntityPlayerMP)p); } } } diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleport.java b/src/main/java/mekanism/common/network/PacketPortableTeleport.java index b17e23803..101870f22 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleport.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleport.java @@ -58,7 +58,7 @@ public class PacketPortableTeleport extends MekanismPacket ((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); - Mekanism.packetPipeline.sendToAllAround(new PacketPortalFX(coords), coords, 40D); + Mekanism.packetPipeline.sendToAllAround(new PacketPortalFX(coords), coords.getTargetPoint(40D)); } catch(Exception e) {} } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 4338eca8a..ba945ffa1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -15,9 +15,9 @@ import mekanism.common.PacketHandler; import mekanism.common.network.PacketDataRequest; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -63,7 +63,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench { for(EntityPlayer player : playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 0a64c0704..fc3ef5073 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -28,6 +28,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -216,7 +217,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityElectricBlock impl for(EntityPlayer player : playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index 4910cc54a..1cd9b7bda 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -23,6 +23,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -183,7 +184,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement for(EntityPlayer player : playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 3fbf92b6c..21678255a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -24,6 +24,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -235,7 +236,7 @@ public class TileEntityChemicalWasher extends TileEntityElectricBlock implements for(EntityPlayer player : playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } return; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 5db814291..c64c0857b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -14,13 +14,13 @@ import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -289,7 +289,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp for(EntityPlayer player : playersUsing) { - Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), player); + Mekanism.packetPipeline.sendTo(new PacketTileEntity(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player); } return;