This commit is contained in:
cp committed 2014-02-28 02:53:09 +08:00
1 parent 4e6f877a09
commit fffdc8de63
9 files changed
+80 -21

No files matched your search

@@ -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();
@@ -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;
@@ -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);
}
@@ -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<String> authorisedUsers = new ArrayList<String>();
@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();
@@ -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);
}
@@ -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;
@@ -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 {
@@ -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);
}
}
@@ -1,4 +1,4 @@
package crazypants.enderio.teleport;
package crazypants.enderio.teleport.packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;