lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert changes to Sacrificial Dagger

Browse source 
Adds a description that indicates correct usage.
This commit is contained in:
Nicholas Ignoffo 2016-06-28 15:01:53 -07:00
parent bb8552b4b5
commit fc57486054
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -73,6 +73,9 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced) public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean advanced)
{ {
list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.BloodMagic.sacrificialDagger.desc")))); 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 @Override
@ -106,7 +109,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack); return new ActionResult<ItemStack>(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); RayTraceResult rayTrace = rayTrace(world, player, false);
if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK) if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK)

1
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -303,6 +303,7 @@ tooltip.BloodMagic.bound.axe.desc=&oDemonic deforestation
tooltip.BloodMagic.bound.shovel.desc=&oScrubs floors clean of dirt 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.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.slate.desc=Infused stone inside of a Blood Altar
tooltip.BloodMagic.inscriber.desc=The writing is on the wall... tooltip.BloodMagic.inscriber.desc=The writing is on the wall...