Fix inventoryTick receiving the wrong slot index and deprecate onArmo…

…rTick (#549)
neoforged · Jan 29, 2024 · 98c7acc · 98c7acc
1 parent d27a0bd
commit 98c7acc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/patches/net/minecraft/world/entity/player/Inventory.java.patch b/patches/net/minecraft/world/entity/player/Inventory.java.patch
@@ -19,7 +19,19 @@
              if (p_36049_.hasTag()) {
                  itemstack.setTag(p_36049_.getTag().copy());
              }
-@@ -237,6 +_,7 @@
+@@ -230,13 +_,18 @@
+     }
+
+     public void tick() {
++        int slot = 0;
+         for(NonNullList<ItemStack> nonnulllist : this.compartments) {
+             for(int i = 0; i < nonnulllist.size(); ++i) {
+                 if (!nonnulllist.get(i).isEmpty()) {
+-                    nonnulllist.get(i).inventoryTick(this.player.level(), this.player, i, this.selected == i);
++                    // Neo: Fix the slot param to be the global index instead of the per-compartment index.
++                    // Neo: Fix the selected param to only be true for hotbar slots.
++                    nonnulllist.get(i).inventoryTick(this.player.level(), this.player, slot, this.selected == slot);
++                    slot++;
                  }
              }
          }

diff --git a/src/main/java/net/neoforged/neoforge/common/extensions/IItemExtension.java b/src/main/java/net/neoforged/neoforge/common/extensions/IItemExtension.java
@@ -279,7 +279,10 @@ default boolean doesSneakBypassUse(ItemStack stack, net.minecraft.world.level.Le
 
     /**
      * Called to tick armor in the armor slot. Override to do something
+     * 
+     * @deprecated Use {@link Item#inventoryTick(ItemStack, Level, Entity, int, boolean)} by checking that the slot argument is an armor slot. Armor slots are 36, 37, 38 and 39.
      */
+    @Deprecated(forRemoval = true, since = "1.20.4")
     default void onArmorTick(ItemStack stack, Level level, Player player) {}
 
     /**

diff --git a/src/main/java/net/neoforged/neoforge/common/extensions/IItemStackExtension.java b/src/main/java/net/neoforged/neoforge/common/extensions/IItemStackExtension.java
@@ -271,7 +271,10 @@ default float getXpRepairRatio() {
 
     /**
      * Called to tick armor in the armor slot. Override to do something
+     * 
+     * @deprecated Use {@link Item#inventoryTick(ItemStack, Level, Entity, int, boolean)} by checking that the slot argument is an armor slot. Armor slots are 36, 37, 38 and 39.
      */
+    @Deprecated(forRemoval = true, since = "1.20.4")
     default void onArmorTick(Level level, Player player) {
         self().getItem().onArmorTick(self(), level, player);
     }