mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 11:59:17 +00:00
2-in-1 TP: find destination client-side
This commit is contained in:
1 parent
58e8bf712c
commit
b237c6cb4d
2 files changed
+157
-78
No files matched your search
@@ -199,7 +199,21 @@ public class TravelController {
|
||||
public boolean activateTravelAccessable(ItemStack equipped, World world, EntityPlayer player, TravelSource source,
|
||||
boolean alsoDoTeleport) {
|
||||
if (!hasTarget()) {
|
||||
PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source, alsoDoTeleport);
|
||||
PacketLongDistanceTravelEvent p = new PacketLongDistanceTravelEvent(player, false, source);
|
||||
if (alsoDoTeleport) {
|
||||
Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
|
||||
if (destinationOptional.isPresent()) {
|
||||
BlockCoord destination = destinationOptional.get();
|
||||
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;
|
||||
@@ -251,7 +265,10 @@ public class TravelController {
|
||||
sample.add(eye);
|
||||
// we test against our feets location
|
||||
sample.y -= playerHeight;
|
||||
if (doBlinkAround(player, source, sample, true)) {
|
||||
|
||||
Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
|
||||
if (destinationOptional.isPresent()
|
||||
&& travelToLocation(player, source, destinationOptional.get(), true)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -288,7 +305,9 @@ public class TravelController {
|
||||
// we test against our feets location
|
||||
sample.y -= playerHeight;
|
||||
|
||||
if (doBlinkAround(player, source, sample, false)) {
|
||||
Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
|
||||
if (destinationOptional.isPresent()
|
||||
&& travelToLocation(player, source, destinationOptional.get(), false)) {
|
||||
return true;
|
||||
}
|
||||
teleDistance++;
|
||||
@@ -304,7 +323,9 @@ public class TravelController {
|
||||
// we test against our feets location
|
||||
sample.y -= playerHeight;
|
||||
|
||||
if (doBlinkAround(player, source, sample, false)) {
|
||||
Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
|
||||
if (destinationOptional.isPresent()
|
||||
&& travelToLocation(player, source, destinationOptional.get(), false)) {
|
||||
return true;
|
||||
}
|
||||
sampleDistance--;
|
||||
@@ -316,6 +337,15 @@ public class TravelController {
|
||||
|
||||
/** This is the teleport staff super-teleport. */
|
||||
public boolean doTeleport(EntityPlayer player) {
|
||||
Optional<BlockCoord> destinationOptional = findTeleportDestination(player);
|
||||
if (destinationOptional.isPresent()) {
|
||||
return travelToLocation(player, TravelSource.TELEPORT_STAFF_BLINK, destinationOptional.get(), true);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Finds the destination for the teleport staff super-teleport, or returns empty optional if unsuccessful. */
|
||||
public Optional<BlockCoord> findTeleportDestination(EntityPlayer player) {
|
||||
TravelSource source = TravelSource.TELEPORT_STAFF_BLINK;
|
||||
|
||||
Vector3d eye = Util.getEyePositionEio(player);
|
||||
@@ -381,14 +411,15 @@ public class TravelController {
|
||||
// we test against our feets location
|
||||
sample.y -= playerHeight;
|
||||
|
||||
if (doBlinkAround(player, source, sample, false)) {
|
||||
return true;
|
||||
Optional<BlockCoord> destinationOptional = findNearbyDestination(player, source, sample);
|
||||
if (destinationOptional.isPresent()) {
|
||||
return destinationOptional;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
/** Returns empty optional if no travel destination was found. */
|
||||
/** Finds a long-distance travel anchor, or returns empty optional if unsuccessful. */
|
||||
public Optional<BlockCoord> findTravelDestination(EntityPlayer player, TravelSource source) {
|
||||
double maxDistance = source.getMaxDistanceTravelled();
|
||||
double maxMessageDistance = 1.25 * maxDistance;
|
||||
@@ -423,36 +454,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;
|
||||
}
|
||||
@@ -727,12 +728,47 @@ public class TravelController {
|
||||
return travelItemSlot;
|
||||
}
|
||||
|
||||
public boolean travelToSelectedTarget(EntityPlayer player, TravelSource source, boolean conserveMomentum) {
|
||||
return travelToLocation(player, source, selectedCoord, conserveMomentum);
|
||||
/** Finds a valid destination near the provided vector, or returns empty optional if unsuccessful. */
|
||||
private Optional<BlockCoord> findNearbyDestination(EntityPlayer player, TravelSource source, Vector3d sample) {
|
||||
Optional<BlockCoord> 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();
|
||||
}
|
||||
|
||||
public boolean travelToLocation(EntityPlayer player, TravelSource source, BlockCoord coord,
|
||||
boolean conserveMomentum) {
|
||||
/**
|
||||
* Returns the provided position if it's valid, or returns empty optional if unsuccessful.
|
||||
*
|
||||
* <p>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<BlockCoord> 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;
|
||||
|
||||
@@ -743,7 +779,7 @@ public class TravelController {
|
||||
ITravelAccessable ta = (ITravelAccessable) te;
|
||||
if (!ta.canBlockBeAccessed(player)) {
|
||||
showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.unauthorised"));
|
||||
return false;
|
||||
return Optional.empty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -751,40 +787,41 @@ public class TravelController {
|
||||
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) {
|
||||
Optional<BlockCoord> destinationOptional = findValidDestination(player, source, coord);
|
||||
if (!destinationOptional.isPresent()) {
|
||||
return false;
|
||||
}
|
||||
BlockCoord destination = destinationOptional.get();
|
||||
|
||||
int requiredPower = 0;
|
||||
requiredPower = getRequiredPower(player, source, destination);
|
||||
if (requiredPower < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!isInRangeTarget(player, destination, source.getMaxDistanceTravelledSq())) {
|
||||
if (travelToBlock) {
|
||||
showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.outOfRange"));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
if (!isValidTarget(player, destination, source)) {
|
||||
if (travelToBlock) {
|
||||
showMessage(player, new ChatComponentTranslation("enderio.blockTravelPlatform.invalidTarget"));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean teleportSuccessful;
|
||||
if (player.worldObj.isRemote) {
|
||||
teleportSuccessful = doClientTeleport(player, destination, source, requiredPower, conserveMomentum);
|
||||
} else {
|
||||
teleportSuccessful = PacketTravelEvent.doServerTeleport(
|
||||
player,
|
||||
destination.x,
|
||||
destination.y,
|
||||
destination.z,
|
||||
requiredPower,
|
||||
conserveMomentum,
|
||||
source);
|
||||
}
|
||||
|
||||
if (teleportSuccessful) {
|
||||
if (doClientTeleport(player, destinationOptional.get(), source, requiredPower, conserveMomentum)) {
|
||||
for (int i = 0; i < 6; ++i) {
|
||||
player.worldObj.spawnParticle(
|
||||
"portal",
|
||||
|
||||
+49
-7
@@ -34,16 +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) {
|
||||
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
|
||||
@@ -52,6 +63,9 @@ public class PacketLongDistanceTravelEvent
|
||||
buf.writeInt(entityId);
|
||||
buf.writeInt(source);
|
||||
buf.writeBoolean(alsoDoTeleport);
|
||||
buf.writeInt(tpX);
|
||||
buf.writeInt(tpY);
|
||||
buf.writeInt(tpZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -60,6 +74,9 @@ public class PacketLongDistanceTravelEvent
|
||||
entityId = buf.readInt();
|
||||
source = buf.readInt();
|
||||
alsoDoTeleport = buf.readBoolean();
|
||||
tpX = buf.readInt();
|
||||
tpY = buf.readInt();
|
||||
tpZ = buf.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -78,7 +95,14 @@ public class PacketLongDistanceTravelEvent
|
||||
|
||||
TravelSource source = TravelSource.values()[message.source];
|
||||
|
||||
if (!validate(toTp, source, message.alsoDoTeleport)) {
|
||||
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.",
|
||||
@@ -86,24 +110,42 @@ public class PacketLongDistanceTravelEvent
|
||||
return null;
|
||||
}
|
||||
|
||||
doServerTeleport(toTp, message.conserveMotion, source, message.alsoDoTeleport);
|
||||
doServerTeleport(
|
||||
toTp,
|
||||
message.conserveMotion,
|
||||
source,
|
||||
message.alsoDoTeleport,
|
||||
message.tpX,
|
||||
message.tpY,
|
||||
message.tpZ);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean validate(EntityPlayerMP toTp, TravelSource source, boolean alsoDoTeleport) {
|
||||
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;
|
||||
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;
|
||||
@@ -111,7 +153,7 @@ public class PacketLongDistanceTravelEvent
|
||||
}
|
||||
|
||||
public static boolean doServerTeleport(Entity toTp, boolean conserveMotion, TravelSource source,
|
||||
boolean alsoDoTeleport) {
|
||||
boolean alsoDoTeleport, int tpX, int tpY, int tpZ) {
|
||||
if (!(toTp instanceof EntityPlayer)) {
|
||||
return false;
|
||||
}
|
||||
@@ -120,7 +162,7 @@ public class PacketLongDistanceTravelEvent
|
||||
Optional<BlockCoord> travelDestination = TravelController.instance.findTravelDestination(player, source);
|
||||
if (!travelDestination.isPresent()) {
|
||||
if (alsoDoTeleport) {
|
||||
return TravelController.instance.doTeleport(player);
|
||||
return PacketTravelEvent.doServerTeleport(toTp, tpX, tpY, tpZ, 0, conserveMotion, source);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user