From 5282c2d031ff8ad928b542ce0ccf7a9a89df30dd Mon Sep 17 00:00:00 2001 From: Walker Fowlkes Date: Thu, 13 Jun 2024 11:00:55 -0700 Subject: [PATCH 1/2] fix log spam on death --- src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java index cd12a04057..2a049e4094 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java +++ b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java @@ -23,7 +23,11 @@ public void registerInventory() public NonNullList getCuriosInventory(Player player) { - IItemHandlerModifiable itemHandler = CuriosApi.getCuriosInventory(player).resolve().get().getEquippedCurios(); + Optional<> curioInv = CuriosApi.getCuriosInventory(player).resolve(); + if (!curioInv.isPresent()) { + return NonNullList.create(); + } + IItemHandlerModifiable itemHandler = curioInv.get().getEquippedCurios(); NonNullList inventory = NonNullList.create(); for (int i = 0; i < itemHandler.getSlots(); i++) { From 8ba87a0cf9bbb42a4d35b6d847378a7a7029a4d1 Mon Sep 17 00:00:00 2001 From: Walker Fowlkes Date: Wed, 19 Jun 2024 21:43:34 -0700 Subject: [PATCH 2/2] fix compile error --- src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java index 2a049e4094..d389601d55 100644 --- a/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java +++ b/src/main/java/wayoftime/bloodmagic/compat/CuriosCompat.java @@ -6,12 +6,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; import top.theillusivec4.curios.api.type.inventory.ICurioStacksHandler; import wayoftime.bloodmagic.core.LivingArmorRegistrar; import wayoftime.bloodmagic.core.living.LivingStats; import wayoftime.bloodmagic.core.living.LivingUtil; import wayoftime.bloodmagic.impl.BloodMagicAPI; import java.util.Map; +import java.util.Optional; public class CuriosCompat { @@ -23,8 +25,8 @@ public void registerInventory() public NonNullList getCuriosInventory(Player player) { - Optional<> curioInv = CuriosApi.getCuriosInventory(player).resolve(); - if (!curioInv.isPresent()) { + Optional curioInv = CuriosApi.getCuriosInventory(player).resolve(); + if (curioInv.isEmpty()) { return NonNullList.create(); } IItemHandlerModifiable itemHandler = curioInv.get().getEquippedCurios();