From 91a900d84ef24feee60416b0b3a5aeefdd530a14 Mon Sep 17 00:00:00 2001
From: Nicholas Ignoffo <speedynutty68@gmail.com>
Date: Fri, 30 Dec 2016 17:34:43 -0800
Subject: [PATCH] Add current charge to Waila tooltip (#1013)

(cherry picked from commit c7f2b7d)
---
 .../compat/waila/provider/DataProviderBloodAltar.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
index 9ec8b3b4..b6011653 100644
--- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
+++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java
@@ -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;