Add current charge to Waila tooltip (#1013)

(cherry picked from commit c7f2b7d)
This commit is contained in:
Nicholas Ignoffo 2016-12-30 17:34:43 -08:00
parent 4c3938c0f9
commit 91a900d84e

View file

@ -88,12 +88,14 @@ public class DataProviderBloodAltar implements IWailaDataProvider
if (hasSeer)
{
int charge = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_TOTAL_CHARGE);
int progress = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_PROGRESS);
int liquidRequired = accessor.getNBTData().getCompoundTag("bloodAltar").getInteger(Constants.NBT.ALTAR_LIQUID_REQ);
int craftAmount = 1;
if (accessor.getNBTData().getTagList("Items", 10).get(0).getId() == 10)
craftAmount = ((NBTTagCompound)accessor.getNBTData().getTagList("Items", 10).get(0)).getByte("Count");
currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", (int) (((double) progress / (double) liquidRequired * 100) / craftAmount) + "%"));
currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentCharge", charge));
}
}
} else
@ -143,7 +145,7 @@ public class DataProviderBloodAltar implements IWailaDataProvider
if (player.getHeldItemMainhand().getItem() instanceof ItemSigilDivination)
return true;
if (player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination)
if (player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ItemSigilDivination)
return true;
return false;