Update to new InventoryView internals

Jikoo · Jul 27, 2024 · 31539df · 31539df
1 parent 68f0b7b
commit 31539df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...1_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenChestMenu.java b/...1_R1/src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenChestMenu.java
@@ -45,7 +45,7 @@ public abstract class OpenChestMenu<T extends Container & ISpecialInventory & In
   protected final boolean viewOnly;
   protected final boolean ownContainer;
   protected final int topSize;
-  private CraftInventoryView bukkitEntity;
+  private CraftInventoryView<OpenChestMenu<T>> bukkitEntity;
   // Syncher fields
   private @Nullable ContainerSynchronizer synchronizer;
   private final List<DataSlot> dataSlots = new ArrayList<>();
@@ -129,22 +129,22 @@ protected void preSlotSetup() {}
 
 
   @Override
-  public final @NotNull CraftInventoryView getBukkitView() {
+  public final @NotNull CraftInventoryView<OpenChestMenu<T>> getBukkitView() {
     if (bukkitEntity == null) {
       bukkitEntity = createBukkitEntity();
     }
 
     return bukkitEntity;
   }
 
-  protected @NotNull CraftInventoryView createBukkitEntity() {
+  protected @NotNull CraftInventoryView<OpenChestMenu<T>> createBukkitEntity() {
     Inventory top;
     if (viewOnly) {
       top = new OpenDummyInventory(container);
     } else {
       top = container.getBukkitInventory();
     }
-    return new CraftInventoryView(viewer.getBukkitEntity(), top, this) {
+    return new CraftInventoryView<>(viewer.getBukkitEntity(), top, this) {
       @Override
       public @Nullable Inventory getInventory(int rawSlot) {
         if (viewOnly) {

diff --git a/.../src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenInventoryMenu.java b/.../src/main/java/com/lishid/openinv/internal/v1_21_R1/container/menu/OpenInventoryMenu.java
@@ -104,7 +104,7 @@ protected boolean checkViewOnly() {
   }
 
   @Override
-  protected @NotNull CraftInventoryView createBukkitEntity() {
+  protected @NotNull CraftInventoryView<OpenChestMenu<OpenInventory>> createBukkitEntity() {
     org.bukkit.inventory.Inventory bukkitInventory;
     if (viewOnly) {
       bukkitInventory = new OpenDummyInventory(container);
@@ -114,7 +114,7 @@ protected boolean checkViewOnly() {
       bukkitInventory = container.getBukkitInventory();
     }
 
-    return new CraftInventoryView(viewer.getBukkitEntity(), bukkitInventory, this) {
+    return new CraftInventoryView<>(viewer.getBukkitEntity(), bukkitInventory, this) {
       @Override
       public org.bukkit.inventory.ItemStack getItem(int index) {
         if (viewOnly || index < 0) {
@@ -174,7 +174,7 @@ public int convertSlot(int rawSlot) {
         if (slot >= topSize) {
           return super.getSlotType(offset + slot);
         }
-        return container.getSlotType(offset + slot);
+        return OpenInventoryMenu.this.container.getSlotType(offset + slot);
       }
 
       @Override