mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Fix missed patch causing new onInventoryTick method to not be called.
This commit is contained in:
2 files changed
+21
-16
No files matched your search
@@ -19,15 +19,19 @@
|
||||
if (p_36049_.hasTag()) {
|
||||
itemstack.setTag(p_36049_.getTag().copy());
|
||||
}
|
||||
@@ -229,7 +_,7 @@
|
||||
@@ -222,10 +_,11 @@
|
||||
}
|
||||
|
||||
public void tick() {
|
||||
+ int idx = 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);
|
||||
+ nonnulllist.get(i).onInventoryTick(this.player.level(), this.player, idx++, this.selected);
|
||||
}
|
||||
}
|
||||
}
|
||||
-
|
||||
+ armor.forEach(e -> e.onArmorTick(player.level(), player));
|
||||
}
|
||||
|
||||
public boolean add(ItemStack p_36055_) {
|
||||
@@ -277,6 +_,8 @@
|
||||
} catch (Throwable throwable) {
|
||||
CrashReport crashreport = CrashReport.forThrowable(throwable, "Adding item to inventory");
|
||||
|
||||
@@ -340,16 +340,17 @@ public interface IForgeItem
|
||||
*/
|
||||
default void onInventoryTick(ItemStack stack, Level level, Player player, int slotIndex, int selectedIndex)
|
||||
{
|
||||
// For compatibility reasons we have to use non-local index values, I think this is a vanilla bug but lets maintain compatibility
|
||||
int vanillaIndex = slotIndex;
|
||||
if (slotIndex >= 36) {
|
||||
vanillaIndex -= 36;
|
||||
if (vanillaIndex >= 4)
|
||||
vanillaIndex -= 4;
|
||||
else
|
||||
onArmorTick(stack, level, player);
|
||||
}
|
||||
stack.inventoryTick(level, player, vanillaIndex, selectedIndex == vanillaIndex);
|
||||
// For compatibility reasons we have to use non-local index values, I think this is a vanilla bug but lets maintain compatibility
|
||||
var inv = player.getInventory();
|
||||
int vanillaIndex = slotIndex;
|
||||
if (slotIndex >= inv.items.size()) {
|
||||
vanillaIndex -= inv.items.size();
|
||||
if (vanillaIndex >= inv.armor.size())
|
||||
vanillaIndex -= inv.armor.size();
|
||||
else
|
||||
onArmorTick(stack, level, player);
|
||||
}
|
||||
stack.inventoryTick(level, player, vanillaIndex, selectedIndex == vanillaIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user