diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index e6f556ff..8f8d7f93 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -16,7 +16,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; @@ -32,13 +34,17 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler { static final NumberFormat NF = NumberFormat.getIntegerInstance(); public static BlockHyperCube create() { - //TODO:1.7 - // HyperCubePacketHandler pp = new HyperCubePacketHandler(); - // PacketHandler.instance.addPacketProcessor(pp); - // NetworkRegistry.instance().registerConnectionHandler(pp); + + EnderIO.packetPipeline.registerPacket(PacketChannelList.class); BlockHyperCube result = new BlockHyperCube(); result.init(); + + //TODO:1.7 Not getting the client event + ConnectionHandler ch = new ConnectionHandler(); + FMLCommonHandler.instance().bus().register(ch); + MinecraftForge.EVENT_BUS.register(ch); + return result; } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java new file mode 100644 index 00000000..b3053d4f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/hypercube/ConnectionHandler.java @@ -0,0 +1,25 @@ +package crazypants.enderio.machine.hypercube; + +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; +import crazypants.enderio.EnderIO; + +public class ConnectionHandler { + + //to lazy to create a new class + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + EnderIO.packetPipeline.sendTo(new PacketChannelList(evt.player, true), (EntityPlayerMP) evt.player); + EnderIO.packetPipeline.sendTo(new PacketChannelList(evt.player, false), (EntityPlayerMP) evt.player); + } + + @SubscribeEvent + public void onDisconnectedFromServer(ClientDisconnectionFromServerEvent evt) { + //TODO:1.7 this is never called + System.out.println("################################################################### BlockHyperCube.onDisconnectedFromServer: "); + ClientChannelRegister.instance.reset(); + } + +} diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 9ccd7bd3..370e6de9 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -119,26 +119,7 @@ public class GuiHyperCube extends GuiScreenBase { fluidB = new IconButtonEIO(this, FLUID_MODE_BUTTON_ID, x, y, IconEIO.WRENCH_OVERLAY_FLUID); fluidB.setIconMargin(3, 3); - //TODO:1.7 x += 24; - // rsB = new RedstoneModeButton(this, 99, x, y, new IRedstoneModeControlable() { - // - // @Override - // public void setRedstoneControlMode(RedstoneControlMode mode) { - // RedstoneControlMode curMode = getRedstoneControlMode(); - // cube.setRedstoneControlMode(mode); - // if(curMode != mode) { - // Packet pkt = HyperCubePacketHandler.createRedstonePacket(cube); - // PacketDispatcher.sendPacketToServer(pkt); - // } - // - // } - // - // @Override - // public RedstoneControlMode getRedstoneControlMode() { - // return cube.getRedstoneControlMode(); - // } - // }); rsB = new RedstoneModeButton(this, 99, x, y, te, new BlockCoord(te)); updateIoButtons(); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubePacketHandler.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubePacketHandler.java index cb9870fe..d51da795 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubePacketHandler.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubePacketHandler.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.hypercube; +import ibxm.Player; + import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -9,36 +11,18 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.NetLoginHandler; -import net.minecraft.network.packet.NetHandler; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet1Login; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IConnectionHandler; -import cpw.mods.fml.common.network.PacketDispatcher; -import cpw.mods.fml.common.network.Player; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.IPacketProcessor; import crazypants.enderio.Log; import crazypants.enderio.PacketHandler; -import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; public class HyperCubePacketHandler implements IPacketProcessor, IConnectionHandler { - @Override - public boolean canProcessPacket(int packetID) { - return PacketHandler.ID_TRANSCEIVER_IO_MODE == packetID || PacketHandler.ID_TRANSCEIVER_PUBLIC_CHANNEL_LIST == packetID - || PacketHandler.ID_TRANSCEIVER_ADD_REMOVE_CHANNEL == packetID || PacketHandler.ID_TRANSCEIVER_PRIVATE_CHANNEL_LIST == packetID - || PacketHandler.ID_TRANSCEIVER_CHANNEL_SELECTED == packetID || PacketHandler.ID_TRANSCEIVER_REDSTONE_MODE == packetID; - } - @Override public void processPacket(int packetID, INetworkManager manager, DataInputStream data, Player player) throws IOException { if(packetID == PacketHandler.ID_TRANSCEIVER_IO_MODE) { @@ -51,55 +35,9 @@ public class HyperCubePacketHandler implements IPacketProcessor, IConnectionHand handlePrivateChannelPacket(data, manager, player); } else if(packetID == PacketHandler.ID_TRANSCEIVER_CHANNEL_SELECTED) { handleChannelSelectedPacket(data, manager, player); - } else if(packetID == PacketHandler.ID_TRANSCEIVER_REDSTONE_MODE) { - handleChannelRedstonePacket(data, manager, player); } } - public static Packet createRedstonePacket(TileHyperCube cube) { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - try { - dos.writeInt(PacketHandler.ID_TRANSCEIVER_REDSTONE_MODE); - dos.writeInt(cube.xCoord); - dos.writeInt(cube.yCoord); - dos.writeInt(cube.zCoord); - dos.writeShort(cube.getRedstoneControlMode().ordinal()); - } catch (IOException e) { - // never thrown - } - Packet250CustomPayload pkt = new Packet250CustomPayload(); - pkt.channel = PacketHandler.CHANNEL; - pkt.data = bos.toByteArray(); - pkt.length = bos.size(); - pkt.isChunkDataPacket = true; - return pkt; - } - - private void handleChannelRedstonePacket(DataInputStream data, INetworkManager manager, Player player) throws IOException { - if(!(player instanceof EntityPlayer)) { - Log.warn("handleChannelRedstonePacket: Could not handle packet as player not an entity player."); - return; - } - World world = ((EntityPlayer) player).worldObj; - if(world == null) { - Log.warn("handleChannelRedstonePacket: Could not handle packet as player world was null."); - return; - } - - int x = data.readInt(); - int y = data.readInt(); - int z = data.readInt(); - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileHyperCube)) { - Log.warn("handleChannelRedstonePacket: Could not handle packet as TileEntity was not a HyperCube."); - return; - } - TileHyperCube hc = (TileHyperCube) te; - short ord = data.readShort(); - hc.setRedstoneControlMode(RedstoneControlMode.values()[ord]); - } - public static Packet createChannelSelectedPacket(TileHyperCube cube, Channel channel) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos); @@ -161,45 +99,6 @@ public class HyperCubePacketHandler implements IPacketProcessor, IConnectionHand hc.setChannel(new Channel(name, user)); } - public static Packet createUserChannelListPacket(String username) { - - List channels = HyperCubeRegister.instance.getChannelsForUser(username); - if(channels.isEmpty()) { - return null; - } - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - try { - dos.writeInt(PacketHandler.ID_TRANSCEIVER_PRIVATE_CHANNEL_LIST); - dos.writeUTF(username); - dos.writeInt(channels.size()); - for (Channel channel : channels) { - dos.writeUTF(channel.name); - } - } catch (IOException e) { - // never thrown - } - - Packet250CustomPayload pkt = new Packet250CustomPayload(); - pkt.channel = PacketHandler.CHANNEL; - pkt.data = bos.toByteArray(); - pkt.length = bos.size(); - pkt.isChunkDataPacket = true; - return pkt; - - } - - private void handlePrivateChannelPacket(DataInputStream data, INetworkManager manager, Player player) throws IOException { - - String user = data.readUTF(); - int numChannels = data.readInt(); - List channels = new ArrayList(); - for (int i = 0; i < numChannels; i++) { - channels.add(new Channel(data.readUTF(), user)); - } - ClientChannelRegister.instance.setPrivateChannels(channels); - } - public static Packet createAddRemoveChannelPacket(Channel channel, boolean isAdd) { ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos); @@ -322,48 +221,4 @@ public class HyperCubePacketHandler implements IPacketProcessor, IConnectionHand } - @Override - public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { - Packet pkt = createPublicChannelListPacket(); - PacketDispatcher.sendPacketToPlayer(pkt, player); - - if(player instanceof EntityPlayerMP) { - EntityPlayerMP ep = (EntityPlayerMP) player; - pkt = createUserChannelListPacket(ep.username); - if(pkt != null) { - PacketDispatcher.sendPacketToPlayer(pkt, player); - } - } else { - - Log.warn("HyperCubePacketHandler.playerLoggedIn: Could not determine player user name"); - } - - } - - @Override - public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) { - return null; - } - - @Override - public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { - } - - @Override - public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) { - } - - @Override - public void connectionClosed(INetworkManager manager) { - Side side = FMLCommonHandler.instance().getEffectiveSide(); - if(side == Side.CLIENT) { - ClientChannelRegister.instance.reset(); - } - - } - - @Override - public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { - } - } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java new file mode 100644 index 00000000..f02d6dd3 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -0,0 +1,90 @@ +package crazypants.enderio.machine.hypercube; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.common.network.ByteBufUtils; +import crazypants.enderio.network.IPacketEio; + +public class PacketChannelList implements IPacketEio { + + private boolean isPrivate; + private List channels; + private String userId; + + public PacketChannelList() { + } + + public PacketChannelList(EntityPlayer player, boolean isPrivate) { + this(player.getGameProfile().getId(), isPrivate); + } + + public PacketChannelList(String userId, boolean isPrivate) { + this.userId = userId; + this.isPrivate = isPrivate; + if(isPrivate && userId == null || userId.trim().length() == 0) { + throw new RuntimeException("Null user ID."); + } + + List res; + if(isPrivate) { + res = HyperCubeRegister.instance.getChannelsForUser(userId); + } else { + res = HyperCubeRegister.instance.getPublicChannels(); + } + + if(res != null && !res.isEmpty()) { + channels = new ArrayList(res); + } else { + channels = new ArrayList(); + } + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + buffer.writeBoolean(isPrivate); + if(isPrivate) { + ByteBufUtils.writeUTF8String(buffer, userId); + } + buffer.writeInt(channels.size()); + for (Channel channel : channels) { + ByteBufUtils.writeUTF8String(buffer, channel.name); + } + + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + isPrivate = buffer.readBoolean(); + if(isPrivate) { + userId = ByteBufUtils.readUTF8String(buffer); + } else { + userId = null; + } + int numChannels = buffer.readInt(); + channels = new ArrayList(); + for (int i = 0; i < numChannels; i++) { + channels.add(new Channel(ByteBufUtils.readUTF8String(buffer), userId)); + } + + } + + @Override + public void handleClientSide(EntityPlayer player) { + if(isPrivate) { + ClientChannelRegister.instance.setPrivateChannels(channels); + } else { + ClientChannelRegister.instance.setPublicChannels(channels); + } + } + + @Override + public void handleServerSide(EntityPlayer player) { + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 2c8a3453..5d6340f9 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -14,8 +15,8 @@ import crazypants.util.DyeColor; public class BlockPowerMonitor extends AbstractMachineBlock implements ITileEntityProvider { public static BlockPowerMonitor create() { - //TODO:1.7 - //PacketHandler.instance.addPacketProcessor(new PowerMonitorPacketHandler()); + + EnderIO.packetPipeline.registerPacket(PacketPowerMonitor.class); BlockPowerMonitor result = new BlockPowerMonitor(); result.init(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java index 127141dd..8c1b98f8 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/src/main/java/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java @@ -1,41 +1,13 @@ package crazypants.enderio.machine.monitor; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import cpw.mods.fml.common.network.Player; -import crazypants.enderio.IPacketProcessor; -import crazypants.enderio.Log; -import crazypants.enderio.PacketHandler; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.TileConduitBundle; -import crazypants.enderio.conduit.item.IItemConduit; -import crazypants.enderio.conduit.item.ItemConduitNetwork; -import crazypants.enderio.conduit.power.IPowerConduit; -import crazypants.enderio.conduit.power.NetworkPowerManager; -import crazypants.enderio.conduit.power.PowerConduitNetwork; -import crazypants.enderio.conduit.power.PowerTracker; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.util.Lang; -public class MJReaderPacketHandler implements IPacketProcessor { +public class MJReaderPacketHandler { static final MJReaderPacketHandler instance = new MJReaderPacketHandler(); @@ -61,19 +33,17 @@ public class MJReaderPacketHandler implements IPacketProcessor { private static final String CUR_REQUEST = " " + Lang.localize("gui.mjReader.currentRequest") + ": ";; public static boolean canCreatePacket(World world, int x, int y, int z) { - int id = world.getBlockId(x, y, z); - TileEntity te = world.getTileEntity(x, y, z); - if(id <= 0) { - return false; - } - Block block = Block.blocksList[id]; + Block block = world.getBlock(x, y, z); if(block == null) { return false; } - if(te instanceof TileConduitBundle) { - TileConduitBundle tcb = (TileConduitBundle) te; - return tcb.getConduit(IPowerConduit.class) != null || tcb.getConduit(IItemConduit.class) != null; - } + TileEntity te = world.getTileEntity(x, y, z); + //TODO: 1.7 + + // if(te instanceof TileConduitBundle) { + // TileConduitBundle tcb = (TileConduitBundle) te; + // return tcb.getConduit(IPowerConduit.class) != null || tcb.getConduit(IItemConduit.class) != null; + // } if(te instanceof IInternalPowerReceptor) { return true; } @@ -83,304 +53,277 @@ public class MJReaderPacketHandler implements IPacketProcessor { return false; } - public static Packet createInfoRequestPacket(int x, int y, int z, int side) { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - try { - dos.writeInt(PacketHandler.ID_MJ_READER_INFO_REQUEST); - dos.writeInt(x); - dos.writeInt(y); - dos.writeInt(z); - dos.writeInt(side); - } catch (IOException e) { - // never thrown - } - Packet250CustomPayload pkt = new Packet250CustomPayload(); - pkt.channel = PacketHandler.CHANNEL; - pkt.data = bos.toByteArray(); - pkt.length = bos.size(); - pkt.isChunkDataPacket = true; - return pkt; - } + // public static Packet createInfoRequestPacket(int x, int y, int z, int side) { + // + // dos.writeInt(x); + // dos.writeInt(y); + // dos.writeInt(z); + // dos.writeInt(side); + // + // } - @Override - public boolean canProcessPacket(int packetID) { - return PacketHandler.ID_MJ_READER_INFO_REQUEST == packetID; - } - - @Override - public void processPacket(int packetID, INetworkManager manager, DataInputStream data, Player player) throws IOException { - if(packetID == PacketHandler.ID_MJ_READER_INFO_REQUEST) { - sendInfoMessage(data, player); - } else { - Log.error("MJReaderPacketHandler.processPacket: Recieved unkown packet with ID " + packetID); - } - } - - private void sendInfoMessage(DataInputStream data, Player p) throws IOException { - int x = data.readInt(); - int y = data.readInt(); - int z = data.readInt(); - int side = data.readInt(); - - EntityPlayer player = (EntityPlayer) p; - World world = player.worldObj; - if(world == null) { - Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); - return; - } - - int id = world.getBlockId(x, y, z); - TileEntity te = world.getTileEntity(x, y, z); - if(id <= 0) { - Log.warn("MJReaderPacketHandler.sendInfoMessage: Invalid block id " + id); - return; - } - Block block = Block.blocksList[id]; - if(block == null) { - Log.warn("MJReaderPacketHandler.sendInfoMessage: Null block for is " + id); - return; - } - - if(te instanceof TileConduitBundle) { - - sendInfoMessage(player, (TileConduitBundle) te); - - } else if(te instanceof IInternalPowerReceptor) { - - IInternalPowerReceptor pr = (IInternalPowerReceptor) te; - PowerHandler ph = pr.getPowerHandler(); - if(ph == null) { - player.sendChatToPlayer(ChatMessageComponent.createFromText(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); - } - - sendPowerReciptorInfo(player, block, ph.getEnergyStored(), ph.getMaxEnergyStored(), ph.getMinEnergyReceived(), ph.getMaxEnergyReceived(), ph - .getPowerReceiver().powerRequest()); - - } else if(te instanceof IPowerReceptor) { - - IPowerReceptor pr = (IPowerReceptor) te; - PowerReceiver rec = pr.getPowerReceiver(ForgeDirection.values()[side]); - if(rec == null) { - player.sendChatToPlayer(ChatMessageComponent.createFromText(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); - } else { - sendPowerReciptorInfo(player, block, rec.getEnergyStored(), rec.getMaxEnergyStored(), rec.getMinEnergyReceived(), rec.getMaxEnergyReceived(), - rec.powerRequest()); - } - - } - - } - - public void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { - - if(tcb.getConduit(IItemConduit.class) != null) { - sendInfoMessage(player, tcb.getConduit(IItemConduit.class), null); - } - IPowerConduit conduit = tcb.getConduit(IPowerConduit.class); - if(conduit != null) { - sendInfoMessage(player, conduit); - } - } - - public void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { - PowerConduitNetwork pcn = (PowerConduitNetwork) conduit.getNetwork(); - NetworkPowerManager pm = pcn.getPowerManager(); - PowerTracker tracker = pm.getTracker(conduit); - if(tracker != null) { - sendPowerConduitInfo(player, conduit, tracker); - } else { - sendInfoMessage(player, pm); - } - } - - public void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - - if(conduit.getExternalConnections().isEmpty()) { - sb.append(ITEM_HEADING); - sb.append(" "); - sb.append(ITEM_NO_CONNECTIONS); - sb.append("\n"); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - return; - } - for (ForgeDirection dir : conduit.getExternalConnections()) { - ConnectionMode mode = conduit.getConectionMode(dir); - - sb.append(ITEM_HEADING); - sb.append(" "); - sb.append(Lang.localize("gui.mjReader.connectionDir")); - sb.append(" "); - sb.append(dir); - sb.append("\n"); - - ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); - if(mode.acceptsInput()) { - color = "\u00A79 "; - sb.append(color); - - if(input == null) { - sb.append(Lang.localize("gui.mjReader.extractedItems")); - } else { - sb.append(Lang.localize("gui.mjReader.extractedItem")); - sb.append(" "); - sb.append(input.getDisplayName()); - } - sb.append(" "); - List targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), input); - if(targets.isEmpty()) { - sb.append(" "); - sb.append(Lang.localize("gui.mjReader.noOutputs")); - sb.append(".\n"); - } else { - sb.append(" "); - sb.append(Lang.localize("gui.mjReader.insertedInto")); - sb.append("\n"); - for (String str : targets) { - sb.append(" - "); - sb.append(str); - sb.append("\n"); - } - } - } - if(mode.acceptsOutput()) { - color = "\u00A79 "; - sb.append(color); - - List targets = icn.getInputSourcesFor(conduit, dir, input); - if(targets.isEmpty()) { - if(input == null) { - sb.append(Lang.localize("gui.mjReader.noItems")); - } else { - sb.append(Lang.localize("gui.mjReader.noItem")); - sb.append(" "); - sb.append(input.getDisplayName()); - } - } else { - if(input == null) { - sb.append(Lang.localize("gui.mjReader.receiveItems")); - } else { - sb.append(Lang.localize("gui.mjReader.receiveItem1")); - sb.append(" "); - sb.append(input.getDisplayName()); - sb.append(" "); - sb.append(Lang.localize("gui.mjReader.receiveItem2")); - } - sb.append("\n"); - for (String str : targets) { - sb.append(" - "); - sb.append(str); - sb.append("\n"); - } - } - - } - } - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - - } - - public void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { - PowerTracker tracker = pm.getNetworkPowerTracker(); - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(NET_HEADING); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - - color = "\u00A79 "; - sb = new StringBuilder(); - sb.append(color); - sb.append(CON_STORAGE); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInConduits())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInConduits())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(CAP_BANK_STOR); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInCapacitorBanks())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInCapacitorBanks())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(MACH_BUF_STOR); - sb.append(PowerDisplayUtil.formatPower(pm.getPowerInReceptors())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInReceptors())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(AVE_OUT); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickSent())); - sb.append("\n"); - sb.append(AVE_IN); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickRecieved())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - } - - private void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(ENERGY_CONDUIT); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - - color = "\u00A79 "; - sb = new StringBuilder(); - sb.append(color); - sb.append(CON_BUF); - sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getEnergyStored())); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getMaxEnergyStored())); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - sb.append(AVE_OUT); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickSent())); - sb.append("\n"); - sb.append(AVE_IN); - sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickRecieved())); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - - } - - private void sendPowerReciptorInfo(EntityPlayer player, Block block, float stored, float maxStored, float minRec, float maxRec, float request) { - String color = "\u00A7a "; - StringBuilder sb = new StringBuilder(); - sb.append(color); - sb.append(block.getLocalizedName()); - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - - color = "\u00A79 "; - sb = new StringBuilder(); - sb.append(color); - sb.append(CON_BUF); - sb.append(PowerDisplayUtil.formatPower(stored)); - sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(maxStored)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - - sb.append(REQUEST_RANGE); - sb.append(PowerDisplayUtil.formatPower(minRec)); - sb.append(" - "); - sb.append(PowerDisplayUtil.formatPower(maxRec)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - sb.append("\n"); - - sb.append(CUR_REQUEST); - sb.append(PowerDisplayUtil.formatPower(request)); - sb.append(" "); - sb.append(PowerDisplayUtil.abrevation()); - - player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); - } + // private void sendInfoMessage(DataInputStream data, EntityPlayer player) throws IOException { + // int x = data.readInt(); + // int y = data.readInt(); + // int z = data.readInt(); + // int side = data.readInt(); + // + // World world = player.worldObj; + // if(world == null) { + // Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); + // return; + // } + // + // Block block = world.getBlock(x, y, z); + // + // if(block == null) { + // Log.warn("MJReaderPacketHandler.sendInfoMessage: Null block for is " + id); + // return; + // } + // + // TileEntity te = world.getTileEntity(x, y, z); + // + // if(te instanceof TileConduitBundle) { + // + // sendInfoMessage(player, (TileConduitBundle) te); + // + // } else + // + // if(te instanceof IInternalPowerReceptor) { + // + // IInternalPowerReceptor pr = (IInternalPowerReceptor) te; + // PowerHandler ph = pr.getPowerHandler(); + // if(ph == null) { + // player.sendChatToPlayer(ChatMessageComponent.createFromText(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); + // } + // + // sendPowerReciptorInfo(player, block, ph.getEnergyStored(), ph.getMaxEnergyStored(), ph.getMinEnergyReceived(), ph.getMaxEnergyReceived(), ph + // .getPowerReceiver().powerRequest()); + // + // } else if(te instanceof IPowerReceptor) { + // + // IPowerReceptor pr = (IPowerReceptor) te; + // PowerReceiver rec = pr.getPowerReceiver(ForgeDirection.values()[side]); + // if(rec == null) { + // player.sendChatToPlayer(ChatMessageComponent.createFromText(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); + // } else { + // sendPowerReciptorInfo(player, block, rec.getEnergyStored(), rec.getMaxEnergyStored(), rec.getMinEnergyReceived(), rec.getMaxEnergyReceived(), + // rec.powerRequest()); + // } + // + // } + // + // } + // + // public void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { + // + // if(tcb.getConduit(IItemConduit.class) != null) { + // sendInfoMessage(player, tcb.getConduit(IItemConduit.class), null); + // } + // IPowerConduit conduit = tcb.getConduit(IPowerConduit.class); + // if(conduit != null) { + // sendInfoMessage(player, conduit); + // } + // } + // + // public void sendInfoMessage(EntityPlayer player, IPowerConduit conduit) { + // PowerConduitNetwork pcn = (PowerConduitNetwork) conduit.getNetwork(); + // NetworkPowerManager pm = pcn.getPowerManager(); + // PowerTracker tracker = pm.getTracker(conduit); + // if(tracker != null) { + // sendPowerConduitInfo(player, conduit, tracker); + // } else { + // sendInfoMessage(player, pm); + // } + // } + // + // public void sendInfoMessage(EntityPlayer player, IItemConduit conduit, ItemStack input) { + // String color = "\u00A7a "; + // StringBuilder sb = new StringBuilder(); + // sb.append(color); + // + // if(conduit.getExternalConnections().isEmpty()) { + // sb.append(ITEM_HEADING); + // sb.append(" "); + // sb.append(ITEM_NO_CONNECTIONS); + // sb.append("\n"); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // return; + // } + // for (ForgeDirection dir : conduit.getExternalConnections()) { + // ConnectionMode mode = conduit.getConectionMode(dir); + // + // sb.append(ITEM_HEADING); + // sb.append(" "); + // sb.append(Lang.localize("gui.mjReader.connectionDir")); + // sb.append(" "); + // sb.append(dir); + // sb.append("\n"); + // + // ItemConduitNetwork icn = (ItemConduitNetwork) conduit.getNetwork(); + // if(mode.acceptsInput()) { + // color = "\u00A79 "; + // sb.append(color); + // + // if(input == null) { + // sb.append(Lang.localize("gui.mjReader.extractedItems")); + // } else { + // sb.append(Lang.localize("gui.mjReader.extractedItem")); + // sb.append(" "); + // sb.append(input.getDisplayName()); + // } + // sb.append(" "); + // List targets = icn.getTargetsForExtraction(conduit.getLocation().getLocation(dir), input); + // if(targets.isEmpty()) { + // sb.append(" "); + // sb.append(Lang.localize("gui.mjReader.noOutputs")); + // sb.append(".\n"); + // } else { + // sb.append(" "); + // sb.append(Lang.localize("gui.mjReader.insertedInto")); + // sb.append("\n"); + // for (String str : targets) { + // sb.append(" - "); + // sb.append(str); + // sb.append("\n"); + // } + // } + // } + // if(mode.acceptsOutput()) { + // color = "\u00A79 "; + // sb.append(color); + // + // List targets = icn.getInputSourcesFor(conduit, dir, input); + // if(targets.isEmpty()) { + // if(input == null) { + // sb.append(Lang.localize("gui.mjReader.noItems")); + // } else { + // sb.append(Lang.localize("gui.mjReader.noItem")); + // sb.append(" "); + // sb.append(input.getDisplayName()); + // } + // } else { + // if(input == null) { + // sb.append(Lang.localize("gui.mjReader.receiveItems")); + // } else { + // sb.append(Lang.localize("gui.mjReader.receiveItem1")); + // sb.append(" "); + // sb.append(input.getDisplayName()); + // sb.append(" "); + // sb.append(Lang.localize("gui.mjReader.receiveItem2")); + // } + // sb.append("\n"); + // for (String str : targets) { + // sb.append(" - "); + // sb.append(str); + // sb.append("\n"); + // } + // } + // + // } + // } + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // + // } + // + // public void sendInfoMessage(EntityPlayer player, NetworkPowerManager pm) { + // PowerTracker tracker = pm.getNetworkPowerTracker(); + // String color = "\u00A7a "; + // StringBuilder sb = new StringBuilder(); + // sb.append(color); + // sb.append(NET_HEADING); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // + // color = "\u00A79 "; + // sb = new StringBuilder(); + // sb.append(color); + // sb.append(CON_STORAGE); + // sb.append(PowerDisplayUtil.formatPower(pm.getPowerInConduits())); + // sb.append(OF); + // sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInConduits())); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // sb.append(CAP_BANK_STOR); + // sb.append(PowerDisplayUtil.formatPower(pm.getPowerInCapacitorBanks())); + // sb.append(OF); + // sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInCapacitorBanks())); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // sb.append(MACH_BUF_STOR); + // sb.append(PowerDisplayUtil.formatPower(pm.getPowerInReceptors())); + // sb.append(OF); + // sb.append(PowerDisplayUtil.formatPower(pm.getMaxPowerInReceptors())); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // sb.append(AVE_OUT); + // sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickSent())); + // sb.append("\n"); + // sb.append(AVE_IN); + // sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickRecieved())); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // } + // + // private void sendPowerConduitInfo(EntityPlayer player, IPowerConduit con, PowerTracker tracker) { + // String color = "\u00A7a "; + // StringBuilder sb = new StringBuilder(); + // sb.append(color); + // sb.append(ENERGY_CONDUIT); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // + // color = "\u00A79 "; + // sb = new StringBuilder(); + // sb.append(color); + // sb.append(CON_BUF); + // sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getEnergyStored())); + // sb.append(OF); + // sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getMaxEnergyStored())); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // sb.append(AVE_OUT); + // sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickSent())); + // sb.append("\n"); + // sb.append(AVE_IN); + // sb.append(PowerDisplayUtil.formatPowerFloat(tracker.getAverageMjTickRecieved())); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // + // } + // + // private void sendPowerReciptorInfo(EntityPlayer player, Block block, float stored, float maxStored, float minRec, float maxRec, float request) { + // String color = "\u00A7a "; + // StringBuilder sb = new StringBuilder(); + // sb.append(color); + // sb.append(block.getLocalizedName()); + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // + // color = "\u00A79 "; + // sb = new StringBuilder(); + // sb.append(color); + // sb.append(CON_BUF); + // sb.append(PowerDisplayUtil.formatPower(stored)); + // sb.append(OF); + // sb.append(PowerDisplayUtil.formatPower(maxStored)); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // + // sb.append(REQUEST_RANGE); + // sb.append(PowerDisplayUtil.formatPower(minRec)); + // sb.append(" - "); + // sb.append(PowerDisplayUtil.formatPower(maxRec)); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // sb.append("\n"); + // + // sb.append(CUR_REQUEST); + // sb.append(PowerDisplayUtil.formatPower(request)); + // sb.append(" "); + // sb.append(PowerDisplayUtil.abrevation()); + // + // player.sendChatToPlayer(ChatMessageComponent.createFromText(sb.toString())); + // } } diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java new file mode 100644 index 00000000..2f567372 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -0,0 +1,120 @@ +package crazypants.enderio.machine.monitor; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import crazypants.enderio.Log; +import crazypants.enderio.network.IPacketEio; + +public class PacketPowerMonitor implements IPacketEio { + + int x; + int y; + int z; + boolean engineControlEnabled; + float startLevel; + float stopLevel; + + //TODO:1.7 + //SignalColor + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + buf.writeBoolean(engineControlEnabled); + buf.writeFloat(startLevel); + buf.writeFloat(stopLevel); + // dos.writeShort(pm.signalColor.ordinal()); + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + engineControlEnabled = buffer.readBoolean(); + startLevel = buffer.readFloat(); + stopLevel = buffer.readFloat(); + + //signal color = DyeColor.fromIndex(data.readShort()); + } + + @Override + public void handleClientSide(EntityPlayer player) { + handle(player); + } + + @Override + public void handleServerSide(EntityPlayer player) { + handle(player); + } + + public void handle(EntityPlayer player) { + TileEntity te = player.worldObj.getTileEntity(x, y, z); + if(!(te instanceof TilePowerMonitor)) { + Log.warn("createPowerMonitotPacket: Could not handle packet as TileEntity was not a TilePowerMonitor."); + return; + } + TilePowerMonitor pm = (TilePowerMonitor) te; + pm.engineControlEnabled = engineControlEnabled; + pm.startLevel = startLevel; + pm.stopLevel = stopLevel; + //pm.signalColor = signal; + } + + // + // public static Packet createPowerMonitotPacket(TilePowerMonitor pm) { + // ByteArrayOutputStream bos = new ByteArrayOutputStream(); + // DataOutputStream dos = new DataOutputStream(bos); + // try { + // dos.writeInt(PacketHandler.ID_POWER_MONITOR_PACKET); + // dos.writeInt(pm.xCoord); + // dos.writeInt(pm.yCoord); + // dos.writeInt(pm.zCoord); + // dos.writeBoolean(pm.engineControlEnabled); + // dos.writeFloat(pm.startLevel); + // dos.writeFloat(pm.stopLevel); + // dos.writeShort(pm.signalColor.ordinal()); + // + // } catch (IOException e) { + // // never thrown + // } + // Packet250CustomPayload pkt = new Packet250CustomPayload(); + // pkt.channel = PacketHandler.CHANNEL; + // pkt.data = bos.toByteArray(); + // pkt.length = bos.size(); + // pkt.isChunkDataPacket = true; + // return pkt; + // } + // + // private void handlPacket(DataInputStream data, INetworkManager manager, Player player) throws IOException { + // if(!(player instanceof EntityPlayer)) { + // Log.warn("createPowerMonitotPacket: Could not handle packet as player not an entity player."); + // return; + // } + // World world = ((EntityPlayer) player).worldObj; + // if(world == null) { + // Log.warn("createPowerMonitotPacket: Could not handle packet as player world was null."); + // return; + // } + // + // int x = data.readInt(); + // int y = data.readInt(); + // int z = data.readInt(); + // TileEntity te = world.getTileEntity(x, y, z); + // if(!(te instanceof TilePowerMonitor)) { + // Log.warn("createPowerMonitotPacket: Could not handle packet as TileEntity was not a TilePowerMonitor."); + // return; + // } + // TilePowerMonitor pm = (TilePowerMonitor) te; + // pm.engineControlEnabled = data.readBoolean(); + // pm.startLevel = data.readFloat(); + // pm.stopLevel = data.readFloat(); + // pm.signalColor = DyeColor.fromIndex(data.readShort()); + // + // } + +} diff --git a/src/main/java/crazypants/enderio/machine/monitor/PowerMonitorPacketHandler.java b/src/main/java/crazypants/enderio/machine/monitor/PowerMonitorPacketHandler.java deleted file mode 100644 index 35619849..00000000 --- a/src/main/java/crazypants/enderio/machine/monitor/PowerMonitorPacketHandler.java +++ /dev/null @@ -1,86 +0,0 @@ -package crazypants.enderio.machine.monitor; - -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.Packet250CustomPayload; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.Player; -import crazypants.enderio.IPacketProcessor; -import crazypants.enderio.Log; -import crazypants.enderio.PacketHandler; -import crazypants.util.DyeColor; - -public class PowerMonitorPacketHandler implements IPacketProcessor { - - @Override - public boolean canProcessPacket(int packetID) { - return PacketHandler.ID_POWER_MONITOR_PACKET == packetID; - } - - @Override - public void processPacket(int packetID, INetworkManager manager, DataInputStream data, Player player) throws IOException { - if(packetID == PacketHandler.ID_POWER_MONITOR_PACKET) { - handlPacket(data, manager, player); - } - - } - - public static Packet createPowerMonitotPacket(TilePowerMonitor pm) { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - try { - dos.writeInt(PacketHandler.ID_POWER_MONITOR_PACKET); - dos.writeInt(pm.xCoord); - dos.writeInt(pm.yCoord); - dos.writeInt(pm.zCoord); - dos.writeBoolean(pm.engineControlEnabled); - dos.writeFloat(pm.startLevel); - dos.writeFloat(pm.stopLevel); - dos.writeShort(pm.signalColor.ordinal()); - - } catch (IOException e) { - // never thrown - } - Packet250CustomPayload pkt = new Packet250CustomPayload(); - pkt.channel = PacketHandler.CHANNEL; - pkt.data = bos.toByteArray(); - pkt.length = bos.size(); - pkt.isChunkDataPacket = true; - return pkt; - } - - private void handlPacket(DataInputStream data, INetworkManager manager, Player player) throws IOException { - if(!(player instanceof EntityPlayer)) { - Log.warn("createPowerMonitotPacket: Could not handle packet as player not an entity player."); - return; - } - World world = ((EntityPlayer) player).worldObj; - if(world == null) { - Log.warn("createPowerMonitotPacket: Could not handle packet as player world was null."); - return; - } - - int x = data.readInt(); - int y = data.readInt(); - int z = data.readInt(); - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TilePowerMonitor)) { - Log.warn("createPowerMonitotPacket: Could not handle packet as TileEntity was not a TilePowerMonitor."); - return; - } - TilePowerMonitor pm = (TilePowerMonitor) te; - pm.engineControlEnabled = data.readBoolean(); - pm.startLevel = data.readFloat(); - pm.stopLevel = data.readFloat(); - pm.signalColor = DyeColor.fromIndex(data.readShort()); - - } - -} diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index d043a7d2..28b8e0e7 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -4,15 +4,12 @@ import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.IGuiHandler; import crazypants.enderio.Config; import crazypants.enderio.EnderIO; @@ -36,20 +33,14 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt EnderIO.packetPipeline.registerPacket(PacketOpenAuthGui.class); EnderIO.packetPipeline.registerPacket(PacketConfigSync.class); + ConnectionHandler ch = new ConnectionHandler(); + FMLCommonHandler.instance().bus().register(ch); + BlockTravelAnchor result = new BlockTravelAnchor(); result.init(); - - FMLCommonHandler.instance().bus().register(result); - return result; } - //to lazy to create a new class - @SubscribeEvent - public void onPlayerLoggon(PlayerLoggedInEvent evt) { - EnderIO.packetPipeline.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); - } - IIcon selectedOverlayIcon; IIcon highlightOverlayIcon; diff --git a/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java b/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java new file mode 100644 index 00000000..93a73f56 --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/ConnectionHandler.java @@ -0,0 +1,16 @@ +package crazypants.enderio.teleport; + +import net.minecraft.entity.player.EntityPlayerMP; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import crazypants.enderio.EnderIO; +import crazypants.enderio.teleport.packet.PacketConfigSync; + +public class ConnectionHandler { + + @SubscribeEvent + public void onPlayerLoggon(PlayerLoggedInEvent evt) { + EnderIO.packetPipeline.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player); + } + +}