updated onArmorTick overrides to inventoryTick

KyaniteMods · Jul 17, 2024 · 6dd55be · 6dd55be
1 parent 0857bb5
commit 6dd55be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java b/src/main/java/com/kyanite/deeperdarker/content/items/SoulElytraItem.java
@@ -5,12 +5,13 @@
 import com.kyanite.deeperdarker.DeeperDarker;
 import com.kyanite.deeperdarker.DeeperDarkerConfig;
 import com.kyanite.deeperdarker.content.DDItems;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -38,10 +39,12 @@ public boolean isValidRepairItem(@NotNull ItemStack pToRepair, ItemStack pRepair
     }
 
     @Override
-    public void onArmorTick(ItemStack stack, Level level, Player player) {
-        if(level.isClientSide() && player.getCooldowns().isOnCooldown(DDItems.SOUL_ELYTRA.get())) {
-            float percent = player.getCooldowns().getCooldownPercent(DDItems.SOUL_ELYTRA.get(), 0);
-            player.displayClientMessage(Component.translatable("item." + DeeperDarker.MOD_ID + ".soul_elytra.cooldown", (int) Math.ceil(percent * DeeperDarkerConfig.soulElytraCooldown / 20)), true);
+    public void inventoryTick(@NotNull ItemStack pStack, @NotNull Level pLevel, @NotNull Entity pEntity, int pSlotId, boolean pIsSelected) {
+        if(pEntity instanceof LocalPlayer player && pSlotId == 2) {
+            if(player.getCooldowns().isOnCooldown(DDItems.SOUL_ELYTRA.get())) {
+                float percent = player.getCooldowns().getCooldownPercent(DDItems.SOUL_ELYTRA.get(), 0);
+                player.displayClientMessage(Component.translatable("item." + DeeperDarker.MOD_ID + ".soul_elytra.cooldown", (int) Math.ceil(percent * DeeperDarkerConfig.soulElytraCooldown / 20)), true);
+            }
         }
     }
 }
diff --git a/src/main/java/com/kyanite/deeperdarker/content/items/WardenArmorItem.java b/src/main/java/com/kyanite/deeperdarker/content/items/WardenArmorItem.java
@@ -3,16 +3,18 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.kyanite.deeperdarker.content.DDItems;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class WardenArmorItem extends ArmorItem {
@@ -35,12 +37,10 @@ public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlo
     }
 
     @Override
-    public void onArmorTick(ItemStack stack, Level level, Player player) {
-        if(!level.isClientSide()) {
-            if(stack.getEquipmentSlot() == EquipmentSlot.HEAD) {
-                if(player.hasEffect(MobEffects.BLINDNESS)) player.removeEffect(MobEffects.BLINDNESS);
-                if(player.hasEffect(MobEffects.DARKNESS)) player.removeEffect(MobEffects.DARKNESS);
-            }
+    public void inventoryTick(@NotNull ItemStack pStack, @NotNull Level pLevel, @NotNull Entity pEntity, int pSlotId, boolean pIsSelected) {
+        if (pEntity instanceof ServerPlayer player && pSlotId == 3) {
+            if (player.hasEffect(MobEffects.BLINDNESS)) player.removeEffect(MobEffects.BLINDNESS);
+            if (player.hasEffect(MobEffects.DARKNESS)) player.removeEffect(MobEffects.DARKNESS);
         }
     }