Travel Anchor Elevators

This commit is contained in:
Dwargkiller committed 2015-04-29 22:26:57 +02:00
1 parent 731e283dfa
commit c3f31ec2f4
4 files changed
+126 -32

No files matched your search

@@ -123,6 +123,9 @@ public final class Config {
public static boolean travelAnchorEnabled = true;
public static int travelAnchorMaxDistance = 48;
public static int travelAnchorCooldown = 0;
public static boolean travelAnchorSneak = true;
public static boolean travelAnchorSkipWarning = true;
public static int travelStaffMaxDistance = 128;
public static float travelStaffPowerPerBlockRF = 250;
@@ -682,6 +685,15 @@ public final class Config {
travelAnchorMaxDistance = config.get(sectionAnchor.name, "travelAnchorMaxDistance", travelAnchorMaxDistance,
"Maximum number of blocks that can be traveled from one travel anchor to another.").getInt(travelAnchorMaxDistance);
travelAnchorCooldown = config.get(sectionAnchor.name, "travelAnchorCooldown", travelAnchorCooldown,
"Number of ticks cooldown between activations (1 sec = 20 ticks)").getInt(travelAnchorCooldown);
travelAnchorSneak = config.get(sectionAnchor.name, "travelAnchorSneak", travelAnchorSneak,
"Add sneak as an option to activate travel anchors").getBoolean(travelAnchorSneak);
travelAnchorSkipWarning = config.get(sectionAnchor.name, "travelAnchorSkipWarning", travelAnchorSkipWarning,
"Travel Anchors send a chat warning when skipping inaccessible anchors").getBoolean(travelAnchorSkipWarning);
travelStaffMaxDistance = config.get(sectionStaff.name, "travelStaffMaxDistance", travelStaffMaxDistance,
"Maximum number of blocks that can be traveled using the Staff of the Traveling.").getInt(travelStaffMaxDistance);
travelStaffPowerPerBlockRF = (float) config.get(sectionStaff.name, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF,
@@ -57,6 +57,16 @@ public class TravelController {
private boolean wasJumping = false;
private boolean wasSneaking = false;
private int delayTimer = 0;
private int timer = Config.travelAnchorCooldown;
private boolean tempJump;
private boolean tempSneak;
private boolean showTargets = false;
public BlockCoord onBlockCoord;
@@ -287,32 +297,38 @@ public class TravelController {
selectedCoord = null;
}
MovementInput input = player.movementInput;
if(input.jump && !wasJumping && onBlock && selectedCoord != null) {
tempJump = input.jump;
tempSneak = input.sneak;
BlockCoord target = TravelController.instance.selectedCoord;
TileEntity te = player.worldObj.getTileEntity(target.x, target.y, target.z);
if(te instanceof ITravelAccessable) {
ITravelAccessable ta = (ITravelAccessable) te;
if(ta.getRequiresPassword(player)) {
PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z);
PacketHandler.INSTANCE.sendToServer(p);
return;
}
}
// Handles teleportation if a target is selected
if((input.jump && !wasJumping && onBlock && selectedCoord != null && delayTimer == 0)
|| (input.sneak && !wasSneaking && onBlock && selectedCoord != null && delayTimer == 0 && Config.travelAnchorSneak)) {
if(isTargetEnderIO()) {
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");
} catch (Exception e) {
//ignore
}
}
onInput(player);
delayTimer = timer;
}
// If there is no selected coordinate and the input is jump, go up
if(input.jump && !wasJumping && onBlock && selectedCoord == null && delayTimer == 0) {
updateVerticalTarget(player, 1);
onInput(player);
delayTimer = timer;
}
wasJumping = input.jump;
// If there is no selected coordinate and the input is sneak, go down
if(input.sneak && !wasSneaking && onBlock && selectedCoord == null && delayTimer == 0) {
updateVerticalTarget(player, -1);
onInput(player);
delayTimer = timer;
}
if(delayTimer != 0) {
delayTimer--;
}
wasJumping = tempJump;
wasSneaking = tempSneak;
candidates.clear();
}
}
@@ -511,6 +527,40 @@ public class TravelController {
return block.getLightOpacity(w, x, y, z) < 2;
}
@SideOnly(Side.CLIENT)
private void updateVerticalTarget(EntityClientPlayerMP player, int direction) {
BlockCoord currentBlock = getActiveTravelBlock(player);
World world = Minecraft.getMinecraft().theWorld;
for (int i = 0, y = currentBlock.y + direction; i < Config.travelAnchorMaxDistance && y >= 0 && y <= 255; i++, y += direction) {
//Circumvents the raytracing used to find candidates on the y axis
TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z);
if(selectedBlock instanceof ITravelAccessable) {
ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock;
BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z);
if(Config.travelAnchorSkipWarning) {
if(travelBlock.getRequiresPassword(player)) {
player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked"));
}
if(travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE && !travelBlock.canUiBeAccessed(player)) {
player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate"));
}
if(!isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
player.addChatComponentMessage(new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed"));
}
}
if(travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) {
selectedCoord = targetBlock;
return;
}
}
}
}
@SideOnly(Side.CLIENT)
private void updateSelectedTarget(EntityClientPlayerMP player) {
selectedCoord = null;
@@ -550,6 +600,37 @@ public class TravelController {
}
}
private void onInput(EntityClientPlayerMP player) {
MovementInput input = player.movementInput;
BlockCoord target = TravelController.instance.selectedCoord;
if(target == null) {
return;
}
TileEntity te = player.worldObj.getTileEntity(target.x, target.y, target.z);
if(te instanceof ITravelAccessable) {
ITravelAccessable ta = (ITravelAccessable) te;
if(ta.getRequiresPassword(player)) {
PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z);
PacketHandler.INSTANCE.sendToServer(p);
return;
}
}
if(isTargetEnderIO()) {
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");
} catch (Exception e) {
//ignore
}
}
}
public double getScaleForCandidate(Vector3d loc) {
if(!currentView.isValid()) {
@@ -612,7 +693,7 @@ public class TravelController {
}
return TravelSource.BLOCK.maxDistanceTravelledSq;
}
public boolean doClientTeleport(Entity entity, BlockCoord bc, TravelSource source, int powerUse, boolean conserveMomentum) {
TeleportEntityEvent evt = new TeleportEntityEvent(entity, source, bc.x, bc.y, bc.z);
@@ -44,13 +44,10 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
if(accessMode == AccessMode.PUBLIC) {
return true;
}
if(accessMode == AccessMode.PRIVATE) {
return placedBy != null && placedBy.equals(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()));
}
if(placedBy != null && placedBy.equals(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()))) {
return true;
}
return authorisedUsers.contains(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()));
// Covers protected and private access modes
return (placedBy != null && placedBy.equals(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName())))
|| authorisedUsers.contains(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()));
}
@Override
@@ -78,8 +75,9 @@ public class TileTravelAnchor extends TileEntityEio implements ITravelAccessable
}
@Override
public boolean getRequiresPassword(EntityPlayer username) {
return getAccessMode() != AccessMode.PUBLIC && !canUiBeAccessed(username) && !authorisedUsers.contains(PlayerUtil.getPlayerUUID(username.getGameProfile().getName()));
public boolean getRequiresPassword(EntityPlayer playerName) {
return getAccessMode() == AccessMode.PROTECTED && !canUiBeAccessed(playerName)
&& !authorisedUsers.contains(PlayerUtil.getPlayerUUID(playerName.getGameProfile().getName()));
}
@Override