From 42c99bbdae8e1fc3b5071ce4df9b98c139d4bd45 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 15 Mar 2015 04:28:22 -0400 Subject: [PATCH] Add interdimensional travel to telepad. Some improvements to text fields --- resources/assets/enderio/lang/en_US.lang | 2 + .../enderio/api/teleport/ITelePad.java | 24 ++++++ .../crazypants/enderio/gui/TextFieldEIO.java | 21 ++++-- .../enderio/rail/PlayerTeleportHandler.java | 2 +- .../teleport/packet/PacketTravelEvent.java | 4 +- .../enderio/teleport/telepad/GuiTelePad.java | 59 +++++++-------- .../teleport/telepad/ItemCoordSelector.java | 48 ++++++++++-- .../teleport/telepad/PacketUpdateCoords.java | 12 ++- .../enderio/teleport/telepad/TileTelePad.java | 73 ++++++++++++++++--- 9 files changed, 182 insertions(+), 63 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 167a7229..192f2914 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -522,6 +522,8 @@ item.itemCoordSelector.tooltip.detailed.line5=select that specific block. item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance. enderio.itemCoordSelector.chat.newCoords=New Coords: %s enderio.itemCoordSelector.chat.setCoords=Set Coords: %s +enderio.itemCoordSelector.chat.newDimension=New Dimension: %s%s +enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s //Painter tile.blockPainter.name=Painting Machine diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index 472fb48b..dfd492e1 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -56,10 +56,20 @@ public interface ITelePad extends ITravelAccessable { */ int getZ(); + /** + * The target dimension ID for the telepad. Defaults to the dimension the + * block is placed in. + * + * @return An int dimension ID. + */ + int getTargetDim(); + /** * Sets the target X coordinate of the network. Has no effect if * {@link #inNetwork()} returns false. * + * @param x + * The X coord. * @return The master telepad TE. DOES NOT ALWAYS return itself. */ ITelePad setX(int x); @@ -68,6 +78,8 @@ public interface ITelePad extends ITravelAccessable { * Sets the target Y coordinate of the network. Has no effect if * {@link #inNetwork()} returns false. * + * @param y + * The Y coord. * @return The master telepad TE. DOES NOT ALWAYS return itself. */ ITelePad setY(int y); @@ -76,10 +88,22 @@ public interface ITelePad extends ITravelAccessable { * Sets the target Z coordinate of the network. Has no effect if * {@link #inNetwork()} returns false. * + * @param z + * The Z coord. * @return The master telepad TE. DOES NOT ALWAYS return itself. */ ITelePad setZ(int z); + /** + * Sets the target dimension of the network. Has no effect if + * {@link #inNetwork()} returns false. + * + * @param dimID + * The dimension ID. + * @return The master telepad TE. DOES NOT ALWAYS return itself. + */ + ITelePad setTargetDim(int dimID); + /** * Util method to set all coords using a {@link BlockCoord} object. * diff --git a/src/main/java/crazypants/enderio/gui/TextFieldEIO.java b/src/main/java/crazypants/enderio/gui/TextFieldEIO.java index 71fd896f..1004e91a 100644 --- a/src/main/java/crazypants/enderio/gui/TextFieldEIO.java +++ b/src/main/java/crazypants/enderio/gui/TextFieldEIO.java @@ -1,5 +1,7 @@ package crazypants.enderio.gui; +import com.google.common.base.Strings; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiTextField; import crazypants.gui.IGuiScreen; @@ -8,27 +10,27 @@ public class TextFieldEIO extends GuiTextField { public interface ICharFilter { - boolean passesFilter(char c); + boolean passesFilter(TextFieldEIO tf, char c); } public static final ICharFilter FILTER_NUMERIC = new ICharFilter() { @Override - public boolean passesFilter(char c) { - return Character.isDigit(c); + public boolean passesFilter(TextFieldEIO tf, char c) { + return Character.isDigit(c) || (c == '-' && Strings.isNullOrEmpty(tf.getText())); } }; public static ICharFilter FILTER_ALPHABETICAL = new ICharFilter() { @Override - public boolean passesFilter(char c) { + public boolean passesFilter(TextFieldEIO tf, char c) { return Character.isAlphabetic(c); } }; public static ICharFilter FILTER_ALPHANUMERIC = new ICharFilter() { @Override - public boolean passesFilter(char c) { - return FILTER_NUMERIC.passesFilter(c) || FILTER_ALPHABETICAL.passesFilter(c); + public boolean passesFilter(TextFieldEIO tf, char c) { + return FILTER_NUMERIC.passesFilter(tf, c) || FILTER_ALPHABETICAL.passesFilter(tf, c); } }; @@ -37,9 +39,14 @@ public class TextFieldEIO extends GuiTextField { private ICharFilter filter; public TextFieldEIO(FontRenderer fnt, int x, int y, int width, int height) { + this(fnt, x, y, width, height, null); + } + + public TextFieldEIO(FontRenderer fnt, int x, int y, int width, int height, ICharFilter charFilter) { super(fnt, x, y, width, height); this.xOrigin = x; this.yOrigin = y; + this.filter = charFilter; } public void init(IGuiScreen gui) { @@ -54,7 +61,7 @@ public class TextFieldEIO extends GuiTextField { @Override public boolean textboxKeyTyped(char c, int key) { - if(filter == null || filter.passesFilter(c) || isSpecialChar(c, key)) { + if(filter == null || filter.passesFilter(this, c) || isSpecialChar(c, key)) { return super.textboxKeyTyped(c, key); } return false; diff --git a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java index 75e01b8f..90cc18fd 100644 --- a/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java +++ b/src/main/java/crazypants/enderio/rail/PlayerTeleportHandler.java @@ -16,7 +16,7 @@ import crazypants.util.EntityUtil; public class PlayerTeleportHandler { - static PlayerTeleportHandler instance = new PlayerTeleportHandler(); + public static final PlayerTeleportHandler instance = new PlayerTeleportHandler(); List queue = new ArrayList(); diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index f6163c0a..60857136 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -76,7 +76,7 @@ public class PacketTravelEvent implements IMessage, IMessageHandler implement super(); } - private int targetX, targetY, targetZ; + private int targetX, targetY, targetZ, targetDim; - public PacketUpdateCoords(TileTelePad te, int x, int y, int z) { + public PacketUpdateCoords(TileTelePad te, int x, int y, int z, int targetDim) { super(te); this.targetX = x; this.targetY = y; this.targetZ = z; + this.targetDim = targetDim; } - public PacketUpdateCoords(TileTelePad te, BlockCoord bc) { - this(te, bc.x, bc.y, bc.z); + public PacketUpdateCoords(TileTelePad te, BlockCoord bc, int targetDim) { + this(te, bc.x, bc.y, bc.z, targetDim); } @Override @@ -32,6 +33,7 @@ public class PacketUpdateCoords extends MessageTileEntity implement buf.writeInt(targetX); buf.writeInt(targetY); buf.writeInt(targetZ); + buf.writeInt(targetDim); } @Override @@ -40,6 +42,7 @@ public class PacketUpdateCoords extends MessageTileEntity implement targetX = buf.readInt(); targetY = buf.readInt(); targetZ = buf.readInt(); + targetDim = buf.readInt(); } @Override @@ -49,6 +52,7 @@ public class PacketUpdateCoords extends MessageTileEntity implement te.setX(message.targetX); te.setY(message.targetY); te.setZ(message.targetZ); + te.setTargetDim(message.targetDim); } return null; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index e158339c..ead903ea 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -7,14 +7,17 @@ import java.util.Queue; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; +import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; @@ -32,6 +35,8 @@ import crazypants.enderio.machine.PacketPowerStorage; import crazypants.enderio.machine.PacketProgress; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.rail.PacketTeleportEffects; +import crazypants.enderio.rail.TeleporterEIO; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.TileTravelAnchor; import crazypants.enderio.teleport.packet.PacketTravelEvent; @@ -53,7 +58,8 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private boolean autoUpdate = false; private BlockCoord target = new BlockCoord(); - + private int targetDim = Integer.MIN_VALUE; + private int lastSyncPowerStored; private Queue toTeleport = Queues.newArrayDeque(); @@ -74,10 +80,20 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei if(master != null && master.isInvalid()) { master.breakNetwork(); } - if(autoUpdate && worldObj != null) { + + if (worldObj == null) { + return; + } + + if(autoUpdate) { updateConnectedState(true); autoUpdate = false; } + + if(targetDim == Integer.MIN_VALUE) { + targetDim = worldObj.provider.dimensionId; + } + if(worldObj.isRemote) { if(active()) { if(activeSound == null) { @@ -251,6 +267,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei super.writeCustomNBT(root); energy.writeToNBT(root); target.writeToNBT(root); + root.setInteger("targetDim", targetDim); } @Override @@ -258,6 +275,7 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei super.readCustomNBT(root); energy.readFromNBT(root); target = BlockCoord.readFromNBT(root); + targetDim = root.getInteger("targetDim"); autoUpdate = true; } @@ -283,7 +301,12 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } private int calculateTeleportPower() { - return this.maxPower = new BlockCoord(this).distance(target) * 1000; + if (worldObj.provider.dimensionId == targetDim) { + this.maxPower = new BlockCoord(this).distance(target) * 1000; + } else { + this.maxPower = 100000; + } + return this.maxPower; } public boolean active() { @@ -351,6 +374,11 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } return target.z; } + + @Override + public int getTargetDim() { + return targetDim; + } @Override public ITelePad setX(int x) { @@ -378,6 +406,15 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } return null; } + + @Override + public ITelePad setTargetDim(int dimID) { + if (inNetwork()) { + targetDim = dimID; + return master; + } + return null; + } @Override public void setCoords(BlockCoord coords) { @@ -457,15 +494,31 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei private boolean teleport(Entity entity) { entity.getEntityData().setBoolean(TELEPORTING_KEY, false); - if(entity.worldObj.isRemote) { + return entity.worldObj.isRemote ? clientTeleport(entity) : serverTeleport(entity); + } + + private boolean clientTeleport(Entity entity) { + if(entity.worldObj.provider.dimensionId == targetDim) { return TravelController.instance.doClientTeleport(entity, target, TravelSource.TELEPAD, 0, false); - } else { - if(PacketTravelEvent.doServerTeleport(entity, target.x, target.y, target.z, 0, false, TravelSource.TELEPAD)) { - dequeueTeleport(entity); - return true; - } - return false; } + return true; + } + + private boolean serverTeleport(Entity entity) { + dequeueTeleport(entity); + if(entity.worldObj.provider.dimensionId != targetDim) { + MinecraftServer server = MinecraftServer.getServer(); + int currentDim = entity.worldObj.provider.dimensionId; + if(entity instanceof EntityPlayer) { + EntityPlayerMP player = (EntityPlayerMP) entity; + server.getConfigurationManager().transferPlayerToDimension(player, targetDim, new TeleporterEIO(server.worldServerForDimension(targetDim))); + } else { + WorldServer toDim = server.worldServerForDimension(targetDim); + server.getConfigurationManager().transferEntityToWorld(entity, 0, server.worldServerForDimension(currentDim), toDim, new TeleporterEIO(toDim)); + } + } + PacketTravelEvent.doServerTeleport(entity, target.x, target.y, target.z, 0, false, TravelSource.TELEPAD); + return true; } /* ITravelAccessable overrides */