From 2cb28a72ebd4ef1e13fb78aefc248d315d7f6913 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 14 Feb 2015 02:34:08 -0500 Subject: [PATCH] Telepad now actually teleports, additional GUI/other refinements --- resources/assets/enderio/lang/en_US.lang | 3 + .../enderio/api/teleport/ITelePad.java | 19 +++++ .../enderio/api/teleport/TravelSource.java | 3 +- .../enderio/teleport/TravelController.java | 75 ++++++++++--------- .../teleport/packet/PacketTravelEvent.java | 73 ++++++++++++------ .../telepad/GuiAugmentedTravelAccessible.java | 2 +- .../enderio/teleport/telepad/GuiTelePad.java | 56 ++++++++++---- .../enderio/teleport/telepad/TileTelePad.java | 53 +++++++++++++ 8 files changed, 205 insertions(+), 79 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 4101063b..1dd33be0 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -497,6 +497,9 @@ tile.blockTravelAnchor.tooltip.detailed.line6=Can be painted in the Painting Mac enderio.blockTravelPlatform.invalidTarget=Destination is Obstructed enderio.blockTravelPlatform.outOfRange=Destination out of range +tile.blockTelePad.name=Telepad Block +enderio.gui.telepad.teleport=Teleport! + item.itemTravelStaff.name=Staff of Traveling item.itemTravelStaff.tooltip.detailed.line1=When held Travel Anchors and EnderIO item.itemTravelStaff.tooltip.detailed.line2=blocks become visible and can be diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index fd25b6c5..472fb48b 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -2,6 +2,7 @@ package crazypants.enderio.api.teleport; import javax.annotation.Nullable; +import net.minecraft.entity.Entity; import crazypants.util.BlockCoord; public interface ITelePad extends ITravelAccessable { @@ -90,4 +91,22 @@ public interface ITelePad extends ITravelAccessable { * The coords to set this telepad to. */ void setCoords(BlockCoord coords); + + /** + * Teleports a specific entity to the destination if: + * + * + * @param entity + * The entity to teleport + */ + void teleportSpecific(Entity entity); + + /** + * Teleports all entities in range (in no particular order) until either there + * are none left or the power runs out. + */ + void teleportAll(); } diff --git a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java index 465751dc..deda41a1 100644 --- a/src/main/java/crazypants/enderio/api/teleport/TravelSource.java +++ b/src/main/java/crazypants/enderio/api/teleport/TravelSource.java @@ -6,7 +6,8 @@ public enum TravelSource { BLOCK(0, Config.travelAnchorMaxDistance), STAFF(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxDistance), - STAFF_BLINK(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxBlinkDistance); + STAFF_BLINK(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxBlinkDistance), + TELEPAD(0, 0); public static int getMaxDistance() { return STAFF.maxDistanceTravelledSq; diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 390772f7..b3ff127b 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -8,6 +8,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -71,14 +72,14 @@ public class TravelController { private double fovRad; private double tanFovRad; - + private final List blackList = new ArrayList(); private TravelController() { String[] blackListNames = Config.travelStaffBlinkBlackList; - for(String name : blackListNames) { - blackList.add(new UniqueIdentifier(name)); - } + for (String name : blackListNames) { + blackList.add(new UniqueIdentifier(name)); + } } public void addBlockToBlinkBlackList(String blockName) { @@ -145,7 +146,7 @@ public class TravelController { if(pos != null) { Block hitBlock = player.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); if(isBlackListedBlock(player, pos, hitBlock)) { - maxDistance = Math.min(maxDistance, VecmathUtil.distance(eye, new Vector3d(pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5)) - 1.5 - lookComp); + maxDistance = Math.min(maxDistance, VecmathUtil.distance(eye, new Vector3d(pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5)) - 1.5 - lookComp); } } } @@ -153,9 +154,9 @@ public class TravelController { eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); Vector3d targetBc = new Vector3d(p.blockX, p.blockY, p.blockZ); - double sampleDistance = 1.5; - double teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + sampleDistance; - + double sampleDistance = 1.5; + double teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)) + sampleDistance; + while (teleDistance < maxDistance) { sample.set(look); sample.scale(sampleDistance); @@ -193,7 +194,8 @@ public class TravelController { if(ui == null) { return false; } - return blackList.contains(ui) && (hitBlock.getBlockHardness(player.worldObj, pos.blockX, pos.blockY, pos.blockZ) < 0 || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); + return blackList.contains(ui) + && (hitBlock.getBlockHardness(player.worldObj, pos.blockX, pos.blockY, pos.blockZ) < 0 || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); } private boolean doBlinkAround(EntityPlayer player, Vector3d sample, boolean conserveMomentum) { @@ -257,9 +259,9 @@ public class TravelController { lookAt.add(eye); Matrix4d mv = VecmathUtil.createMatrixAsLookAt(eye, lookAt, new Vector3d(0, 1, 0)); - float fov = Minecraft.getMinecraft().gameSettings.fovSetting; + float fov = Minecraft.getMinecraft().gameSettings.fovSetting; Matrix4d pr = VecmathUtil.createProjectionMatrixAsPerspective(fov, 0.05f, mc.gameSettings.renderDistanceChunks * 16, mc.displayWidth, - mc.displayHeight); + mc.displayHeight); currentView.setProjectionMatrix(pr); currentView.setViewMatrix(mv); currentView.setViewport(0, 0, mc.displayWidth, mc.displayHeight); @@ -302,8 +304,8 @@ public class TravelController { openEnderIO(null, player.worldObj, player); } else if(Config.travelAnchorEnabled && travelToSelectedTarget(player, TravelSource.BLOCK, false)) { input.jump = false; - try{ - ObfuscationReflectionHelper.setPrivateValue(EntityPlayer.class, (EntityPlayer)player, 0, "flyToggleTimer", "field_71101_bC"); + try { + ObfuscationReflectionHelper.setPrivateValue(EntityPlayer.class, (EntityPlayer) player, 0, "flyToggleTimer", "field_71101_bC"); } catch (Exception e) { //ignore } @@ -359,7 +361,7 @@ public class TravelController { return false; } - public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source,boolean conserveMomentum) { + public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) { return travelToLocation(player, source, selectedCoord, conserveMomentum); } @@ -394,7 +396,7 @@ public class TravelController { } return false; } - if(sendTravelEvent(player, coord, source, requiredPower, conserveMomentum)) { + if(doClientTeleport(player, coord, source, requiredPower, conserveMomentum)) { for (int i = 0; i < 6; ++i) { player.worldObj.spawnParticle("portal", player.posX + (rand.nextDouble() - 0.5D), player.posY + rand.nextDouble() * player.height - 0.25D, player.posZ + (rand.nextDouble() - 0.5D), (rand.nextDouble() - 0.5D) * 2.0D, -rand.nextDouble(), @@ -461,12 +463,12 @@ public class TravelController { if(!canBlinkTo(bc, w, start, target)) { return false; } - } + } Block block = w.getBlock(bc.x, bc.y, bc.z); if(block == null || block.isAir(w, bc.x, bc.y, bc.z)) { return true; - } + } final AxisAlignedBB aabb = block.getCollisionBoundingBoxFromPool(w, bc.x, bc.y, bc.z); return aabb == null || aabb.getAverageEdgeLength() < 0.7; } @@ -516,10 +518,10 @@ public class TravelController { return; } - double closestDistance = Double.MAX_VALUE; + double closestDistance = Double.MAX_VALUE; for (BlockCoord bc : candidates.keySet()) { - if(!bc.equals(onBlockCoord)) { - + if(!bc.equals(onBlockCoord)) { + double d = addRatio(bc); if(d < closestDistance) { selectedCoord = bc; @@ -529,22 +531,21 @@ public class TravelController { } if(selectedCoord != null) { - + Vector3d blockCenter = new Vector3d(selectedCoord.x + 0.5, selectedCoord.y + 0.5, selectedCoord.z + 0.5); - Vector2d blockCenterPixel = currentView.getScreenPoint(blockCenter); - + Vector2d blockCenterPixel = currentView.getScreenPoint(blockCenter); + Vector2d screenMidPixel = new Vector2d(Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight); screenMidPixel.scale(0.5); - double pixDist = blockCenterPixel.distance(screenMidPixel); double rat = pixDist / Minecraft.getMinecraft().displayHeight; if(rat != rat) { rat = 0; - } + } if(rat > 0.07) { selectedCoord = null; - } + } } } @@ -573,12 +574,12 @@ public class TravelController { double mix = MathHelper.clamp_float((start - ratio) / (start - end), 0, 1); double scale = 1; if(mix > 0) { - - Vector3d eyePoint = Util.getEyePositionEio(EnderIO.proxy.getClientPlayer()); + + Vector3d eyePoint = Util.getEyePositionEio(EnderIO.proxy.getClientPlayer()); scale = tanFovRad * eyePoint.distance(loc); - + //Using this scale will give us the block full screen, we will make it 20% of the screen - scale *= Config.travelAnchorZoomScale; + scale *= Config.travelAnchorZoomScale; //only apply 70% of the scaling so more distance targets are still smaller than closer targets float nf = 1 - MathHelper.clamp_float((float) eyePoint.distanceSquared(loc) / TravelSource.STAFF.maxDistanceTravelledSq, 0, 1); @@ -586,7 +587,7 @@ public class TravelController { scale = (scale * mix) + (1 - mix); scale = Math.max(1, scale); - + } return scale; } @@ -597,9 +598,9 @@ public class TravelController { mid.scale(0.5); double d = sp.distance(mid); if(d != d) { - d = 0f; - } - float ratio = (float) d / Minecraft.getMinecraft().displayWidth; + d = 0f; + } + float ratio = (float) d / Minecraft.getMinecraft().displayWidth; candidates.put(bc, ratio); return d; } @@ -612,9 +613,9 @@ public class TravelController { return TravelSource.BLOCK.maxDistanceTravelledSq; } - private boolean sendTravelEvent(EntityPlayer player, BlockCoord bc, TravelSource source, int powerUse, boolean conserveMomentum) { + public boolean doClientTeleport(Entity entity, BlockCoord bc, TravelSource source, int powerUse, boolean conserveMomentum) { - TeleportEntityEvent evt = new TeleportEntityEvent(player, source, bc.x, bc.y, bc.z); + TeleportEntityEvent evt = new TeleportEntityEvent(entity, source, bc.x, bc.y, bc.z); if(MinecraftForge.EVENT_BUS.post(evt)) { return false; } @@ -622,7 +623,7 @@ public class TravelController { bc.y = evt.targetY; bc.z = evt.targetZ; - PacketTravelEvent p = new PacketTravelEvent(bc.x, bc.y, bc.z, powerUse, conserveMomentum); + PacketTravelEvent p = new PacketTravelEvent(entity, bc.x, bc.y, bc.z, powerUse, conserveMomentum, source); PacketHandler.INSTANCE.sendToServer(p); return true; } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index 2e21b11e..0ad06b72 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -1,14 +1,18 @@ package crazypants.enderio.teleport.packet; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S12PacketEntityVelocity; +import net.minecraftforge.common.MinecraftForge; 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.EnderIO; import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.TeleportEntityEvent; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.util.Util; import crazypants.vecmath.Vector3d; @@ -19,16 +23,20 @@ public class PacketTravelEvent implements IMessage, IMessageHandler 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { - ItemStack item = ep.getCurrentEquippedItem().copy(); - ((IItemOfTravel)item.getItem()).extractInternal(item, message.powerUse); - ep.setCurrentItemOrArmor(0, item); + TeleportEntityEvent evt = new TeleportEntityEvent(toTp, TravelSource.values()[message.source], x, y, z); + if(!MinecraftForge.EVENT_BUS.post(evt)) { + doServerTeleport(toTp, x, y, z, message.powerUse, message.conserveMotion); } return null; } + public static boolean doServerTeleport(Entity toTp, int x, int y, int z, int powerUse, boolean conserveMotion) { + EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null; + toTp.worldObj.playSoundEffect(toTp.posX, toTp.posY, toTp.posZ, "mob.endermen.portal", 1.0F, 1.0F); + + toTp.playSound("mob.endermen.portal", 1.0F, 1.0F); + + if(player != null) { + player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5); + } + + toTp.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); + toTp.fallDistance = 0; + + if(player != null) { + if(conserveMotion) { + Vector3d velocityVex = Util.getLookVecEio(player); + S12PacketEntityVelocity p = new S12PacketEntityVelocity(toTp.getEntityId(), velocityVex.x, velocityVex.y, velocityVex.z); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p); + } + + if(powerUse > 0 && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { + ItemStack item = player.getCurrentEquippedItem().copy(); + ((IItemOfTravel) item.getItem()).extractInternal(item, powerUse); + toTp.setCurrentItemOrArmor(0, item); + } + } + + return true; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java index d3046427..0c9a2420 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiAugmentedTravelAccessible.java @@ -21,7 +21,7 @@ public class GuiAugmentedTravelAccessible extends GuiTravelAccessable implements public GuiAugmentedTravelAccessible(InventoryPlayer playerInv, TileTelePad te, World world) { super(playerInv, te, world); this.te = te; - switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, 150, 10, IconEIO.IO_WHATSIT); + switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, GuiTelePad.SWITCH_X, GuiTelePad.SWITCH_Y, IconEIO.IO_WHATSIT); switchButton.setToolTip(Lang.localize("gui.telepad.configure.telepad")); } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index eb2edb38..e33cfce4 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -3,17 +3,18 @@ package crazypants.enderio.teleport.telepad; import joptsimple.internal.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; -import org.apache.commons.lang3.tuple.Triple; import org.lwjgl.opengl.GL11; import com.google.common.collect.Lists; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.TextFieldEIO; import crazypants.enderio.gui.TextFieldEIO.ICharFilter; @@ -38,41 +39,55 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { } private static final int ID_SWITCH_BUTTON = 99; + private static final int ID_TELEPORT_BUTTON = 100; ToggleTravelButton switchButton; + GuiButton teleportButton; private World world; private TileTelePad te; - private TextFieldEIO x, y, z; + private TextFieldEIO xTF, yTF, zTF; + + public static int SWITCH_X = 155, SWITCH_Y = 5; public GuiTelePad(InventoryPlayer playerInv, TileTelePad te, World world) { super(new ContainerTelePad(playerInv)); this.world = world; this.te = te; + ySize += 19; FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - x = new TextFieldEIO(fr, 20, 10, 120, 16); - y = new TextFieldEIO(fr, 20, 35, 120, 16); - z = new TextFieldEIO(fr, 20, 60, 120, 16); - - x.setCharFilter(new CoordCharFilter(x)).setText(Integer.toString(te.getX())); - y.setCharFilter(new CoordCharFilter(y)).setText(Integer.toString(te.getY())); - z.setCharFilter(new CoordCharFilter(z)).setText(Integer.toString(te.getZ())); + int x = 24; + int y = 10; + xTF = new TextFieldEIO(fr, x, y, xSize - x * 2, 16); + yTF = new TextFieldEIO(fr, x, y + xTF.height + 2, xSize - x * 2, 16); + zTF = new TextFieldEIO(fr, x, y + (xTF.height * 2) + 4, xSize - x * 2, 16); - textFields.addAll(Lists.newArrayList(x, y, z)); + xTF.setCharFilter(new CoordCharFilter(xTF)).setText(Integer.toString(te.getX())); + yTF.setCharFilter(new CoordCharFilter(yTF)).setText(Integer.toString(te.getY())); + zTF.setCharFilter(new CoordCharFilter(zTF)).setText(Integer.toString(te.getZ())); - switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, 150, 10, IconEIO.IO_WHATSIT); + textFields.addAll(Lists.newArrayList(xTF, yTF, zTF)); + + switchButton = new ToggleTravelButton(this, ID_SWITCH_BUTTON, SWITCH_X, SWITCH_Y, IconEIO.IO_WHATSIT); switchButton.setToolTip(Lang.localize("gui.telepad.configure.travel")); - - this.ySize += 19; } - + @Override public void initGui() { super.initGui(); switchButton.onGuiInit(); + + String text = Lang.localize("gui.telepad.teleport"); + int width = getFontRenderer().getStringWidth(text) + 10; + + int x = guiLeft + (xSize / 2) - (width / 2); + int y = guiTop + 70; + + teleportButton = new GuiButton(ID_TELEPORT_BUTTON, x, y, width, 20, text); + addButton(teleportButton); } @Override @@ -87,7 +102,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { } private void updateCoords() { - BlockCoord bc = new BlockCoord(x.getText(), y.getText(), z.getText()); + BlockCoord bc = new BlockCoord(xTF.getText(), yTF.getText(), zTF.getText()); if(bc.x != te.getX() || bc.y != te.getY() || bc.z != te.getZ()) { te.setX(bc.x); te.setY(bc.y); @@ -110,7 +125,7 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { String[] text = { "X", "Y", "Z" }; for (int i = 0; i < text.length; i++) { GuiTextField f = textFields.get(i); - fnt.drawString(text[i], f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 5, f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2), 0x000000); + fnt.drawString(text[i], f.xPosition - (fnt.getStringWidth(text[i]) / 2) - 6, f.yPosition + ((f.height - fnt.FONT_HEIGHT) / 2), 0x000000); } super.drawGuiContainerBackgroundLayer(p_146976_1_, p_146976_2_, p_146976_3_); @@ -121,4 +136,13 @@ public class GuiTelePad extends GuiContainerBase implements IToggleableGui { mc.thePlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TELEPAD_TRAVEL, world, te.xCoord, te.yCoord, te.zCoord); PacketHandler.INSTANCE.sendToServer(new PacketOpenServerGui(te, GuiHandler.GUI_ID_TELEPAD_TRAVEL)); } + + @Override + protected void actionPerformed(GuiButton button) { + super.actionPerformed(button); + + if (button.id == ID_TELEPORT_BUTTON) { + te.teleportSpecific(mc.thePlayer); + } + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 19dd0037..dd045ac3 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -3,20 +3,26 @@ package crazypants.enderio.teleport.telepad; import java.util.EnumSet; import java.util.List; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; 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.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.EnergyStorage; import com.google.common.collect.Lists; import crazypants.enderio.api.teleport.ITelePad; +import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.power.IInternalPowerReceiver; +import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.TileTravelAnchor; +import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.BlockCoord; import crazypants.util.Util; @@ -240,6 +246,53 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } } + @Override + public void teleportSpecific(Entity entity) { + if(!inNetwork()) { + return; + } + if(isMaster()) { + if(getRange().isVecInside(Vec3.createVectorHelper(entity.posX, entity.posY, entity.posZ))) { + teleport(entity); + } + } else { + master.teleportSpecific(entity); + } + } + + @Override + public void teleportAll() { + if(!inNetwork()) { + return; + } + if(isMaster()) { + for (Entity e : getEntitiesInRange()) { + if(!teleport(e)) { + return; + } + } + } else { + master.teleportAll(); + } + } + + @SuppressWarnings("unchecked") + private List getEntitiesInRange() { + return worldObj.getEntitiesWithinAABB(Entity.class, getRange()); + } + + private AxisAlignedBB getRange() { + return AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord, zCoord - 1, xCoord + 2, yCoord + 3, zCoord + 2); + } + + private boolean teleport(Entity entity) { + if (entity.worldObj.isRemote) { + return TravelController.instance.doClientTeleport(entity, target, TravelSource.TELEPAD, 0, false); + } else { + return PacketTravelEvent.doServerTeleport(entity, target.x, target.y, target.z, 0, false); + } + } + /* ITravelAccessable overrides */ @Override