Run InventoryView interactions through inventory-access

InventoryView was changed from class to interface, which use different bytecode instructions for invoking methods. This ABI-breaking change is intended to be resolved by Spigot's "Commodore", but these bytecode modifications are not applied in all cases, such as when using InvUI in a Paper plugin. Moving all interactions with InventoryView to inventory-access fixes this.
NichtStudioCode · Jul 6, 2024 · d64b4eb · d64b4eb
1 parent 66fe68b
commit d64b4eb
Show file tree

Hide file tree

Showing 22 changed files with 152 additions and 1 deletion.
diff --git a/...nventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/InventoryUtilsImpl.java b/...nventory-access-r1/src/main/java/xyz/xenondevs/inventoryaccess/r1/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -83,4 +85,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/InventoryUtilsImpl.java b/...entory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_18_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/InventoryUtilsImpl.java b/...entory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_18_R2.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/InventoryUtilsImpl.java b/...entory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_19_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r13/src/main/java/xyz/xenondevs/inventoryaccess/r13/InventoryUtilsImpl.java b/...entory-access-r13/src/main/java/xyz/xenondevs/inventoryaccess/r13/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_19_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r14/src/main/java/xyz/xenondevs/inventoryaccess/r14/InventoryUtilsImpl.java b/...entory-access-r14/src/main/java/xyz/xenondevs/inventoryaccess/r14/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_19_R2.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r15/src/main/java/xyz/xenondevs/inventoryaccess/r15/InventoryUtilsImpl.java b/...entory-access-r15/src/main/java/xyz/xenondevs/inventoryaccess/r15/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_19_R3.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r16/src/main/java/xyz/xenondevs/inventoryaccess/r16/InventoryUtilsImpl.java b/...entory-access-r16/src/main/java/xyz/xenondevs/inventoryaccess/r16/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_20_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r17/src/main/java/xyz/xenondevs/inventoryaccess/r17/InventoryUtilsImpl.java b/...entory-access-r17/src/main/java/xyz/xenondevs/inventoryaccess/r17/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_20_R2.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r18/src/main/java/xyz/xenondevs/inventoryaccess/r18/InventoryUtilsImpl.java b/...entory-access-r18/src/main/java/xyz/xenondevs/inventoryaccess/r18/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_20_R3.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r19/src/main/java/xyz/xenondevs/inventoryaccess/r19/InventoryUtilsImpl.java b/...entory-access-r19/src/main/java/xyz/xenondevs/inventoryaccess/r19/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_20_R4.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/InventoryUtilsImpl.java b/...nventory-access-r2/src/main/java/xyz/xenondevs/inventoryaccess/r2/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -83,4 +85,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...entory-access-r20/src/main/java/xyz/xenondevs/inventoryaccess/r20/InventoryUtilsImpl.java b/...entory-access-r20/src/main/java/xyz/xenondevs/inventoryaccess/r20/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_21_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/InventoryUtilsImpl.java b/...nventory-access-r3/src/main/java/xyz/xenondevs/inventoryaccess/r3/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -83,4 +85,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/InventoryUtilsImpl.java b/...nventory-access-r4/src/main/java/xyz/xenondevs/inventoryaccess/r4/InventoryUtilsImpl.java
@@ -7,6 +7,8 @@
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventory;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -60,4 +62,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/InventoryUtilsImpl.java b/...nventory-access-r5/src/main/java/xyz/xenondevs/inventoryaccess/r5/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.craftbukkit.v1_16_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -61,4 +63,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/InventoryUtilsImpl.java b/...nventory-access-r6/src/main/java/xyz/xenondevs/inventoryaccess/r6/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.craftbukkit.v1_16_R2.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -61,4 +63,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/InventoryUtilsImpl.java b/...nventory-access-r7/src/main/java/xyz/xenondevs/inventoryaccess/r7/InventoryUtilsImpl.java
@@ -8,6 +8,8 @@
 import org.bukkit.craftbukkit.v1_16_R3.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -61,4 +63,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         entityPlayer.updateInventory(container);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/InventoryUtilsImpl.java b/...nventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }
diff --git a/...nventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/InventoryUtilsImpl.java b/...nventory-access-r9/src/main/java/xyz/xenondevs/inventoryaccess/r9/InventoryUtilsImpl.java
@@ -14,6 +14,8 @@
 import org.bukkit.craftbukkit.v1_17_R1.util.CraftChatMessage;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.xenondevs.inventoryaccess.abstraction.util.InventoryUtils;
@@ -70,4 +72,9 @@ public void updateOpenInventoryTitle(@NotNull Player player, @NotNull ComponentW
         serverPlayer.initMenu(menu);
     }
 
+    @Override
+    public @Nullable ItemStack getItemStackFromView(@NotNull InventoryView view, int slot) {
+        return view.getItem(slot);
+    }
+
 }