Demon Will Aura Gauge +Curio, -Active Slots Only

Adjusted `Utils.canPlayerSeeDemonWill()` and `Utils.getDemonWillResolution()` to use the `InventoryHelper`.

Functionality Change: The new implementation checks only "active" slots (Main and Off-hands, Curios, and any slots add-ons mark as active).  With base Blood Magic that means the gauge will only show up when held or in a Curios slot.

Added tags needed to put the Demon Will Aura Gauge in the Curios Charm and LA Socket slots.

src/main/java/wayoftime/bloodmagic/util/Utils.java

@@ -8,6 +8,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -43,6 +44,7 @@
 import net.minecraftforge.items.wrapper.SidedInvWrapper;
 import wayoftime.bloodmagic.api.compat.IDemonWillViewer;
 import wayoftime.bloodmagic.common.tile.TileInventory;
+import wayoftime.bloodmagic.util.helper.InventoryHelper;
 import wayoftime.bloodmagic.util.helper.NBTHelper;
 
 public class Utils
@@ -571,55 +573,27 @@ public static ItemStack[] combineStacks(ItemStack stack1, ItemStack stack2)
 
  public static boolean canPlayerSeeDemonWill(Player player)
  {
- IItemHandler inventory = new PlayerMainInvWrapper(player.getInventory());
-
- for (int i = 0; i < inventory.getSlots(); i++)
+ NonNullList<ItemStack> inventory = InventoryHelper.getActiveInventories(player);
+ for (ItemStack stack : inventory)
  {
- ItemStack stack = inventory.getStackInSlot(i);
- if (stack.isEmpty())
- {
- continue;
- }
-
  if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getCommandSenderWorld(), stack, player))
  {
  return true;
  }
  }
-
- ItemStack offhandStack = player.getOffhandItem();
- if (!offhandStack.isEmpty() && offhandStack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) offhandStack.getItem()).canSeeDemonWillAura(player.getCommandSenderWorld(), offhandStack, player))
- {
- return true;
- }
-
  return false;
  }
 
  public static double getDemonWillResolution(Player player)
  {
- IItemHandler inventory = new PlayerMainInvWrapper(player.getInventory());
-
- for (int i = 0; i < inventory.getSlots(); i++)
+ NonNullList<ItemStack> inventory = InventoryHelper.getActiveInventories(player);
+ for (ItemStack stack : inventory)
  {
- ItemStack stack = inventory.getStackInSlot(i);
- if (stack.isEmpty())
- {
- continue;
- }
-
  if (stack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) stack.getItem()).canSeeDemonWillAura(player.getCommandSenderWorld(), stack, player))
  {
  return ((IDemonWillViewer) stack.getItem()).getDemonWillAuraResolution(player.getCommandSenderWorld(), stack, player);
  }
  }
-
- ItemStack offhandStack = player.getOffhandItem();
- if (!offhandStack.isEmpty() && offhandStack.getItem() instanceof IDemonWillViewer && ((IDemonWillViewer) offhandStack.getItem()).canSeeDemonWillAura(player.getCommandSenderWorld(), offhandStack, player))
- {
- return ((IDemonWillViewer) offhandStack.getItem()).getDemonWillAuraResolution(player.getCommandSenderWorld(), offhandStack, player);
- }
-
  return 100;
  }
 

src/main/resources/data/curios/tags/items/charm.json

@@ -8,6 +8,7 @@
  "bloodmagic:sigilofholding",
  "bloodmagic:divinationsigil",
  "bloodmagic:seersigil",
- "bloodmagic:experiencebook"
+ "bloodmagic:experiencebook",
+ "bloodmagic:demonwillgauge"
  ]
 }

src/main/resources/data/curios/tags/items/living_armour_socket.json

@@ -13,6 +13,7 @@
  "bloodmagic:soulgemlesser",
  "bloodmagic:soulgemcommon",
  "bloodmagic:soulgemgreater",
- "bloodmagic:upgradetrainer"
+ "bloodmagic:upgradetrainer",
+ "bloodmagic:demonwillgauge"
  ]
 }