diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index acab94593..1f8f96164 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -4,8 +4,8 @@ import static mekanism.common.block.states.BlockStatePlastic.colorProperty; import java.io.File; import java.io.IOException; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -1110,6 +1110,12 @@ public class ClientProxy extends CommonProxy return Minecraft.getMinecraft().thePlayer; } } + + @Override + public void handlePacket(Runnable runnable, World world) + { + Minecraft.getMinecraft().addScheduledTask(runnable); + } @Override public void renderLaser(World world, Pos3D from, Pos3D to, EnumFacing direction, double energy) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 769f9b980..293c16ee0 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -645,6 +645,14 @@ public class CommonProxy implements IGuiProvider return context.getServerHandler().playerEntity; } + public void handlePacket(Runnable runnable, World world) + { + if(world instanceof WorldServer) + { + ((WorldServer)world).addScheduledTask(runnable); + } + } + public int getGuiId(Block block, int metadata) { if(MachineType.get(block, metadata) != null) diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index bda8b5259..e39adbfa2 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -77,6 +77,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.NetworkRegistry; @@ -263,6 +264,11 @@ public class PacketHandler { return Mekanism.proxy.getPlayer(context); } + + public static void handlePacket(Runnable runnable, World world) + { + Mekanism.proxy.handlePacket(runnable, world); + } /** * Send this message to the specified player. diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 06b57e3d8..56e50242b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -31,77 +31,85 @@ public class PacketConfigurationUpdate implements IMessageHandler())), (EntityPlayerMP)player); + } } } - - if(CapabilityUtils.hasCapability(tileEntity, BaseCapabilities.TILE_NETWORK_CAPABILITY, null)) - { - ITileNetwork network = CapabilityUtils.getCapability(tileEntity, BaseCapabilities.TILE_NETWORK_CAPABILITY, null); - - Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), network.getNetworkedData(new ArrayList())), (EntityPlayerMP)player); - } - } + }, player.worldObj); return null; } diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 05dc5cd3e..283f540f8 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -41,34 +41,40 @@ public class PacketDigitalMinerGui implements IMessageHandler 0) + PacketHandler.handlePacket(new Runnable() { + @Override + public void run() { - if(player.inventory.addItemStackToInventory(upgrade.getStack())) + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); + + if(tileEntity instanceof IUpgradeTile && tileEntity instanceof TileEntityBasicBlock) { - upgradeTile.getComponent().removeUpgrade(upgrade); + IUpgradeTile upgradeTile = (IUpgradeTile)tileEntity; + Upgrade upgrade = Upgrade.values()[message.upgradeType]; + + if(upgradeTile.getComponent().getUpgrades(upgrade) > 0) + { + if(player.inventory.addItemStackToInventory(upgrade.getStack())) + { + upgradeTile.getComponent().removeUpgrade(upgrade); + } + } } } - } + }, player.worldObj); return null; } diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index c310d1399..f1bb10d3a 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -17,65 +17,71 @@ public class PacketRobit implements IMessageHandler { EntityPlayer player = PacketHandler.getPlayer(context); - if(message.activeType == RobitPacketType.GUI) - { - if(message.guiType == 0) + PacketHandler.handlePacket(new Runnable() { + @Override + public void run() { - player.openGui(Mekanism.instance, 21, player.worldObj, message.entityId, 0, 0); + if(message.activeType == RobitPacketType.GUI) + { + if(message.guiType == 0) + { + player.openGui(Mekanism.instance, 21, player.worldObj, message.entityId, 0, 0); + } + else if(message.guiType == 1) + { + player.openGui(Mekanism.instance, 22, player.worldObj, message.entityId, 0, 0); + } + else if(message.guiType == 2) + { + player.openGui(Mekanism.instance, 23, player.worldObj, message.entityId, 0, 0); + } + else if(message.guiType == 3) + { + player.openGui(Mekanism.instance, 24, player.worldObj, message.entityId, 0, 0); + } + else if(message.guiType == 4) + { + player.openGui(Mekanism.instance, 25, player.worldObj, message.entityId, 0, 0); + } + } + else if(message.activeType == RobitPacketType.FOLLOW) + { + EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setFollowing(!robit.getFollowing()); + } + } + else if(message.activeType == RobitPacketType.NAME) + { + EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setCustomNameTag(message.name); + } + } + else if(message.activeType == RobitPacketType.GO_HOME) + { + EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); + + if(robit != null) + { + robit.goHome(); + } + } + else if(message.activeType == RobitPacketType.DROP_PICKUP) + { + EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); + + if(robit != null) + { + robit.setDropPickup(!robit.getDropPickup()); + } + } } - else if(message.guiType == 1) - { - player.openGui(Mekanism.instance, 22, player.worldObj, message.entityId, 0, 0); - } - else if(message.guiType == 2) - { - player.openGui(Mekanism.instance, 23, player.worldObj, message.entityId, 0, 0); - } - else if(message.guiType == 3) - { - player.openGui(Mekanism.instance, 24, player.worldObj, message.entityId, 0, 0); - } - else if(message.guiType == 4) - { - player.openGui(Mekanism.instance, 25, player.worldObj, message.entityId, 0, 0); - } - } - else if(message.activeType == RobitPacketType.FOLLOW) - { - EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setFollowing(!robit.getFollowing()); - } - } - else if(message.activeType == RobitPacketType.NAME) - { - EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setCustomNameTag(message.name); - } - } - else if(message.activeType == RobitPacketType.GO_HOME) - { - EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); - - if(robit != null) - { - robit.goHome(); - } - } - else if(message.activeType == RobitPacketType.DROP_PICKUP) - { - EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId); - - if(robit != null) - { - robit.setDropPickup(!robit.getDropPickup()); - } - } + }, player.worldObj); return null; } diff --git a/src/main/java/mekanism/common/network/PacketSecurityMode.java b/src/main/java/mekanism/common/network/PacketSecurityMode.java index 3ade96c62..71889c130 100644 --- a/src/main/java/mekanism/common/network/PacketSecurityMode.java +++ b/src/main/java/mekanism/common/network/PacketSecurityMode.java @@ -22,28 +22,34 @@ public class PacketSecurityMode implements IMessageHandler)transmitter).getTransmitterNetwork().clientEnergyScale = message.power; - } - } - } - else if(message.packetType == PacketType.GAS) - { - TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS) - { - GasNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); - - if(message.gasType != null) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - net.refGas = message.gasType; + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.ENERGY) + { + ((IGridTransmitter)transmitter).getTransmitterNetwork().clientEnergyScale = message.power; + } } - - net.buffer = message.gasStack; - net.didTransfer = message.didGasTransfer; } - } - } - else if(message.packetType == PacketType.FLUID) - { - TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); - - if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) - { - IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.FLUID) + else if(message.packetType == PacketType.GAS) { - FluidNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); - if(message.fluidType != null) + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - net.refFluid = message.fluidType; - } + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.GAS) + { + GasNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); - net.buffer = message.fluidStack; - net.didTransfer = message.didFluidTransfer; + if(message.gasType != null) + { + net.refGas = message.gasType; + } + + net.buffer = message.gasStack; + net.didTransfer = message.didGasTransfer; + } + } + } + else if(message.packetType == PacketType.FLUID) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); + + if(CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) + { + IGridTransmitter transmitter = CapabilityUtils.getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + + if(transmitter.hasTransmitterNetwork() && transmitter.getTransmissionType() == TransmissionType.FLUID) + { + FluidNetwork net = ((IGridTransmitter)transmitter).getTransmitterNetwork(); + + if(message.fluidType != null) + { + net.refFluid = message.fluidType; + } + + net.buffer = message.fluidStack; + net.didTransfer = message.didFluidTransfer; + } + } } } - } + }, player.worldObj); + return null; }