diff --git a/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java index a2559729..a53fac24 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BasicItemFilterGui.java @@ -14,6 +14,7 @@ import crazypants.enderio.gui.ColorButton; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; import crazypants.util.DyeColor; import crazypants.util.Lang; @@ -140,7 +141,7 @@ public class BasicItemFilterGui { private void sendFilterChange() { updateButtons(); - EnderIO.packetPipeline.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.dir)); } public void deactivate() { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 64fa4698..0b2f2551 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -5,17 +5,16 @@ import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; -import crazypants.enderio.machine.monitor.ItemConduitProbe; import crazypants.enderio.machine.monitor.PacketConduitProbe; +import crazypants.enderio.network.PacketHandler; public class ItemExtractSpeedUpgrade extends Item { public static ItemExtractSpeedUpgrade create() { - EnderIO.packetPipeline.registerPacket(PacketConduitProbe.class); + PacketHandler.INSTANCE.registerMessage(PacketConduitProbe.class, PacketConduitProbe.class, PacketHandler.nextID(), Side.SERVER); ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade(); result.init(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index dd0aae82..4bb7baa8 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.monitor; import static crazypants.enderio.power.PowerInterfaceBC.fromRF; import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; import java.util.List; @@ -17,6 +16,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler.PowerReceiver; import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.TileConduitBundle; @@ -32,7 +33,7 @@ import crazypants.enderio.power.PowerInterfaceBC; import crazypants.enderio.power.PowerInterfaceRF; import crazypants.util.Lang; -public class PacketConduitProbe implements IMessage { +public class PacketConduitProbe implements IMessage, IMessageHandler { private static final String OF = " " + Lang.localize("gui.powerMonitor.of") + " "; private static final String CON_STORAGE = " " + Lang.localize("gui.powerMonitor.monHeading1") + ": "; @@ -107,23 +108,19 @@ public class PacketConduitProbe implements IMessage { } @Override - public void handleClientSide(EntityPlayer player) { - - } - - @Override - public void handleServerSide(EntityPlayer player) { + public IMessage onMessage(PacketConduitProbe message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; World world = player.worldObj; if(world == null) { Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); - return; + return null; } - Block block = world.getBlock(x, y, z); + Block block = world.getBlock(message.x, message.y, message.z); if(block == null) { - return; + return null; } - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(message.x, message.y, message.z); if(te instanceof TileConduitBundle) { sendInfoMessage(player, (TileConduitBundle) te); @@ -144,7 +141,7 @@ public class PacketConduitProbe implements IMessage { } else if(te instanceof IPowerReceptor) { IPowerReceptor pr = (IPowerReceptor) te; - PowerReceiver rec = pr.getPowerReceiver(side); + PowerReceiver rec = pr.getPowerReceiver(message.side); if(rec == null) { player.addChatComponentMessage(new ChatComponentTranslation(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); } else { @@ -154,6 +151,7 @@ public class PacketConduitProbe implements IMessage { } } + return null; } public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) {