diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 85f5d69a..e751fae1 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -466,6 +466,8 @@ enderio.darksteel.upgrade.jump_one.name=Jump enderio.darksteel.upgrade.jump_one.tooltip.detailed.line1=Increases step and jump height enderio.darksteel.upgrade.travel.name=Travel +enderio.darksteel.upgrade.travel.tooltip.detailed.line1=Hold shift and r-click to teleport or +enderio.darksteel.upgrade.travel.tooltip.detailed.line2=activate a travel anchor or Ender IO enderio.darksteel.upgrade.glider.name=Glider enderio.darksteel.upgrade.glider.tooltip.detailed.line1=Enables gliding diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index c3e6a6c8..f23820fc 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -23,10 +23,13 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.teleport.IItemOfTravel; +import crazypants.enderio.teleport.TravelController; +import crazypants.enderio.teleport.TravelSource; import crazypants.util.ItemUtil; import crazypants.util.Lang; -public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem { +public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem, IItemOfTravel { public static boolean isEquipped(EntityPlayer player) { if(player == null) { @@ -53,6 +56,8 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return res; } + private long lastBlickTick = -1; + public ItemDarkSteelPickaxe() { super(ItemDarkSteelSword.MATERIAL); setCreativeTab(EnderIOTab.tabEnderIO); @@ -70,6 +75,7 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine is = new ItemStack(this); EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); par3List.add(is); } @@ -215,4 +221,44 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return new ItemStack(this); } + @Override + public boolean isActive(EntityPlayer ep, ItemStack equipped) { + return isTravelUpgradeActive(ep, equipped); + } + + @Override + public void extractInternal(ItemStack equipped, int power) { + extractEnergy(equipped, power, false); + } + + private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { + return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(isTravelUpgradeActive(player, stack)) { + if(world.isRemote) { + if(TravelController.instance.activateTravelAccessable(stack, world, player, TravelSource.STAFF)) { + player.swingItem(); + return stack; + } + } + + long ticksSinceBlink = player.worldObj.getTotalWorldTime() - lastBlickTick; + if(ticksSinceBlink < 0) { + lastBlickTick = -1; + } + if(Config.travelStaffBlinkEnabled && world.isRemote && ticksSinceBlink >= Config.travelStaffBlinkPauseTicks) { + if(TravelController.instance.doBlink(stack, player)) { + player.swingItem(); + lastBlickTick = player.worldObj.getTotalWorldTime(); + } + } + return stack; + } + + return super.onItemRightClick(stack, world, player); + } + } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 9c542e60..e9ecc70f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -85,7 +85,8 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte is = new ItemStack(this); EnergyUpgrade.EMPOWERED_FOUR.writeToItem(is); - EnergyUpgrade.setPowerFull(is); + EnergyUpgrade.setPowerFull(is); + TravelUpgrade.INSTANCE.writeToItem(is); par3List.add(is); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java index f682df3c..428809a3 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/TravelUpgrade.java @@ -38,7 +38,7 @@ public class TravelUpgrade extends AbstractUpgrade { @Override public boolean canAddToItem(ItemStack stack) { - if(stack == null || stack.getItem() != EnderIO.itemDarkSteelSword || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { + if(stack == null || (stack.getItem() != EnderIO.itemDarkSteelSword && stack.getItem() != EnderIO.itemDarkSteelPickaxe) || !EnergyUpgrade.itemHasAnyPowerUpgrade(stack)) { return false; } TravelUpgrade up = loadFromItem(stack);