From fffdc8de63862964a3424a299d26c14e2ac49ebb Mon Sep 17 00:00:00 2001 From: cp Date: Fri, 28 Feb 2014 02:53:09 +0800 Subject: [PATCH] Lovely. --- .../enderio/teleport/BlockTravelAnchor.java | 5 ++ .../enderio/teleport/GuiTravelAccessable.java | 1 + .../enderio/teleport/ItemTravelStaff.java | 7 +-- .../enderio/teleport/TileTravelAnchor.java | 19 ++++--- .../enderio/teleport/TravelController.java | 10 ++-- .../{ => packet}/PacketAccessMode.java | 4 +- .../{ => packet}/PacketDrainStaff.java | 3 +- .../teleport/packet/PacketOpenAuthGui.java | 50 +++++++++++++++++++ .../{ => packet}/PacketTravelEvent.java | 2 +- 9 files changed, 80 insertions(+), 21 deletions(-) rename src/main/java/crazypants/enderio/teleport/{ => packet}/PacketAccessMode.java (89%) rename src/main/java/crazypants/enderio/teleport/{ => packet}/PacketDrainStaff.java (90%) create mode 100644 src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java rename src/main/java/crazypants/enderio/teleport/{ => packet}/PacketTravelEvent.java (98%) diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 79c8b468..dc3613f8 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -18,6 +18,10 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.teleport.packet.PacketAccessMode; +import crazypants.enderio.teleport.packet.PacketDrainStaff; +import crazypants.enderio.teleport.packet.PacketOpenAuthGui; +import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.Lang; public class BlockTravelAnchor extends Block implements IGuiHandler, ITileEntityProvider { @@ -32,6 +36,7 @@ public class BlockTravelAnchor extends Block implements IGuiHandler, ITileEntity EnderIO.packetPipeline.registerPacket(PacketAccessMode.class); EnderIO.packetPipeline.registerPacket(PacketTravelEvent.class); EnderIO.packetPipeline.registerPacket(PacketDrainStaff.class); + EnderIO.packetPipeline.registerPacket(PacketOpenAuthGui.class); BlockTravelAnchor result = new BlockTravelAnchor(); result.init(); diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java index 4a2e739b..efecf25d 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAccessable.java @@ -3,6 +3,7 @@ package crazypants.enderio.teleport; import crazypants.enderio.EnderIO; import crazypants.enderio.gui.CheckBoxEIO; import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; +import crazypants.enderio.teleport.packet.PacketAccessMode; import crazypants.gui.GuiContainerBase; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index 8f96efc3..8a33b45a 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -19,6 +19,7 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.Vector3d; @@ -95,8 +96,8 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.getRequiresPassword(player)) { - // Packet packet = TravelPacketHandler.createOpenAuthGuiPacket(target.x, target.y, target.z); - // PacketDispatcher.sendPacketToServer(packet); + PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); + EnderIO.packetPipeline.sendToServer(p); return equipped; } } @@ -142,7 +143,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta return res; } - void extractInternal(ItemStack item, int powerUse) { + public void extractInternal(ItemStack item, int powerUse) { int res = Math.max(0, getEnergyStored(item) - powerUse); setEnergy(item, res); } diff --git a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java index a5d0f3c8..6aebfa0b 100644 --- a/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/TileTravelAnchor.java @@ -1,22 +1,22 @@ package crazypants.enderio.teleport; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.TileEntityEio; -import crazypants.util.BlockCoord; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.TileEntityEio; +import crazypants.util.BlockCoord; public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable { - enum AccessMode { + public enum AccessMode { PUBLIC, PRIVATE, PROTECTED @@ -30,6 +30,7 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable private List authorisedUsers = new ArrayList(); + @Override public boolean canBlockBeAccessed(EntityPlayer playerName) { if(accessMode == AccessMode.PUBLIC) { return true; @@ -124,7 +125,6 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable return placedBy; } - @Override public void setPlacedBy(EntityPlayer player) { if(player == null || player.getGameProfile() == null) { @@ -182,7 +182,6 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable } } - @Override public Packet getDescriptionPacket() { NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index c11a4cca..bb035d3b 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -26,6 +26,9 @@ import crazypants.enderio.Config; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.enderface.TileEnderIO; +import crazypants.enderio.teleport.packet.PacketDrainStaff; +import crazypants.enderio.teleport.packet.PacketOpenAuthGui; +import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.BlockCoord; import crazypants.util.Util; import crazypants.vecmath.Camera; @@ -142,9 +145,8 @@ public class TravelController { if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.getRequiresPassword(player)) { - //TODO:1.7 - // Packet packet = TravelPacketHandler.createOpenAuthGuiPacket(target.x, target.y, target.z); - // PacketDispatcher.sendPacketToServer(packet); + PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z); + EnderIO.packetPipeline.sendToServer(p); return; } } @@ -177,8 +179,6 @@ public class TravelController { int requiredPower = equipped == null ? 0 : TravelController.instance.getRequiredPower(player, TravelSource.STAFF, target); if(requiredPower <= 0 || requiredPower <= EnderIO.itemTravelStaff.getEnergyStored(equipped)) { if(requiredPower > 0) { - //TODO:1.7 - // PacketDispatcher.sendPacketToServer(TravelPacketHandler.createDrainPowerPacket(requiredPower)); PacketDrainStaff p = new PacketDrainStaff(requiredPower); EnderIO.packetPipeline.sendToServer(p); } diff --git a/src/main/java/crazypants/enderio/teleport/PacketAccessMode.java b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java similarity index 89% rename from src/main/java/crazypants/enderio/teleport/PacketAccessMode.java rename to src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java index 90128a21..457dfbbe 100644 --- a/src/main/java/crazypants/enderio/teleport/PacketAccessMode.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java @@ -1,6 +1,8 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.packet; import crazypants.enderio.network.IPacketEio; +import crazypants.enderio.teleport.TileTravelAnchor; +import crazypants.enderio.teleport.TileTravelAnchor.AccessMode; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/crazypants/enderio/teleport/PacketDrainStaff.java b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java similarity index 90% rename from src/main/java/crazypants/enderio/teleport/PacketDrainStaff.java rename to src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java index 223da4bb..1933ccca 100644 --- a/src/main/java/crazypants/enderio/teleport/PacketDrainStaff.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketDrainStaff.java @@ -1,10 +1,11 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import crazypants.enderio.EnderIO; import crazypants.enderio.network.IPacketEio; +import crazypants.enderio.teleport.ItemTravelStaff; public class PacketDrainStaff implements IPacketEio { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java new file mode 100644 index 00000000..17c21957 --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketOpenAuthGui.java @@ -0,0 +1,50 @@ +package crazypants.enderio.teleport.packet; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; +import crazypants.enderio.network.IPacketEio; + +public class PacketOpenAuthGui implements IPacketEio { + + int x; + int y; + int z; + + public PacketOpenAuthGui() { + + } + + public PacketOpenAuthGui(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buffer) { + buffer.writeInt(x); + buffer.writeInt(y); + buffer.writeInt(z); + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buffer) { + x = buffer.readInt(); + y = buffer.readInt(); + z = buffer.readInt(); + } + + @Override + public void handleClientSide(EntityPlayer player) { + + } + + @Override + public void handleServerSide(EntityPlayer ep) { + ep.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ep.worldObj, x, y, z); + } + +} diff --git a/src/main/java/crazypants/enderio/teleport/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java similarity index 98% rename from src/main/java/crazypants/enderio/teleport/PacketTravelEvent.java rename to src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index ac2bb553..3e3c2a11 100644 --- a/src/main/java/crazypants/enderio/teleport/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -1,4 +1,4 @@ -package crazypants.enderio.teleport; +package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext;