diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index a920dec63..8d9ab58a6 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -12,9 +12,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; - -import com.google.common.io.ByteArrayDataInput; - import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; /** @@ -175,22 +172,17 @@ public class Coord4D * @param data - tag compound to read from * @return the Coord4D from the tag compound */ - public static Coord4D read(ByteBuf data) - { - return new Coord4D(data.readInt(), data.readInt(), data.readInt(), data.readInt()); - } - public static Coord4D read(NBTTagCompound tag) { return new Coord4D(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"), tag.getInteger("id")); } /** - * Returns a new Coord4D from a ByteArrayDataInput. + * Returns a new Coord4D from a ByteBuf. * @param dataStream - data input to read from * @return the Coord4D from the data input */ - public static Coord4D read(ByteArrayDataInput dataStream) + public static Coord4D read(ByteBuf dataStream) { return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index eb20b257c..a99774f5e 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -288,7 +288,7 @@ public class ClientTickHandler if(!lastTickUpdate) { ((ItemJetpack)jetpack.getItem()).incrementMode(jetpack); - Mekanism.packetPipeline.sendToServer(new PacketJetpackData(JetpackPacket.MODE)); + Mekanism.packetPipeline.sendToServer(new PacketJetpackData(JetpackPacket.MODE, null, false)); Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); lastTickUpdate = true; } @@ -306,7 +306,7 @@ public class ClientTickHandler if(!lastTickUpdate) { ((ItemScubaTank)scubaTank.getItem()).toggleFlowing(scubaTank); - Mekanism.packetPipeline.sendToServer(new PacketScubaTankData(ScubaTankPacket.MODE)); + Mekanism.packetPipeline.sendToServer(new PacketScubaTankData(ScubaTankPacket.MODE, null, false)); Minecraft.getMinecraft().sndManager.playSoundFX("mekanism:etc.Hydraulic", 1.0F, 1.0F); lastTickUpdate = true; } diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index fef8469ef..ca3c5629b 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -261,13 +261,13 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT, Coord4D.get(tile))); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile))); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile), 0, 0)); } } @@ -279,7 +279,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 80 && xAxis <= 96 && yAxis >= 49 && yAxis <= 65) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button)); + Mekanism.packetPipeline.sendToServer(new PacketConfigurationUpdate(ConfigurationPacket.EJECT_COLOR, Coord4D.get(tile), button, 0)); } for(int i = 0; i < slotPosMap.size(); i++) diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 0683f7145..c0d826c9a 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -3,7 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityGasTank; diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 07c32e9bb..424d170aa 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -103,7 +103,7 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper protected boolean isMouseOverSlot(Slot slot, int mouseX, int mouseY) { - return isPointInRegion(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY); + return func_146978_c(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY);//isPointInRegion } @Override diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 095ce2356..837001d7c 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -104,7 +104,7 @@ public class GuiRobitCrafting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 30 && yAxis <= 48) @@ -114,19 +114,19 @@ public class GuiRobitCrafting extends GuiMekanism else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 50 && yAxis <= 68) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 2, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 23, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 70 && yAxis <= 88) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 3, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 24, mc.theWorld, entityId, 0, 0); } else if(xAxis >= 179 && xAxis <= 197 && yAxis >= 90 && yAxis <= 108) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, entityId)); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 4, entityId, null)); mc.thePlayer.openGui(Mekanism.instance, 25, mc.theWorld, entityId, 0, 0); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 90e0fa340..c41bb6934 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -104,13 +104,13 @@ public class GuiRobitInventory extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } 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) @@ -120,13 +120,13 @@ public class GuiRobitInventory extends GuiMekanism 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); } } diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 3651a4918..b6df585ea 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -111,19 +111,19 @@ public class GuiRobitSmelting extends GuiMekanism if(xAxis >= 179 && xAxis <= 197 && yAxis >= 10 && yAxis <= 28) { playClickSound(); - Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId())); + Mekanism.packetPipeline.sendToServer(new PacketRobit(RobitPacketType.GUI, 0, robit.getEntityId(), null)); mc.thePlayer.openGui(Mekanism.instance, 21, mc.theWorld, robit.getEntityId(), 0, 0); } 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) @@ -133,7 +133,7 @@ public class GuiRobitSmelting extends GuiMekanism 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); } } diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 81791b09d..c518ff25c 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -26,8 +26,8 @@ public class CommonPlayerTracker { 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.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL, null, false), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)player); Mekanism.logger.info((String) "Sent config to '" + player.getDisplayName() + ".'"); } @@ -52,8 +52,8 @@ public class CommonPlayerTracker if(!event.player.worldObj.isRemote) { - Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), (EntityPlayerMP)event.player); - Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), (EntityPlayerMP)event.player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL, null, false), (EntityPlayerMP)event.player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)event.player); } } @@ -63,8 +63,8 @@ public class CommonPlayerTracker if(!player.worldObj.isRemote) { - Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL), (EntityPlayerMP)player); - Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketJetpackData(JetpackPacket.FULL, null, false), (EntityPlayerMP)player); + Mekanism.packetPipeline.sendTo(new PacketScubaTankData(ScubaTankPacket.FULL, null, false), (EntityPlayerMP)player); } } } diff --git a/src/main/java/mekanism/common/IModule.java b/src/main/java/mekanism/common/IModule.java index c97b8a8d4..9302c203c 100644 --- a/src/main/java/mekanism/common/IModule.java +++ b/src/main/java/mekanism/common/IModule.java @@ -1,9 +1,8 @@ package mekanism.common; -import java.io.DataOutputStream; -import java.io.IOException; +import io.netty.buffer.ByteBuf; -import com.google.common.io.ByteArrayDataInput; +import java.io.IOException; /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a Mekanism module. @@ -27,13 +26,13 @@ public interface IModule /** * Writes this module's configuration to a ConfigSync packet. - * @param dataStream - the DataOutputStream of the sync packet + * @param dataStream - the ByteBuf of the sync packet */ - public void writeConfig(DataOutputStream dataStream) throws IOException; + public void writeConfig(ByteBuf dataStream) throws IOException; /** * Reads this module's configuration from the original ConfigSync packet. - * @param dataStream - the incoming ByteArrayDataInput of the sync packet + * @param dataStream - the incoming ByteBuf of the sync packet */ - public void readConfig(ByteArrayDataInput dataStream) throws IOException; + public void readConfig(ByteBuf dataStream) throws IOException; } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 66e2dcf44..7a4784d49 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.IConfigurable; import mekanism.common.IInvConfiguration; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricChest; @@ -97,7 +97,7 @@ public class ItemConfigurator extends ItemEnergized implements IToolWrench if(config instanceof TileEntityBasicBlock) { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Coord4D.get(tileEntity), 50D); + Mekanism.packetPipeline.sendToAllAround(new PacketTileEntity(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), Coord4D.get(tileEntity).getTargetPoint(50D)); } return true; diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 4e8263f35..f4238ceb3 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -3,7 +3,6 @@ package mekanism.common.multipart; import java.util.HashSet; import java.util.Set; -import codechicken.multipart.*; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -11,12 +10,12 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; import mekanism.common.IConfigurable; -import mekanism.common.PacketHandler; +import mekanism.common.Mekanism; import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.PacketType; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import codechicken.multipart.TileMultipart; public abstract class PartTransmitter> extends PartSidedPipe implements IGridTransmitter, IConfigurable { diff --git a/src/main/java/mekanism/common/network/MekanismPacket.java b/src/main/java/mekanism/common/network/MekanismPacket.java index d8f01979b..59570fb81 100644 --- a/src/main/java/mekanism/common/network/MekanismPacket.java +++ b/src/main/java/mekanism/common/network/MekanismPacket.java @@ -24,7 +24,7 @@ public abstract class MekanismPacket * @param ctx - channel context * @param buffer - the buffer to encode into */ - public abstract void write(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception; + public abstract void write(ChannelHandlerContext ctx, ByteBuf dataStream) throws Exception; /** * Decode the packet data from the ByteBuf stream. Complex data sets may @@ -34,7 +34,7 @@ public abstract class MekanismPacket * @param ctx - channel context * @param buffer - the buffer to decode from */ - public abstract void read(ChannelHandlerContext ctx, ByteBuf buffer) throws Exception; + public abstract void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) throws Exception; /** * Handle a packet on the client side. Note this occurs after decoding has diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 55ad15e26..07607fb40 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -15,21 +15,8 @@ import com.google.common.io.ByteArrayDataInput; public class PacketBoxBlacklist extends MekanismPacket { - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception - { - MekanismAPI.getBoxIgnore().clear(); - - int amount = dataStream.readInt(); - - for(int i = 0; i < amount; i++) - { - MekanismAPI.addBoxBlacklist(Block.getBlockById(dataStream.readInt()), dataStream.readInt()); - } - - System.out.println("[Mekanism] Received Cardboard Box blacklist entries from server (" + amount + " total)"); - } - - public void write(DataOutputStream dataStream) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) { dataStream.writeInt(MekanismAPI.getBoxIgnore().size()); @@ -41,15 +28,18 @@ public class PacketBoxBlacklist extends MekanismPacket } @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { + MekanismAPI.getBoxIgnore().clear(); - } + int amount = dataStream.readInt(); - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { + for(int i = 0; i < amount; i++) + { + MekanismAPI.addBoxBlacklist(Block.getBlockById(dataStream.readInt()), dataStream.readInt()); + } + System.out.println("[Mekanism] Received Cardboard Box blacklist entries from server (" + amount + " total)"); } @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index da49422ca..7d87efaa7 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -13,7 +13,63 @@ import io.netty.channel.ChannelHandlerContext; public class PacketConfigSync extends MekanismPacket { - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) throws Exception + { + dataStream.writeBoolean(Mekanism.osmiumGenerationEnabled); + dataStream.writeBoolean(Mekanism.copperGenerationEnabled); + dataStream.writeBoolean(Mekanism.tinGenerationEnabled); + dataStream.writeBoolean(Mekanism.disableBCSteelCrafting); + dataStream.writeBoolean(Mekanism.disableBCBronzeCrafting); + dataStream.writeBoolean(Mekanism.updateNotifications); + dataStream.writeBoolean(Mekanism.controlCircuitOreDict); + dataStream.writeBoolean(Mekanism.logPackets); + dataStream.writeBoolean(Mekanism.dynamicTankEasterEgg); + dataStream.writeBoolean(Mekanism.voiceServerEnabled); + dataStream.writeBoolean(Mekanism.forceBuildcraft); + dataStream.writeBoolean(Mekanism.cardboardSpawners); + dataStream.writeInt(Mekanism.obsidianTNTDelay); + dataStream.writeInt(Mekanism.obsidianTNTBlastRadius); + dataStream.writeInt(Mekanism.UPDATE_DELAY); + dataStream.writeInt(Mekanism.osmiumGenerationAmount); + dataStream.writeInt(Mekanism.copperGenerationAmount); + dataStream.writeInt(Mekanism.tinGenerationAmount); + dataStream.writeDouble(Mekanism.FROM_IC2); + dataStream.writeDouble(Mekanism.TO_IC2); + dataStream.writeDouble(Mekanism.FROM_BC); + dataStream.writeDouble(Mekanism.TO_BC); + dataStream.writeDouble(Mekanism.FROM_H2); + dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE); + dataStream.writeInt(Mekanism.VOICE_PORT); + dataStream.writeInt(Mekanism.maxUpgradeMultiplier); + + dataStream.writeDouble(Mekanism.enrichmentChamberUsage); + dataStream.writeDouble(Mekanism.osmiumCompressorUsage); + dataStream.writeDouble(Mekanism.combinerUsage); + dataStream.writeDouble(Mekanism.crusherUsage); + dataStream.writeDouble(Mekanism.factoryUsage); + dataStream.writeDouble(Mekanism.metallurgicInfuserUsage); + dataStream.writeDouble(Mekanism.purificationChamberUsage); + dataStream.writeDouble(Mekanism.energizedSmelterUsage); + dataStream.writeDouble(Mekanism.digitalMinerUsage); + dataStream.writeDouble(Mekanism.rotaryCondensentratorUsage); + dataStream.writeDouble(Mekanism.oxidationChamberUsage); + dataStream.writeDouble(Mekanism.chemicalInfuserUsage); + dataStream.writeDouble(Mekanism.chemicalInjectionChamberUsage); + dataStream.writeDouble(Mekanism.precisionSawmillUsage); + dataStream.writeDouble(Mekanism.chemicalDissolutionChamberUsage); + dataStream.writeDouble(Mekanism.chemicalWasherUsage); + dataStream.writeDouble(Mekanism.chemicalCrystallizerUsage); + dataStream.writeDouble(Mekanism.seismicVibratorUsage); + + for(IModule module : Mekanism.modulesLoaded) + { + module.writeConfig(dataStream); + } + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) throws Exception { Mekanism.osmiumGenerationEnabled = dataStream.readBoolean(); Mekanism.copperGenerationEnabled = dataStream.readBoolean(); @@ -72,72 +128,6 @@ public class PacketConfigSync extends MekanismPacket Mekanism.proxy.onConfigSync(); } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeBoolean(Mekanism.osmiumGenerationEnabled); - dataStream.writeBoolean(Mekanism.copperGenerationEnabled); - dataStream.writeBoolean(Mekanism.tinGenerationEnabled); - dataStream.writeBoolean(Mekanism.disableBCSteelCrafting); - dataStream.writeBoolean(Mekanism.disableBCBronzeCrafting); - dataStream.writeBoolean(Mekanism.updateNotifications); - dataStream.writeBoolean(Mekanism.controlCircuitOreDict); - dataStream.writeBoolean(Mekanism.logPackets); - dataStream.writeBoolean(Mekanism.dynamicTankEasterEgg); - dataStream.writeBoolean(Mekanism.voiceServerEnabled); - dataStream.writeBoolean(Mekanism.forceBuildcraft); - dataStream.writeBoolean(Mekanism.cardboardSpawners); - dataStream.writeInt(Mekanism.obsidianTNTDelay); - dataStream.writeInt(Mekanism.obsidianTNTBlastRadius); - dataStream.writeInt(Mekanism.UPDATE_DELAY); - dataStream.writeInt(Mekanism.osmiumGenerationAmount); - dataStream.writeInt(Mekanism.copperGenerationAmount); - dataStream.writeInt(Mekanism.tinGenerationAmount); - dataStream.writeDouble(Mekanism.FROM_IC2); - dataStream.writeDouble(Mekanism.TO_IC2); - dataStream.writeDouble(Mekanism.FROM_BC); - dataStream.writeDouble(Mekanism.TO_BC); - dataStream.writeDouble(Mekanism.FROM_H2); - dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE); - dataStream.writeInt(Mekanism.VOICE_PORT); - dataStream.writeInt(Mekanism.maxUpgradeMultiplier); - - dataStream.writeDouble(Mekanism.enrichmentChamberUsage); - dataStream.writeDouble(Mekanism.osmiumCompressorUsage); - dataStream.writeDouble(Mekanism.combinerUsage); - dataStream.writeDouble(Mekanism.crusherUsage); - dataStream.writeDouble(Mekanism.factoryUsage); - dataStream.writeDouble(Mekanism.metallurgicInfuserUsage); - dataStream.writeDouble(Mekanism.purificationChamberUsage); - dataStream.writeDouble(Mekanism.energizedSmelterUsage); - dataStream.writeDouble(Mekanism.digitalMinerUsage); - dataStream.writeDouble(Mekanism.rotaryCondensentratorUsage); - dataStream.writeDouble(Mekanism.oxidationChamberUsage); - dataStream.writeDouble(Mekanism.chemicalInfuserUsage); - dataStream.writeDouble(Mekanism.chemicalInjectionChamberUsage); - dataStream.writeDouble(Mekanism.precisionSawmillUsage); - dataStream.writeDouble(Mekanism.chemicalDissolutionChamberUsage); - dataStream.writeDouble(Mekanism.chemicalWasherUsage); - dataStream.writeDouble(Mekanism.chemicalCrystallizerUsage); - dataStream.writeDouble(Mekanism.seismicVibratorUsage); - - for(IModule module : Mekanism.modulesLoaded) - { - module.writeConfig(dataStream); - } - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 29e1c7e25..7ce94e68e 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -57,13 +57,41 @@ public class PacketConfigurationUpdate extends MekanismPacket } } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + + dataStream.writeInt(coord4D.dimensionId); + + if(packetType != ConfigurationPacket.EJECT && packetType != ConfigurationPacket.STRICT_INPUT) + { + dataStream.writeInt(clickType); + } + + if(packetType == ConfigurationPacket.SIDE_DATA) + { + dataStream.writeInt(configIndex); + } + + if(packetType == ConfigurationPacket.INPUT_COLOR) + { + dataStream.writeInt(inputSide); + } + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { packetType = ConfigurationPacket.values()[dataStream.readInt()]; coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - TileEntity tile = coord4D.getTileEntity(world); + TileEntity tile = coord4D.getTileEntity(player.worldObj); if(tile instanceof IInvConfiguration) { @@ -142,43 +170,6 @@ public class PacketConfigurationUpdate extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(packetType.ordinal()); - - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - - dataStream.writeInt(coord4D.dimensionId); - - if(packetType != ConfigurationPacket.EJECT && packetType != ConfigurationPacket.STRICT_INPUT) - { - dataStream.writeInt(clickType); - } - - if(packetType == ConfigurationPacket.SIDE_DATA) - { - dataStream.writeInt(configIndex); - } - - if(packetType == ConfigurationPacket.INPUT_COLOR) - { - dataStream.writeInt(inputSide); - } - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketConfiguratorState.java b/src/main/java/mekanism/common/network/PacketConfiguratorState.java index d73928e5e..b5f345c5d 100644 --- a/src/main/java/mekanism/common/network/PacketConfiguratorState.java +++ b/src/main/java/mekanism/common/network/PacketConfiguratorState.java @@ -1,15 +1,10 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.common.item.ItemConfigurator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketConfiguratorState extends MekanismPacket { @@ -20,7 +15,14 @@ public class PacketConfiguratorState extends MekanismPacket state = s; } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeByte(state); + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { byte state = dataStream.readByte(); @@ -32,23 +34,6 @@ public class PacketConfiguratorState extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeByte(state); - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 4bbbb95c5..09f89e017 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -27,8 +27,19 @@ public class PacketDataRequest extends MekanismPacket { coord4D = coord; } + + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + dataStream.writeInt(coord4D.dimensionId); + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { int x = dataStream.readInt(); int y = dataStream.readInt(); @@ -61,27 +72,6 @@ public class PacketDataRequest extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(coord4D.xCoord); - dataStream.writeInt(coord4D.yCoord); - dataStream.writeInt(coord4D.zCoord); - - dataStream.writeInt(coord4D.dimensionId); - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketDigitUpdate.java b/src/main/java/mekanism/common/network/PacketDigitUpdate.java index aeac219e2..353a7cf6f 100644 --- a/src/main/java/mekanism/common/network/PacketDigitUpdate.java +++ b/src/main/java/mekanism/common/network/PacketDigitUpdate.java @@ -22,7 +22,15 @@ public class PacketDigitUpdate extends MekanismPacket digit = dig; } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(index); + dataStream.writeInt(digit); + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { int index = dataStream.readInt(); int digit = dataStream.readInt(); @@ -36,24 +44,6 @@ public class PacketDigitUpdate extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(index); - dataStream.writeInt(digit); - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 2194ae2e9..e47d8bcb1 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -64,54 +64,6 @@ public class PacketDigitalMinerGui extends MekanismPacket } } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception - { - packetType = MinerGuiPacket.values()[dataStream.readInt()]; - - object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - - guiType = dataStream.readInt(); - - if(packetType == MinerGuiPacket.CLIENT || packetType == MinerGuiPacket.CLIENT_INDEX) - { - windowId = dataStream.readInt(); - } - - if(packetType == MinerGuiPacket.SERVER_INDEX || packetType == MinerGuiPacket.CLIENT_INDEX) - { - index = dataStream.readInt(); - } - - if(!world.isRemote) - { - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); - - if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) - { - openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); - } - } - else { - if(object3D.getTileEntity(world) instanceof TileEntityDigitalMiner) - { - try { - if(packetType == MinerGuiPacket.CLIENT) - { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); - } - else if(packetType == MinerGuiPacket.CLIENT_INDEX) - { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); - } - - player.openContainer.windowId = windowId; - } catch(Exception e) { - e.printStackTrace(); - } - } - } - } - public static void openServerGui(MinerGuiPacket t, int guiType, World world, EntityPlayerMP playerMP, Coord4D obj, int i) { Container container = null; @@ -213,7 +165,8 @@ public class PacketDigitalMinerGui extends MekanismPacket return null; } - public void write(DataOutputStream dataStream) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) { dataStream.writeInt(packetType.ordinal()); @@ -237,15 +190,52 @@ public class PacketDigitalMinerGui extends MekanismPacket } @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { + packetType = MinerGuiPacket.values()[dataStream.readInt()]; - } + object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { + guiType = dataStream.readInt(); + if(packetType == MinerGuiPacket.CLIENT || packetType == MinerGuiPacket.CLIENT_INDEX) + { + windowId = dataStream.readInt(); + } + + if(packetType == MinerGuiPacket.SERVER_INDEX || packetType == MinerGuiPacket.CLIENT_INDEX) + { + index = dataStream.readInt(); + } + + if(!player.worldObj.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); + + if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityDigitalMiner) + { + openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); + } + } + else { + if(object3D.getTileEntity(player.worldObj) instanceof TileEntityDigitalMiner) + { + try { + if(packetType == MinerGuiPacket.CLIENT) + { + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, player.worldObj, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); + } + else if(packetType == MinerGuiPacket.CLIENT_INDEX) + { + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, player.worldObj, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); + } + + player.openContainer.windowId = windowId; + } catch(Exception e) { + e.printStackTrace(); + } + } + } } @Override diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index f2d09e2b5..391c17447 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -1,10 +1,13 @@ package mekanism.common.network; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.miner.MinerFilter; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -12,11 +15,6 @@ import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; - import cpw.mods.fml.common.FMLCommonHandler; public class PacketEditFilter extends MekanismPacket @@ -100,7 +98,7 @@ public class PacketEditFilter extends MekanismPacket } @Override - public void read(ChannelHandlerContext ctx, ByteBuf dataStream) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 404a6b554..9a6c1150d 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -1,15 +1,10 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.common.item.ItemElectricBow; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketElectricBowState extends MekanismPacket { @@ -20,7 +15,14 @@ public class PacketElectricBowState extends MekanismPacket fireMode = state; } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeBoolean(fireMode); + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { boolean state = dataStream.readBoolean(); @@ -32,23 +34,6 @@ public class PacketElectricBowState extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeBoolean(fireMode); - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 6a2a6898c..838ef02d4 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -1,11 +1,12 @@ package mekanism.common.network; -import java.io.DataOutputStream; - +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.tile.TileEntityElectricChest; @@ -16,8 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketElectricChest extends MekanismPacket { @@ -87,7 +86,67 @@ public class PacketElectricChest extends MekanismPacket } } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(activeType.ordinal()); + + switch(activeType) + { + case LOCK: + dataStream.writeBoolean(locked); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(obj.xCoord); + dataStream.writeInt(obj.yCoord); + dataStream.writeInt(obj.zCoord); + } + + break; + case PASSWORD: + PacketHandler.writeString(dataStream, password); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(obj.xCoord); + dataStream.writeInt(obj.yCoord); + dataStream.writeInt(obj.zCoord); + } + + break; + case CLIENT_OPEN: + dataStream.writeInt(guiType); + dataStream.writeInt(windowId); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(obj.xCoord); + dataStream.writeInt(obj.yCoord); + dataStream.writeInt(obj.zCoord); + } + + break; + case SERVER_OPEN: + dataStream.writeBoolean(useEnergy); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(obj.xCoord); + dataStream.writeInt(obj.yCoord); + dataStream.writeInt(obj.zCoord); + } + + break; + } + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { ElectricChestPacketType packetType = ElectricChestPacketType.values()[dataStream.readInt()]; @@ -103,7 +162,7 @@ public class PacketElectricChest extends MekanismPacket int y = dataStream.readInt(); int z = dataStream.readInt(); - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(x, y, z); + TileEntityElectricChest tileEntity = (TileEntityElectricChest)player.worldObj.getTileEntity(x, y, z); if(energy) { @@ -158,7 +217,7 @@ public class PacketElectricChest extends MekanismPacket else if(packetType == ElectricChestPacketType.PASSWORD) { try { - String pass = dataStream.readUTF(); + String pass = PacketHandler.readString(dataStream); boolean block = dataStream.readBoolean(); if(block) @@ -167,7 +226,7 @@ public class PacketElectricChest extends MekanismPacket int y = dataStream.readInt(); int z = dataStream.readInt(); - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(x, y, z); + TileEntityElectricChest tileEntity = (TileEntityElectricChest)player.worldObj.getTileEntity(x, y, z); tileEntity.password = pass; tileEntity.authenticated = true; } @@ -197,7 +256,7 @@ public class PacketElectricChest extends MekanismPacket int y = dataStream.readInt(); int z = dataStream.readInt(); - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(x, y, z); + TileEntityElectricChest tileEntity = (TileEntityElectricChest)player.worldObj.getTileEntity(x, y, z); tileEntity.locked = lock; } else { @@ -215,76 +274,6 @@ public class PacketElectricChest extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(activeType.ordinal()); - - switch(activeType) - { - case LOCK: - dataStream.writeBoolean(locked); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(obj.xCoord); - dataStream.writeInt(obj.yCoord); - dataStream.writeInt(obj.zCoord); - } - - break; - case PASSWORD: - dataStream.writeUTF(password); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(obj.xCoord); - dataStream.writeInt(obj.yCoord); - dataStream.writeInt(obj.zCoord); - } - - break; - case CLIENT_OPEN: - dataStream.writeInt(guiType); - dataStream.writeInt(windowId); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(obj.xCoord); - dataStream.writeInt(obj.yCoord); - dataStream.writeInt(obj.zCoord); - } - - break; - case SERVER_OPEN: - dataStream.writeBoolean(useEnergy); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - dataStream.writeInt(obj.xCoord); - dataStream.writeInt(obj.yCoord); - dataStream.writeInt(obj.zCoord); - } - - break; - } - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index 7a1eac062..8a336bc21 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -1,16 +1,15 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + import java.io.DataOutputStream; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PacketJetpackData extends MekanismPacket { @@ -30,7 +29,29 @@ public class PacketJetpackData extends MekanismPacket } } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + if(packetType == JetpackPacket.UPDATE) + { + PacketHandler.writeString(dataStream, username); + dataStream.writeBoolean(value); + } + else if(packetType == JetpackPacket.FULL) + { + dataStream.writeInt(Mekanism.jetpackOn.size()); + + for(String username : Mekanism.jetpackOn) + { + PacketHandler.writeString(dataStream, username); + } + } + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { packetType = JetpackPacket.values()[dataStream.readInt()]; @@ -42,12 +63,12 @@ public class PacketJetpackData extends MekanismPacket for(int i = 0; i < amount; i++) { - Mekanism.jetpackOn.add(dataStream.readUTF()); + Mekanism.jetpackOn.add(PacketHandler.readString(dataStream)); } } else if(packetType == JetpackPacket.UPDATE) { - String username = dataStream.readUTF(); + String username = PacketHandler.readString(dataStream); boolean value = dataStream.readBoolean(); if(value) @@ -58,9 +79,9 @@ public class PacketJetpackData extends MekanismPacket Mekanism.jetpackOn.remove(username); } - if(!world.isRemote) + if(!player.worldObj.isRemote) { - Mekanism.packetPipeline.sendToDimension(new PacketJetpackData(JetpackPacket.UPDATE, username, value), world.provider.dimensionId); + Mekanism.packetPipeline.sendToDimension(new PacketJetpackData(JetpackPacket.UPDATE, username, value), player.worldObj.provider.dimensionId); } } else if(packetType == JetpackPacket.MODE) @@ -74,38 +95,6 @@ public class PacketJetpackData extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(packetType.ordinal()); - - if(packetType == JetpackPacket.UPDATE) - { - dataStream.writeUTF(username); - dataStream.writeBoolean(value); - } - else if(packetType == JetpackPacket.FULL) - { - dataStream.writeInt(Mekanism.jetpackOn.size()); - - for(String username : Mekanism.jetpackOn) - { - dataStream.writeUTF(username); - } - } - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index febc2b1c1..850063ea5 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -1,14 +1,9 @@ package mekanism.common.network; -import java.io.DataOutputStream; - -import mekanism.common.Mekanism; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mekanism.common.Mekanism; +import net.minecraft.entity.player.EntityPlayer; public class PacketKey extends MekanismPacket { @@ -21,7 +16,15 @@ public class PacketKey extends MekanismPacket add = a; } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) + { + dataStream.writeInt(key); + dataStream.writeBoolean(add); + } + + @Override + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { key = dataStream.readInt(); add = dataStream.readBoolean(); @@ -35,24 +38,6 @@ public class PacketKey extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(key); - dataStream.writeBoolean(add); - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index a2503b8ec..6f00697fb 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -61,54 +61,6 @@ public class PacketLogisticalSorterGui extends MekanismPacket } } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception - { - packetType = SorterGuiPacket.values()[dataStream.readInt()]; - - object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - - guiType = dataStream.readInt(); - - if(packetType == SorterGuiPacket.CLIENT || packetType == SorterGuiPacket.CLIENT_INDEX) - { - windowId = dataStream.readInt(); - } - - if(packetType == SorterGuiPacket.SERVER_INDEX || packetType == SorterGuiPacket.CLIENT_INDEX) - { - index = dataStream.readInt(); - } - - if(!world.isRemote) - { - World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); - - if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) - { - openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); - } - } - else { - if(object3D.getTileEntity(world) instanceof TileEntityLogisticalSorter) - { - try { - if(packetType == SorterGuiPacket.CLIENT) - { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); - } - else if(packetType == SorterGuiPacket.CLIENT_INDEX) - { - FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, world, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); - } - - player.openContainer.windowId = windowId; - } catch(Exception e) { - e.printStackTrace(); - } - } - } - } - public static void openServerGui(SorterGuiPacket t, int guiType, World world, EntityPlayerMP playerMP, Coord4D obj, int i) { Container container = null; @@ -192,7 +144,8 @@ public class PacketLogisticalSorterGui extends MekanismPacket return null; } - public void write(DataOutputStream dataStream) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) { dataStream.writeInt(packetType.ordinal()); @@ -216,15 +169,52 @@ public class PacketLogisticalSorterGui extends MekanismPacket } @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { + packetType = SorterGuiPacket.values()[dataStream.readInt()]; - } + object3D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { + guiType = dataStream.readInt(); + if(packetType == SorterGuiPacket.CLIENT || packetType == SorterGuiPacket.CLIENT_INDEX) + { + windowId = dataStream.readInt(); + } + + if(packetType == SorterGuiPacket.SERVER_INDEX || packetType == SorterGuiPacket.CLIENT_INDEX) + { + index = dataStream.readInt(); + } + + if(!player.worldObj.isRemote) + { + World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId); + + if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityLogisticalSorter) + { + openServerGui(packetType, guiType, worldServer, (EntityPlayerMP)player, object3D, index); + } + } + else { + if(object3D.getTileEntity(player.worldObj) instanceof TileEntityLogisticalSorter) + { + try { + if(packetType == SorterGuiPacket.CLIENT) + { + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, player.worldObj, object3D.xCoord, object3D.yCoord, object3D.zCoord, -1)); + } + else if(packetType == SorterGuiPacket.CLIENT_INDEX) + { + FMLCommonHandler.instance().showGuiScreen(getGui(packetType, guiType, player, player.worldObj, object3D.xCoord, object3D.yCoord, object3D.zCoord, index)); + } + + player.openContainer.windowId = windowId; + } catch(Exception e) { + e.printStackTrace(); + } + } + } } @Override diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index 0cc4f0f91..4888957ae 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -72,7 +72,7 @@ public class PacketNewFilter extends MekanismPacket } @Override - public void read(ChannelHandlerContext ctx, ByteBuf dataStream) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); type = dataStream.readByte(); diff --git a/src/main/java/mekanism/common/network/PacketPipeline.java b/src/main/java/mekanism/common/network/PacketPipeline.java index d35d843a2..85df2ccb5 100644 --- a/src/main/java/mekanism/common/network/PacketPipeline.java +++ b/src/main/java/mekanism/common/network/PacketPipeline.java @@ -106,24 +106,30 @@ public class PacketPipeline extends MessageToMessageCodec)tileEntity).getTransmitterNetwork().clientEnergyScale = powerLevel; } } - else if(transmitterType == 2) + else if(packetType == PacketType.GAS) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z); Gas gasType = GasRegistry.getGas(dataStream.readInt()); int amount = dataStream.readInt(); @@ -110,9 +142,9 @@ public class PacketTransmitterUpdate extends MekanismPacket net.didTransfer = didGasTransfer; } } - else if(transmitterType == 3) + else if(packetType == PacketType.FLUID) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z); int type = dataStream.readInt(); Fluid fluidType = type != -1 ? FluidRegistry.getFluid(type) : null; @@ -141,44 +173,6 @@ public class PacketTransmitterUpdate extends MekanismPacket } } - public void write(DataOutputStream dataStream) throws Exception - { - dataStream.writeInt(packetType.ordinal()); - - dataStream.writeInt(tileEntity.xCoord); - dataStream.writeInt(tileEntity.yCoord); - dataStream.writeInt(tileEntity.zCoord); - - switch(packetType) - { - case ENERGY: - dataStream.writeDouble(power); - break; - case GAS: - dataStream.writeInt(gasStack != null ? gasStack.getGas().getID() : -1); - dataStream.writeInt(gasStack != null ? gasStack.amount : 0); - dataStream.writeBoolean(didGasTransfer); - break; - case FLUID: - dataStream.writeInt(fluidStack != null ? fluidStack.getFluid().getID() : -1); - dataStream.writeInt(fluidStack != null ? fluidStack.amount : 0); - dataStream.writeBoolean(didFluidTransfer); - break; - } - } - - @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - - } - @Override public void handleClientSide(EntityPlayer player) { diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index aed83ffb2..8ce84b425 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -15,49 +15,37 @@ public class PacketWalkieTalkieState extends MekanismPacket { public int channel; - public PacketWalkieTalkieState(Object... data) + public PacketWalkieTalkieState(int chan) { - channel = (Integer)data[0]; + channel = chan; } - public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception - { - int chan = dataStream.readInt(); - - ItemStack itemstack = player.getCurrentEquippedItem(); - - if(itemstack != null && itemstack.getItem() instanceof ItemWalkieTalkie) - { - ((ItemWalkieTalkie)itemstack.getItem()).setChannel(itemstack, chan); - } - } - - public void write(DataOutputStream dataStream) throws Exception + @Override + public void write(ChannelHandlerContext ctx, ByteBuf dataStream) { dataStream.writeInt(channel); } @Override - public void write(ChannelHandlerContext ctx, ByteBuf buffer) + public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream) { - - } - - @Override - public void read(ChannelHandlerContext ctx, ByteBuf buffer) - { - + channel = dataStream.readInt(); } @Override public void handleClientSide(EntityPlayer player) { - + } @Override public void handleServerSide(EntityPlayer player) { + ItemStack itemstack = player.getCurrentEquippedItem(); + if(itemstack != null && itemstack.getItem() instanceof ItemWalkieTalkie) + { + ((ItemWalkieTalkie)itemstack.getItem()).setChannel(itemstack, channel); + } } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index ae86d4def..f89fd123e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,6 +1,7 @@ package mekanism.generators.common; -import java.io.DataOutputStream; +import io.netty.buffer.ByteBuf; + import java.io.IOException; import mekanism.api.gas.FuelHandler; @@ -22,10 +23,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; - import buildcraft.api.fuels.IronEngineFuel; -import com.google.common.io.ByteArrayDataInput; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -161,7 +159,7 @@ public class MekanismGenerators implements IModule } @Override - public void writeConfig(DataOutputStream dataStream) throws IOException + public void writeConfig(ByteBuf dataStream) throws IOException { dataStream.writeDouble(advancedSolarGeneration); dataStream.writeDouble(bioGeneration); @@ -171,7 +169,7 @@ public class MekanismGenerators implements IModule } @Override - public void readConfig(ByteArrayDataInput dataStream) throws IOException + public void readConfig(ByteBuf dataStream) throws IOException { advancedSolarGeneration = dataStream.readDouble(); bioGeneration = dataStream.readDouble(); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 859564219..b0b968c19 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,9 +1,6 @@ package mekanism.tools.common; -import java.io.DataOutputStream; - -import com.google.common.io.ByteArrayDataInput; - +import io.netty.buffer.ByteBuf; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.Version; @@ -18,15 +15,14 @@ import mekanism.tools.item.ItemMekanismSword; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -808,8 +804,8 @@ public class MekanismTools implements IModule } @Override - public void writeConfig(DataOutputStream dataStream) {} + public void writeConfig(ByteBuf dataStream) {} @Override - public void readConfig(ByteArrayDataInput dataStream) {} + public void readConfig(ByteBuf dataStream) {} }