fix: Errors and make scrolling behave more like paginated

TriumphTeam · May 5, 2023 · 98fc432 · 98fc432
1 parent 5fc1a67
commit 98fc432
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 366 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,7 @@ subprojects {
     }
 
     group = "dev.triumphteam"
-    version = "3.1.4"
+    version = "3.1.5"
 
     dependencies {
         compileOnly("org.jetbrains:annotations:21.0.1")

diff --git a/core/src/main/java/dev/triumphteam/gui/guis/GuiListener.java b/core/src/main/java/dev/triumphteam/gui/guis/GuiListener.java
@@ -131,11 +131,6 @@ public void onGuiClose(final InventoryCloseEvent event) {
         // GUI
         final BaseGui gui = (BaseGui) event.getInventory().getHolder();
 
-        // If it's a persistent paginated gui saves the current page modifications
-        if (gui instanceof PersistentPaginatedGui) {
-            ((PersistentPaginatedGui) gui).savePage();
-        }
-
         // The GUI action for closing
         final GuiAction<InventoryCloseEvent> closeAction = gui.getCloseGuiAction();
 

diff --git a/core/src/main/java/dev/triumphteam/gui/guis/PersistentPaginatedGui.java b/core/src/main/java/dev/triumphteam/gui/guis/PersistentPaginatedGui.java
diff --git a/core/src/main/java/dev/triumphteam/gui/guis/ScrollingGui.java b/core/src/main/java/dev/triumphteam/gui/guis/ScrollingGui.java
@@ -267,7 +267,7 @@ private int calculateScrollSize() {
      */
     private void putItemVertically(final GuiItem guiItem) {
         for (int slot = 0; slot < getRows() * 9; slot++) {
-            if (getInventory().getItem(slot) != null) continue;
+            if (getGuiItem(slot) != null || getInventory().getItem(slot) != null) continue;
             getMutableCurrentPageItems().put(slot, guiItem);
             getInventory().setItem(slot, guiItem.getItemStack());
             break;
@@ -283,8 +283,7 @@ private void putItemHorizontally(final GuiItem guiItem) {
         for (int col = 1; col < 10; col++) {
             for (int row = 1; row <= getRows(); row++) {
                 final int slot = getSlotFromRowCol(row, col);
-                if (getInventory().getItem(slot) != null) continue;
-
+                if (getGuiItem(slot) != null || getInventory().getItem(slot) != null) continue;
                 getMutableCurrentPageItems().put(slot, guiItem);
                 getInventory().setItem(slot, guiItem.getItemStack());
                 return;