diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index f7b2c464..1073a733 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -175,6 +175,34 @@ public final class Config { */ public static int teleportStaffFailedBlinkDistance = 64; + /** + * Sets the teleport staff right-click action. + * + *

+ * Values: + *

+ */ + public static int teleportStaffAction = 3; + + /** + * Sets the teleport staff sneak right-click action. + * + *

+ * Values: + *

+ */ + public static int teleportStaffSneakAction = 1; + public static int enderIoRange = 8; public static boolean enderIoMeAccessEnabled = true; @@ -1271,6 +1299,27 @@ public final class Config { "Number of blocks teleported when no block is being looked at.") .getInt(teleportStaffFailedBlinkDistance); + teleportStaffAction = config.get( + sectionStaff.name, + "teleportStaffAction", + teleportStaffAction, + "Sets the action for right-click with the staff of teleportation. Values:\n" + " 0: Do nothing\n" + + " 1: Teleport to look\n" + + " 2: Teleport to anchor\n" + + " 3: Teleport to anchor, or look if no anchor (default)") + .getInt(teleportStaffAction); + + teleportStaffSneakAction = config.get( + sectionStaff.name, + "teleportStaffSneakAction", + teleportStaffSneakAction, + "Sets the action for sneak right-click with the staff of teleportation. Values:\n" + + " 0: Do nothing\n" + + " 1: Teleport to look (default)\n" + + " 2: Teleport to anchor\n" + + " 3: Teleport to anchor, or look if no anchor") + .getInt(teleportStaffSneakAction); + enderIoRange = config.get( sectionEfficiency.name, "enderIoRange", diff --git a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java index a0d50c98..0331bcc6 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.config.Config; import crazypants.enderio.machine.power.PowerDisplayUtil; public class ItemTeleportStaff extends ItemTravelStaff { @@ -56,14 +57,30 @@ public class ItemTeleportStaff extends ItemTravelStaff { @Override public ItemStack onItemRightClick(ItemStack equipped, World world, EntityPlayer player) { if (world.isRemote) { - if (player.isSneaking()) { - TravelController.instance - .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF); - } else { - TravelController.instance.doTeleport(player); + int action = player.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction; + switch (action) { + case 0: + // Do nothing. + break; + + case 1: + TravelController.instance.doTeleport(player); + player.swingItem(); + break; + + case 2: + TravelController.instance + .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF); + player.swingItem(); + break; + + case 3: + TravelController.instance + .activateTravelAccessable(equipped, world, player, TravelSource.TELEPORT_STAFF, true); + player.swingItem(); + break; } } - player.swingItem(); return equipped; } diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 866e1449..55e066a2 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -3,10 +3,8 @@ package crazypants.enderio.teleport; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Random; -import java.util.TreeMap; import javax.annotation.Nullable; @@ -32,6 +30,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.world.WorldEvent; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; @@ -41,7 +40,10 @@ import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector2d; import com.enderio.core.common.vecmath.Vector3d; import com.google.common.collect.MultimapBuilder; +import com.google.common.collect.RowSortedTable; import com.google.common.collect.SetMultimap; +import com.google.common.collect.Table; +import com.google.common.collect.TreeBasedTable; import com.gtnewhorizon.gtnhlib.GTNHLib; import cpw.mods.fml.common.Loader; @@ -148,8 +150,9 @@ public class TravelController { // target must be a valid selectedCoord // selectedCoord can either be a block right above/below when the player is on anchor... if (on.x == x && on.z == z) return null; - // or another anchor - TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj); + // or another anchor. We need to look one block below because TP goes above the anchor. + BlockCoord belowTarget = target.getLocation(ForgeDirection.DOWN); + TileEntity maybeAnchor = belowTarget.getTileEntity(toTp.worldObj); if (!(maybeAnchor instanceof ITravelAccessable)) return "not anchor"; ITravelAccessable anchor = (ITravelAccessable) maybeAnchor; if (!isValidTarget(toTp, target, TravelSource.BLOCK)) { @@ -190,12 +193,36 @@ public class TravelController { } public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source) { + return activateTravelAccessable(equipped, world, player, source, false); + } + + public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source, + boolean alsoDoTeleport) { if (!hasTarget()) { + if (alsoDoTeleport) { + Optional destinationOptional = findTeleportDestination(player); + if (destinationOptional.isPresent()) { + BlockCoord destination = destinationOptional.get(); + PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent( + player, + false, + source, + true, + destination.x, + destination.y, + destination.z); + PacketHandler.INSTANCE.sendToServer(p); + // We have no way of knowing if it will succeed, so just return false. + return false; + } + } + PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source); PacketHandler.INSTANCE.sendToServer(p); // We have no way of knowing if it will succeed, so just return false. return false; } + BlockCoord target = selectedCoord; TileEntity te = world.getTileEntity(target.x, target.y, target.z); if (te instanceof ITravelAccessable) { @@ -243,7 +270,10 @@ public class TravelController { sample.add(eye); // we test against our feets location sample.y -= playerHeight; - if (doBlinkAround(player, source, sample, true)) { + + Optional destinationOptional = findNearbyDestination(player, source, sample); + if (destinationOptional.isPresent() + && travelToLocation(player, source, destinationOptional.get(), true)) { return true; } } @@ -280,7 +310,9 @@ public class TravelController { // we test against our feets location sample.y -= playerHeight; - if (doBlinkAround(player, source, sample, false)) { + Optional destinationOptional = findNearbyDestination(player, source, sample); + if (destinationOptional.isPresent() + && travelToLocation(player, source, destinationOptional.get(), false)) { return true; } teleDistance++; @@ -296,7 +328,9 @@ public class TravelController { // we test against our feets location sample.y -= playerHeight; - if (doBlinkAround(player, source, sample, false)) { + Optional destinationOptional = findNearbyDestination(player, source, sample); + if (destinationOptional.isPresent() + && travelToLocation(player, source, destinationOptional.get(), false)) { return true; } sampleDistance--; @@ -308,114 +342,13 @@ public class TravelController { /** This is the teleport staff super-teleport. */ public boolean doTeleport(EntityPlayer player) { - TravelSource source = TravelSource.TELEPORT_STAFF_BLINK; - - Vector3d eye = Util.getEyePositionEio(player); - Vector3d look = Util.getLookVecEio(player); - - double playerHeight = player.yOffset; - // +2 to compensate for the standard distance decrement of -2 - double teleDistance = Config.teleportStaffFailedBlinkDistance + 2; - Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); - - // rayTraceBlocks has a limit of 200 distance. - double maxDistance = Config.teleportStaffMaxBlinkDistance; - double currDistance = 0; - Vec3 pos = eye3; - boolean loop = true; - while (loop) { - double distance = 200; - if (maxDistance - currDistance < 200) { - distance = maxDistance - currDistance; - loop = false; - } - - Vector3d sample = new Vector3d(look); - sample.scale(distance); - sample.add(eye); - Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); - - MovingObjectPosition p = player.worldObj - .rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); - if (p != null) { - teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)); - break; - } - - pos = end; - currDistance += distance; - } - - Vector3d sample = new Vector3d(look); - sample.scale(Config.teleportStaffMaxBlinkDistance); - sample.add(eye); - Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); - MovingObjectPosition p = player.worldObj - .rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); - if (p != null) { - teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)); - } - - double distanceIncrement = -2; - // Special case: if the targeted block is too close, we'll try to teleport through it. - if (teleDistance < 3) { - distanceIncrement = 2; - } - - for (int i = 0; i < 8; i++) { - teleDistance += distanceIncrement; - - sample.set(look); - sample.scale(teleDistance); - sample.add(eye); - // we test against our feets location - sample.y -= playerHeight; - - if (doBlinkAround(player, source, sample, false)) { - return true; - } + Optional destinationOptional = findTeleportDestination(player); + if (destinationOptional.isPresent()) { + return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), false); } return false; } - /** Returns empty optional if no travel destination was found. */ - public Optional findTravelDestination(EntityPlayer player, TravelSource source) { - Vector3d eye = Util.getEyePositionEio(player); - Vector3d look = Util.getLookVecEio(player); - - // Map of distance to coordinate for eligible travel destinations (within angle). - Map distanceMap = new TreeMap<>(); - // Limit the max distance at which we'll display an out of range message. - // Otherwise, you could trigger the message for any travel anchor on the entire server. - double maxMessageDistance = 1.25 * source.getMaxDistanceTravelled(); - boolean displayOutOfRangeMessage = false; - for (BlockCoord p : travelDestinations.get(player.worldObj.provider.dimensionId)) { - Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5); - block.sub(eye); - double distance = block.length(); - if (distance > maxMessageDistance) { - continue; - } - block.normalize(); - - double angle = Math.acos(look.dot(block)); - // Roughly 5 degrees - if (angle < 0.087) { - if (distance > source.getMaxDistanceTravelled()) { - displayOutOfRangeMessage = true; - } else { - distanceMap.put(distance, p); - } - } - } - - if (displayOutOfRangeMessage && distanceMap.isEmpty()) { - showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); - } - - return distanceMap.values().stream().findFirst(); - } - private boolean isBlackListedBlock(EntityPlayer player, MovingObjectPosition pos, Block hitBlock) { UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(hitBlock); if (ui == null) { @@ -426,36 +359,6 @@ public class TravelController { || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); } - private boolean doBlinkAround(EntityPlayer player, TravelSource source, Vector3d sample, boolean conserveMomentum) { - if (travelToLocation( - player, - source, - new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z)), - conserveMomentum)) { - return true; - } - if (travelToLocation( - player, - source, - new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z)), - conserveMomentum)) { - return true; - } - if (!Config.travelStaffSearchOptimize) { - if (travelToLocation( - player, - source, - new BlockCoord( - (int) Math.floor(sample.x), - (int) Math.floor(sample.y) - 1, - (int) Math.floor(sample.z)), - conserveMomentum)) { - return true; - } - } - return false; - } - public boolean showTargets() { return showTargets && selectionEnabled; } @@ -492,6 +395,13 @@ public class TravelController { .getBlock(selectedCoord.x, selectedCoord.y, selectedCoord.z) == EnderIO.blockEnderIo; } + @SubscribeEvent + public void onWorldLoad(WorldEvent.Load e) { + if (!e.world.isRemote) { + travelDestinations.removeAll(e.world.provider.dimensionId); + } + } + @SubscribeEvent @SideOnly(Side.CLIENT) public void onRender(RenderWorldLastEvent event) { @@ -527,7 +437,7 @@ public class TravelController { } onBlockCoord = getActiveTravelBlock(player); boolean onBlock = onBlockCoord != null; - showTargets = onBlock || isTravelItemActive(player, false); + showTargets = onBlock || (isTravelItemActive(player, false) && !shouldHideTargets(player)); if (showTargets) { updateSelectedTarget(player); } else { @@ -619,6 +529,16 @@ public class TravelController { return getTravelItemTravelSource(ep, checkInventoryAndBaubles) != null; } + /** Currently, we only hide travel targets for the teleport staff, in certain action modes. */ + public boolean shouldHideTargets(EntityPlayer ep) { + if (getTravelItemTravelSource(ep, false) != TravelSource.TELEPORT_STAFF) { + return false; + } + + int action = ep.isSneaking() ? Config.teleportStaffSneakAction : Config.teleportStaffAction; + return action < 2; + } + /** Returns null if no travel item is in inventory/baubles. */ @Nullable public TravelSource getTravelItemTravelSource(EntityPlayer ep, boolean checkInventoryAndBaubles) { @@ -713,43 +633,201 @@ public class TravelController { return travelItemSlot; } + /** Finds the destination for the teleport staff super-teleport, or returns empty optional if unsuccessful. */ + public Optional findTeleportDestination(EntityPlayer player) { + TravelSource source = TravelSource.TELEPORT_STAFF_BLINK; + + Vector3d eye = Util.getEyePositionEio(player); + Vector3d look = Util.getLookVecEio(player); + + double playerHeight = player.yOffset; + // +2 to compensate for the standard distance decrement of -2 + double teleDistance = Config.teleportStaffFailedBlinkDistance + 2; + Vec3 eye3 = Vec3.createVectorHelper(eye.x, eye.y, eye.z); + + // rayTraceBlocks has a limit of 200 distance. + double maxDistance = Config.teleportStaffMaxBlinkDistance; + double currDistance = 0; + Vec3 pos = eye3; + boolean loop = true; + while (loop) { + double distance = 200; + if (maxDistance - currDistance < 200) { + distance = maxDistance - currDistance; + loop = false; + } + + Vector3d sample = new Vector3d(look); + sample.scale(distance); + sample.add(eye); + Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); + + MovingObjectPosition p = player.worldObj + .rayTraceBlocks(pos, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); + if (p != null) { + teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)); + break; + } + + pos = end; + currDistance += distance; + } + + Vector3d sample = new Vector3d(look); + sample.scale(Config.teleportStaffMaxBlinkDistance); + sample.add(eye); + Vec3 end = Vec3.createVectorHelper(sample.x, sample.y, sample.z); + MovingObjectPosition p = player.worldObj + .rayTraceBlocks(eye3, end, !Config.travelStaffBlinkThroughClearBlocksEnabled); + if (p != null) { + teleDistance = VecmathUtil.distance(eye, new Vector3d(p.blockX + 0.5, p.blockY + 0.5, p.blockZ + 0.5)); + } + + double distanceIncrement = -2; + int maxIter = Math.min(8, (int) teleDistance / 2); + // Special case: if the targeted block is too close, we'll try to teleport through it. + if (teleDistance < 4) { + distanceIncrement = 0.5; + maxIter = 32; + } + + for (int i = 0; i < maxIter; i++) { + teleDistance += distanceIncrement; + + sample.set(look); + sample.scale(teleDistance); + sample.add(eye); + // we test against our feets location + sample.y -= playerHeight; + + Optional destinationOptional = findNearbyDestination(player, source, sample); + if (destinationOptional.isPresent()) { + return destinationOptional; + } + } + return Optional.empty(); + } + + /** Finds a long-distance travel anchor, or returns empty optional if unsuccessful. */ + public Optional findTravelDestination(EntityPlayer player, TravelSource source) { + double maxDistance = source.getMaxDistanceTravelled(); + double maxMessageDistance = 1.25 * maxDistance; + // Find possible destinations within about 5 degrees. + RowSortedTable possibleDestinations = findBlocksWithinAngle( + player, + travelDestinations.get(player.worldObj.provider.dimensionId), + 0.087, + maxMessageDistance); + + for (Table.Cell cell : possibleDestinations.cellSet()) { + if (cell.getColumnKey() <= maxDistance) { + return Optional.of(cell.getValue()); + } + } + + if (!possibleDestinations.isEmpty()) { + // We found at least one block within maxMessageDistance, but no blocks within maxDistance. + showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); + } + + return Optional.empty(); + } + + /** Finds a valid destination near the provided vector, or returns empty optional if unsuccessful. */ + private Optional findNearbyDestination(EntityPlayer player, TravelSource source, Vector3d sample) { + Optional destinationOptional = findValidDestination( + player, + source, + new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y), (int) Math.floor(sample.z))); + if (destinationOptional.isPresent()) { + return destinationOptional; + } + + destinationOptional = findValidDestination( + player, + source, + new BlockCoord((int) Math.floor(sample.x), (int) Math.floor(sample.y) + 1, (int) Math.floor(sample.z))); + if (destinationOptional.isPresent()) { + return destinationOptional; + } + + if (!Config.travelStaffSearchOptimize) { + destinationOptional = findValidDestination( + player, + source, + new BlockCoord( + (int) Math.floor(sample.x), + (int) Math.floor(sample.y) - 1, + (int) Math.floor(sample.z))); + if (destinationOptional.isPresent()) { + return destinationOptional; + } + } + + return Optional.empty(); + } + + /** + * Returns the provided position if it's valid, or returns empty optional if unsuccessful. + * + *

+ * To be precise: if the destination is a travel anchor or other block, then the returned coordinates will be one + * block higher, to place the player on top of the block. + */ + public Optional findValidDestination(EntityPlayer player, TravelSource source, BlockCoord coord) { + // Are we trying to travel to a block (anchor or telepad)? + boolean travelToBlock = source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK; + + BlockCoord destination = coord; + if (travelToBlock) { + TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (!ta.canBlockBeAccessed(player)) { + showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); + return Optional.empty(); + } + } + + // We actually want to go on top of the block. + destination = coord.getLocation(ForgeDirection.UP); + } + + if (!isInRangeTarget(player, destination, source.getMaxDistanceTravelledSq())) { + if (travelToBlock) { + showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); + } + return Optional.empty(); + } + if (!isValidTarget(player, destination, source)) { + if (travelToBlock) { + showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget")); + } + return Optional.empty(); + } + + return Optional.of(destination); + } + public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) { return travelToLocation(player, source, selectedCoord, conserveMomentum); } public boolean travelToLocation(EntityPlayer player, TravelSource source, BlockCoord coord, boolean conserveMomentum) { - - if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) { - TileEntity te = player.worldObj.getTileEntity(coord.x, coord.y, coord.z); - if (te instanceof ITravelAccessable) { - ITravelAccessable ta = (ITravelAccessable) te; - if (!ta.canBlockBeAccessed(player)) { - showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); - return false; - } - } + Optional destinationOptional = findValidDestination(player, source, coord); + if (!destinationOptional.isPresent()) { + return false; } + BlockCoord destination = destinationOptional.get(); int requiredPower = 0; - requiredPower = getRequiredPower(player, source, coord); + requiredPower = getRequiredPower(player, source, destination); if (requiredPower < 0) { return false; } - if (!isInRangeTarget(player, coord, source.getMaxDistanceTravelledSq())) { - if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) { - showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange")); - } - return false; - } - if (!isValidTarget(player, coord, source)) { - if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) { - showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget")); - } - return false; - } - if (doClientTeleport(player, coord, source, requiredPower, conserveMomentum)) { + if (doClientTeleport(player, destinationOptional.get(), source, requiredPower, conserveMomentum)) { for (int i = 0; i < 6; ++i) { player.worldObj.spawnParticle( "portal", @@ -764,6 +842,17 @@ public class TravelController { return true; } + public boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) { + if (bc == null) { + return false; + } + World w = player.worldObj; + BlockCoord baseLoc = bc; + + return canTeleportTo(player, source, baseLoc, w) + && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w); + } + public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) { if (!isTravelItemActive(player, true)) { return 0; @@ -808,21 +897,6 @@ public class TravelController { return Math.sqrt(getDistanceSquared(player, coord)); } - private boolean isValidTarget(EntityPlayer player, BlockCoord bc, TravelSource source) { - if (bc == null) { - return false; - } - World w = player.worldObj; - BlockCoord baseLoc = bc; - if (source != TravelSource.STAFF_BLINK && source != TravelSource.TELEPORT_STAFF_BLINK) { - // targeting a block so go one up - baseLoc = bc.getLocation(ForgeDirection.UP); - } - - return canTeleportTo(player, source, baseLoc, w) - && canTeleportTo(player, source, baseLoc.getLocation(ForgeDirection.UP), w); - } - private boolean canTeleportTo(EntityPlayer player, TravelSource source, BlockCoord bc, World w) { if (bc.y < 1) { return false; @@ -904,6 +978,7 @@ public class TravelController { if (selectedBlock instanceof ITravelAccessable) { ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock; BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z); + BlockCoord destination = targetBlock.getLocation(ForgeDirection.UP); if (Config.travelAnchorSkipWarning) { if (travelBlock.getRequiresPassword(player)) { @@ -914,55 +989,67 @@ public class TravelController { && !travelBlock.canUiBeAccessed(player)) { showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate")); } - if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + if (!isValidTarget(player, destination, TravelSource.BLOCK)) { showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed")); } } - if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, destination, TravelSource.BLOCK)) { return targetBlock; } } return null; } + /** + * Returns a row-sorted table with angle in radians as the row, distance as the column, and block coordinate as the + * value, holding all blocks which lie within the specified viewing angle and distance. + * + *

+ * The table is sorted by angle ascending, so the smallest angle will be first. + * + * @param player The player to search from. + * @param blocks The blocks to search through. + * @param maxAngle The maximum allowed angle, in radians. + * @param maxDistance The maximum allowed distance. + */ + private RowSortedTable findBlocksWithinAngle(EntityPlayer player, + Iterable blocks, double maxAngle, double maxDistance) { + Vector3d eye = Util.getEyePositionEio(player); + Vector3d look = Util.getLookVecEio(player); + + // Table of angle, distance, and block coordinate holding found blocks. + // Angle is the row, so this table will automatically be sorted by angle ascending. + RowSortedTable foundBlocks = TreeBasedTable.create(); + + for (BlockCoord p : blocks) { + Vector3d block = new Vector3d(p.x + 0.5, p.y + 0.5, p.z + 0.5); + block.sub(eye); + double distance = block.length(); + if (distance > maxDistance) { + continue; + } + block.normalize(); + + double angle = Math.acos(look.dot(block)); + if (angle <= maxAngle) { + foundBlocks.put(angle, distance, p); + } + } + + return foundBlocks; + } + @SideOnly(Side.CLIENT) private void updateSelectedTarget(EntityPlayer player) { - selectedCoord = null; if (candidates.isEmpty()) { + selectedCoord = null; return; } - double closestDistance = Double.MAX_VALUE; - for (BlockCoord bc : candidates.keySet()) { - if (!bc.equals(onBlockCoord)) { - - double d = addRatio(bc); - if (d < closestDistance) { - selectedCoord = bc; - closestDistance = d; - } - } - } - - 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 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; - } - } + // Find the nearest travel anchor within roughly 10 degrees. + Optional selectedBlock = findBlocksWithinAngle(player, candidates.keySet(), 0.175, Double.MAX_VALUE) + .values().stream().findFirst(); + selectedCoord = selectedBlock.orElse(null); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java index 6cc1e8f1..f34e2d71 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/TileTravelAnchor.java @@ -337,6 +337,9 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable public void validate() { super.validate(); if (isTravelSource()) { + // Note: travelDestinations is a SetMultimap, which does not allow duplicate entries. + // So it's okay if this gets called multiple times with the same BlockCoord. + // Though, I think that it's not currently getting called multiple times, anyway. TravelController.instance.travelDestinations.put(worldObj.provider.dimensionId, getLocation()); } } @@ -346,10 +349,4 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable super.invalidate(); TravelController.instance.travelDestinations.remove(worldObj.provider.dimensionId, getLocation()); } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - TravelController.instance.travelDestinations.remove(worldObj.provider.dimensionId, getLocation()); - } } diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java index 0beb1a9e..a8ef8f13 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketLongDistanceTravelEvent.java @@ -7,7 +7,10 @@ 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.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; @@ -18,6 +21,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; import crazypants.enderio.api.teleport.IItemOfTravel; +import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.api.teleport.TeleportEntityEvent; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.teleport.ItemTeleportStaff; @@ -30,13 +34,27 @@ public class PacketLongDistanceTravelEvent boolean conserveMotion; int entityId; int source; + // Below values are for also attempting a regular blink if the long-distance anchor check fails. + boolean alsoDoTeleport; + int tpX; + int tpY; + int tpZ; public PacketLongDistanceTravelEvent() {} public PacketLongDistanceTravelEvent(Entity entity, boolean conserveMotion, TravelSource source) { + this(entity, conserveMotion, source, false, 0, 0, 0); + } + + public PacketLongDistanceTravelEvent(Entity entity, boolean conserveMotion, TravelSource source, + boolean alsoDoTeleport, int tpX, int tpY, int tpZ) { this.conserveMotion = conserveMotion; this.entityId = entity instanceof EntityPlayer ? -1 : entity.getEntityId(); this.source = source.ordinal(); + this.alsoDoTeleport = alsoDoTeleport; + this.tpX = tpX; + this.tpY = tpY; + this.tpZ = tpZ; } @Override @@ -44,6 +62,10 @@ public class PacketLongDistanceTravelEvent buf.writeBoolean(conserveMotion); buf.writeInt(entityId); buf.writeInt(source); + buf.writeBoolean(alsoDoTeleport); + buf.writeInt(tpX); + buf.writeInt(tpY); + buf.writeInt(tpZ); } @Override @@ -51,6 +73,10 @@ public class PacketLongDistanceTravelEvent conserveMotion = buf.readBoolean(); entityId = buf.readInt(); source = buf.readInt(); + alsoDoTeleport = buf.readBoolean(); + tpX = buf.readInt(); + tpY = buf.readInt(); + tpZ = buf.readInt(); } @Override @@ -69,7 +95,14 @@ public class PacketLongDistanceTravelEvent TravelSource source = TravelSource.values()[message.source]; - if (!validate(toTp, source)) { + if (!validate( + toTp, + source, + message.conserveMotion, + message.alsoDoTeleport, + message.tpX, + message.tpY, + message.tpZ)) { Log.LOGGER.warn( Log.securityMarker, "Player {} tried to tp without valid prereq.", @@ -77,35 +110,82 @@ public class PacketLongDistanceTravelEvent return null; } - doServerTeleport(toTp, message.conserveMotion, source); + doServerTeleport( + toTp, + message.conserveMotion, + source, + message.alsoDoTeleport, + message.tpX, + message.tpY, + message.tpZ); return null; } - private static boolean validate(EntityPlayerMP toTp, TravelSource source) { + private static boolean validate(EntityPlayerMP toTp, TravelSource source, boolean conserveMotion, + boolean alsoDoTeleport, int tpX, int tpY, int tpZ) { ItemStack equippedItem = toTp.getCurrentEquippedItem(); switch (source) { case STAFF: + // Not allowed to do teleport staff teleport with regular staff. + if (alsoDoTeleport) { + return false; + } return equippedItem != null && equippedItem.getItem() instanceof IItemOfTravel && ((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem); case TELEPORT_STAFF: // tp staff is creative version of traveling staff // no energy check or anything else needed // but the player must actually be equipped with one of these + if (alsoDoTeleport) { + String error = TravelController.instance + .validatePacketTravelEvent(toTp, tpX, tpY, tpZ, 0, conserveMotion, source); + if (error != null) { + return false; + } + } return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff; + default: // all other types are not allowed return false; } } - public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source) { - EntityPlayer player = toTp instanceof EntityPlayer ? (EntityPlayer) toTp : null; - Optional travelDestination = TravelController.instance.findTravelDestination(player, source); - if (!travelDestination.isPresent()) { + public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source, + boolean alsoDoTeleport, int tpX, int tpY, int tpZ) { + if (!(toTp instanceof EntityPlayer)) { return false; } - BlockCoord destination = travelDestination.get(); + EntityPlayer player = (EntityPlayer) toTp; + + Optional travelDestination = TravelController.instance.findTravelDestination(player, source); + if (!travelDestination.isPresent()) { + if (alsoDoTeleport) { + return PacketTravelEvent.doServerTeleport(toTp, tpX, tpY, tpZ, 0, conserveMotion, source); + } + return false; + } + + BlockCoord targetBlock = travelDestination.get(); + TileEntity te = player.worldObj.getTileEntity(targetBlock.x, targetBlock.y, targetBlock.z); + if (te instanceof ITravelAccessable) { + ITravelAccessable ta = (ITravelAccessable) te; + if (!ta.canBlockBeAccessed(player)) { + TravelController + .showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised")); + return false; + } + } + + // We're teleporting to a block, so go one above. + BlockCoord destination = targetBlock.getLocation(ForgeDirection.UP); + if (!TravelController.instance.isValidTarget(player, destination, source)) { + TravelController + .showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget")); + return false; + } + int x = destination.x; int y = destination.y; int z = destination.z; @@ -113,7 +193,7 @@ public class PacketLongDistanceTravelEvent if (powerUse < 0) { return false; } - if (player != null && player.getCurrentEquippedItem() != null + if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { int used = ((IItemOfTravel) player.getCurrentEquippedItem().getItem()) .canExtractInternal(player.getCurrentEquippedItem(), powerUse); @@ -134,32 +214,26 @@ public class PacketLongDistanceTravelEvent toTp.playSound(source.sound, 1.0F, 1.0F); - if (player != null) { - player.setPositionAndUpdate(x + 0.5, y + 1.1, z + 0.5); - } else { - toTp.setPosition(x, y, z); + player.setPositionAndUpdate(x + 0.5, y + 0.1, z + 0.5); + + player.worldObj.playSoundEffect(x, y, z, source.sound, 1.0F, 1.0F); + player.fallDistance = 0; + + if (conserveMotion) { + Vector3d velocityVex = Util.getLookVecEio(player); + S12PacketEntityVelocity p = new S12PacketEntityVelocity( + toTp.getEntityId(), + velocityVex.x, + velocityVex.y, + velocityVex.z); + ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(p); } - toTp.worldObj.playSoundEffect(x, y, z, source.sound, 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); - } + 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/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index cb31e488..82230b17 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -118,7 +118,7 @@ public class PacketTravelEvent implements IMessage, IMessageHandler