Merge pull request #1969 from mystchonky/generalise-armor

Make Curio and Elytra-render Item checks generalized
WayofTime · Sep 5, 2023 · 2f166e1 · 2f166e1
2 parents 26ebaf3 + 05fa3f6
commit 2f166e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/wayoftime/bloodmagic/client/render/entity/layers/BloodElytraLayer.java b/src/main/java/wayoftime/bloodmagic/client/render/entity/layers/BloodElytraLayer.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.item.ItemStack;
 import wayoftime.bloodmagic.common.item.ItemLivingArmor;
 import wayoftime.bloodmagic.core.LivingArmorRegistrar;
+import wayoftime.bloodmagic.core.living.ILivingContainer;
 import wayoftime.bloodmagic.core.living.LivingStats;
 import wayoftime.bloodmagic.core.living.LivingUtil;
 
@@ -25,7 +26,7 @@ public BloodElytraLayer(RenderLayerParent<T, M> p_174493_, EntityModelSet p_1744
 	@Override
 	public boolean shouldRender(ItemStack stack, T entity)
 	{
-		if (stack.getItem() instanceof ItemLivingArmor && entity instanceof Player && LivingUtil.hasFullSet((Player) entity))
+		if (stack.getItem() instanceof ILivingContainer && entity instanceof Player && LivingUtil.hasFullSet((Player) entity))
 			return LivingStats.fromPlayer((Player) entity, true).getLevel(LivingArmorRegistrar.UPGRADE_ELYTRA.get().getKey()) > 0;
 		return false;
 	}

diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
@@ -40,6 +40,7 @@
 import wayoftime.bloodmagic.core.LivingArmorRegistrar;
 import wayoftime.bloodmagic.core.data.Binding;
 import wayoftime.bloodmagic.core.data.SoulNetwork;
+import wayoftime.bloodmagic.core.living.ILivingContainer;
 import wayoftime.bloodmagic.core.living.LivingStats;
 import wayoftime.bloodmagic.core.living.LivingUtil;
 import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler;
@@ -1143,7 +1144,7 @@ public void onLivingEquipmentChange(LivingEquipmentChangeEvent event)
 	{
 		if (BloodMagic.curiosLoaded)
 		{ // Without Curios, there is nothing this cares about.
-			if (event.getFrom().getItem() instanceof ItemLivingArmor || event.getTo().getItem() instanceof ItemLivingArmor)
+			if (event.getFrom().getItem() instanceof ILivingContainer || event.getTo().getItem() instanceof ILivingContainer)
 			{ // Armor change involves Living Armor
 				LivingEntity entity = event.getEntity();
 				if (entity instanceof Player)