From 7f6a9f0a5ecc415e6b427c4d638d2befc7147764 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Mon, 17 Aug 2015 00:59:20 +0100 Subject: [PATCH] Add mana usage indicators to the relevant relics. --- .../botania/common/item/relic/ItemFlugelEye.java | 14 ++++++++++++-- .../common/item/relic/ItemInfiniteFruit.java | 8 +++++++- .../botania/common/item/relic/ItemKingKey.java | 8 +++++++- .../botania/common/item/relic/ItemLokiRing.java | 8 +++++++- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4ed03143f..c00b74259 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -20,12 +20,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem { +public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { public ItemFlugelEye() { super(LibItemNames.FLUGEL_EYE); @@ -80,7 +83,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem { int z = ItemNBTHelper.getInt(stack, TAG_Z, 0); int dim = ItemNBTHelper.getInt(stack, TAG_DIMENSION, 0); - if(y > -1 && dim == world.provider.dimensionId) { + int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, player.posX, player.posY, player.posZ) * 10); + + if(y > -1 && dim == world.provider.dimensionId && ManaItemHandler.requestManaExact(stack, player, cost, true)) { moveParticlesAndSound(player); if(player instanceof EntityPlayerMP && !world.isRemote) ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(x + 0.5, y + 1.6, z + 0.5, player.rotationYaw, player.rotationPitch); @@ -119,6 +124,11 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem { return y == -1 ? null : new ChunkCoordinates(x, y, z); } + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + /* // Code from the older iteration of this item: diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 9784be6b8..a2951a043 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -14,12 +14,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import cpw.mods.fml.relauncher.ReflectionHelper; -public class ItemInfiniteFruit extends ItemRelic { +public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); @@ -56,4 +57,9 @@ public class ItemInfiniteFruit extends ItemRelic { } } + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 2edd6c425..a760f0a3f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -26,7 +27,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; -public class ItemKingKey extends ItemRelic { +public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; private static final String TAG_CHARGING = "charging"; @@ -134,5 +135,10 @@ public class ItemKingKey extends ItemRelic { public boolean isFull3D() { return true; } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 039c20204..5f7bed57f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -32,6 +32,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.item.IExtendedWireframeCoordinateListProvider; import vazkii.botania.api.item.ISequentialBreaker; +import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; @@ -46,7 +47,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider { +public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; private static final String TAG_CURSOR_PREFIX = "cursor"; @@ -276,5 +277,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC ItemNBTHelper.setCompound(stack, TAG_CURSOR_LIST, cmp); } + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + }