From fc574860544485e4371c7bd9cf7951997fd64c28 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 28 Jun 2016 15:01:53 -0700 Subject: [PATCH] Revert changes to Sacrificial Dagger Adds a description that indicates correct usage. --- .../WayofTime/bloodmagic/item/ItemSacrificialDagger.java | 5 ++++- src/main/resources/assets/bloodmagic/lang/en_US.lang | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index cd1e8a0c..29ebda58 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -73,6 +73,9 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sacrificialDagger.desc")))); + + if (stack.getItemDamage() == 1) + list.add(TextHelper.localizeEffect("tooltip.BloodMagic.sacrificialDagger.creative")); } @Override @@ -106,7 +109,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider return new ActionResult(EnumActionResult.SUCCESS, stack); } - int lpAdded = getMetadata(stack) == 1 ? Integer.MAX_VALUE : ConfigHandler.sacrificialDaggerConversion * ConfigHandler.sacrificialDaggerDamage; + int lpAdded = ConfigHandler.sacrificialDaggerConversion * ConfigHandler.sacrificialDaggerDamage; RayTraceResult rayTrace = rayTrace(world, player, false); if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 81fb49ec..07323055 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -303,6 +303,7 @@ tooltip.BloodMagic.bound.axe.desc=&oDemonic deforestation tooltip.BloodMagic.bound.shovel.desc=&oScrubs floors clean of dirt tooltip.BloodMagic.sacrificialDagger.desc=Just a prick of the finger will suffice... +tooltip.BloodMagic.sacrificialDagger.creative=Right click an altar while sneaking to fill it tooltip.BloodMagic.slate.desc=Infused stone inside of a Blood Altar tooltip.BloodMagic.inscriber.desc=The writing is on the wall...