v2.0.0.6

-Fix PageBuilder fill ordering. Took 3 minutes
Jake-Moore · Nov 19, 2023 · fab77bc · fab77bc
1 parent 88fd9a4
commit fab77bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.kamikazejam</groupId>
     <artifactId>kamicommon</artifactId>
-    <version>2.0.0.5</version>
+    <version>2.0.0.6</version>
     <packaging>jar</packaging>
 
     <name>KamiCommon</name>

diff --git a/src/main/java/com/kamikazejam/kamicommon/gui/page/PageBuilder.java b/src/main/java/com/kamikazejam/kamicommon/gui/page/PageBuilder.java
@@ -143,14 +143,9 @@ public KamiMenu createMenu(Player player, int page) {
         // Add other icons
         addOtherIcons();
 
-        // Filler items
-        KamiMenuItem fillerItem = getFillerIcon();
-        if (fillerItem != null && fillerItem.getIBuilder() != null && fillerItem.isEnabled()) {
-            menu.fill(fillerItem.getIBuilder());
-        }
-
         // If there are no items to add, open the menu
         if (!items.exists(page)) {
+            tryFill();
             return menu;
         }
 
@@ -162,9 +157,20 @@ public KamiMenu createMenu(Player player, int page) {
         }
 
         // Return the menu !
+        tryFill();
         return menu;
     }
 
+    private void tryFill() {
+        if (menu == null) { return; }
+
+        // Filler items
+        KamiMenuItem fillerItem = getFillerIcon();
+        if (fillerItem != null && fillerItem.getIBuilder() != null && fillerItem.isEnabled()) {
+            menu.fill(fillerItem.getIBuilder());
+        }
+    }
+
     public void addOtherIcons() {
         Collection<KamiMenuItem> otherIcons = supplyOtherIcons();