Merge branch 'main' of ssh://gitty.interesting-corner.nl:2345/sem/mc-ic-server

ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/App.java

@@ -6,7 +6,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import nl.interestingcorner.coordinates.commands.CoordinatesCommand;
 import nl.interestingcorner.coordinates.db.CoordinatesDatabaseManager;
-import nl.interestingcorner.coordinates.gui.CoordinatesGUIListener;
+// import nl.interestingcorner.coordinates.gui.CoordinatesGUIListener;
 
 public class App extends JavaPlugin {
 
@@ -16,7 +16,7 @@ public class App extends JavaPlugin {
         CoordinatesDatabaseManager.INSTANCE.initialize(this);
         getLogger().info("Successfully initialized database");
         
-        getServer().getPluginManager().registerEvents(new CoordinatesGUIListener(), this);
+        // getServer().getPluginManager().registerEvents(new CoordinatesGUIListener(), this);
         registerCommands();
 
     }

ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/commands/GetCoordinatesCommandHandler.java

@@ -5,8 +5,8 @@ import java.util.List;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import nl.interestingcorner.coordinates.db.CoordinatesDatabaseManager;
 import nl.interestingcorner.coordinates.db.Coordinate;
+import nl.interestingcorner.coordinates.db.CoordinatesDatabaseManager;
 import nl.interestingcorner.coordinates.gui.CoordinatesGUI;
 
 public class GetCoordinatesCommandHandler implements CoordinatesCommandHandler {

ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUI.java

@@ -2,67 +2,24 @@ package nl.interestingcorner.coordinates.gui;
 
 import java.util.List;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 
 import nl.interestingcorner.coordinates.db.Coordinate;
-import nl.interestingcorner.core.MinecraftColor;
+import nl.interestingcorner.core.gui.GUI;
 
 public class CoordinatesGUI {
-    public static void open(Player player, List<Coordinate> coordinates) {
+    public static void open(Player player, List<Coordinate> coords) {
+        // Convert coordinates to ItemStacks for GUI display
+        List<ItemStack> items = coords.stream()
+                .map(coord -> {
+                    ItemStack item = coord.toItem();
+                    return item;
+                })
+                .toList();
 
-        int coordinatesAmount = coordinates.size();
+        GUI gui = new GUI("Coordinates", GUI.DEFAULT_PAGE_SIZE);
-        int size;
+        gui.setItems(items);
-        if (coordinatesAmount <= 9) {
+        gui.show(player);
-            size = 9;
-        } else {
-            // TODO handle if size is more than 54 - 9, add pagination
-            /**
-             * if more than 45, add pages. Split by 45 items per page.
-             * use bottom row leftmost and rightmost item for navigation.
-             * use paper item for page number display in middle.
-             * use lore of navigation items clicked to handle showing next/previous page.
-             * use player.getOpeninventory() to get current inventory and update or close it.
-             */
-
-            // round up to nearest multiple of 9
-            size = ((coordinatesAmount / 9) + 1) * 9;
-            player.sendMessage("Size: " + size);
-        }
-
-        // Create an inventory with 9 slots and a title
-        Inventory gui = Bukkit.createInventory(null, size, "Coordinates Menu");
-
-        for (Coordinate coordinate : coordinates) {
-            ItemStack item = createCoordinateItem(coordinate);
-            gui.addItem(item);
-        }
-
-        // Open the GUI for the player
-        player.openInventory(gui);
-    }
-
-    private static ItemStack createCoordinateItem(Coordinate coordinate) {
-        ItemStack itemStack = new ItemStack(coordinate.color.toMaterial());
-        ItemMeta meta = itemStack.getItemMeta();
-        if (meta == null) {
-            return itemStack;
-        }
-        meta.setDisplayName(coordinate.color.toColorCode() + coordinate.name);
-        meta.setLore(List.of(
-            MinecraftColor.WHITE.toColorCode() + coordinate.description,
-            coordinate.nether ? MinecraftColor.RED.toColorCode() +  "Nether Coordinate" : "Overworld Coordinate",
-            "X: " + coordinate.position.x(),
-            "Y: " + coordinate.position.y(),
-            "Z: " + coordinate.position.z(),
-            "World: " + coordinate.world
-        ));
-        itemStack.setItemMeta(meta);
-
-        return itemStack;
     }
 }

ic_plugin_coordinates/src/main/java/nl/interestingcorner/coordinates/gui/CoordinatesGUIListener.java

@@ -1,33 +0,0 @@
-package nl.interestingcorner.coordinates.gui;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.entity.Player;
-import org.bukkit.ChatColor;
-
-public class CoordinatesGUIListener implements Listener{
-
-    @EventHandler
-    public void onInventoryClick(InventoryClickEvent event) {
-
-        // Check if this is our custom GUI
-        if (event.getView().getTitle().equals("Coordinates Menu")) {
-            event.setCancelled(true); // Prevent taking the item
-
-            if (event.getCurrentItem() == null) return;
-
-            Player player = (Player) event.getWhoClicked();
-
-            switch (event.getSlot()) {
-                case 0 -> {
-                    player.sendMessage(ChatColor.GREEN + "You clicked Add Coordinate!");
-                    player.closeInventory();
-                    // Here you could open another GUI or run a command
-                }
-                // Add other cases for other slots if needed
-            }
-        }
-    }
-    
-}

ic_plugin_core/src/main/java/nl/interestingcorner/core/gui/ChestGUI.java

@@ -0,0 +1,29 @@
+package nl.interestingcorner.core.gui;
+
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+/**
+ * Generalized chest GUI for use in plugins.
+ */
+public class ChestGUI {
+    public static void open(Player player, String title, List<ItemStack> items) {
+        int itemsAmount = items.size();
+        int size;
+        if (itemsAmount <= 9) {
+            size = 9;
+        } else {
+            // TODO: handle pagination for >54 items
+            size = ((itemsAmount / 9) + 1) * 9;
+        }
+        Inventory gui = Bukkit.createInventory(null, size, title);
+        for (ItemStack item : items) {
+            gui.addItem(item);
+        }
+        player.openInventory(gui);
+    }
+}

ic_plugin_core/src/main/java/nl/interestingcorner/core/gui/ChestGUIListener.java

@@ -0,0 +1,27 @@
+package nl.interestingcorner.core.gui;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+
+/**
+ * Generalized listener for chest GUIs. Extend or register with custom logic.
+ */
+public class ChestGUIListener implements Listener {
+    private final String guiTitle;
+
+    public ChestGUIListener(String guiTitle) {
+        this.guiTitle = guiTitle;
+    }
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+        if (event.getView().getTitle().equals(guiTitle)) {
+            event.setCancelled(true);
+            if (event.getCurrentItem() == null) return;
+            Player player = (Player) event.getWhoClicked();
+            // Extend this class and override this method for custom slot handling
+        }
+    }
+}

ic_plugin_core/src/main/java/nl/interestingcorner/core/gui/GUI.java

@@ -1,99 +1,84 @@
 package nl.interestingcorner.core.gui;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
 
 public class GUI implements InventoryHolder {
     public static final int MAX_INVENTORY_SIZE = 54; // max size of inventory before pages are needed
-    public static final int MAX_PAGE_INVENTORY_SIZE = 45; // max amount of items on a page
+    public static final int DEFAULT_PAGE_SIZE = 45; // default items per page (excluding navigation row)
 
     /**
      * Inventory that will be displayed
      */
     private Inventory inventory;
-
-    /**
-     * Current page being displayed
-     */
-    private int currentPage;
-
-    /**
-     * Items to be displayed in the GUI. This is the full list of items that can be displayed across all pages.
-     */
     private List<ItemStack> items;
-
+    private int currentPage;
-    /**
+    private String title;
-     * Number of items per page
-     */
     private int pageSize;
 
-    /**
+    public GUI(String title, int pageSize) {
-     * Gets the current page being displayed
+        this.title = title;
-     * @return the current page number
+        this.pageSize = Math.min(pageSize, MAX_INVENTORY_SIZE);
-     */
+        this.items = new ArrayList<>();
-    public int getCurrentPage() {
+        this.currentPage = 0;
-        return currentPage;
+        this.inventory = null;
     }
 
-    /**
-     * Sets the current page to be displayed
-     * @param currentPage the page number to set
-     */
-    public void setCurrentPage(int currentPage) {
-        this.currentPage = currentPage;
-    }
-
-    /**
-     * Gets the list of items to be displayed in the GUI
-     * @return the list of items
-     */
-    public List<ItemStack> getItems() {
-        return items;
-    }
-
-    /**
-     * Sets the list of items to be displayed in the GUI
-     * @param items the list of items to set
-     */
     public void setItems(List<ItemStack> items) {
-        this.items = items;
+        this.items = new ArrayList<>(items);
+        this.currentPage = 0;
+        updateInventory();
     }
 
-    /**
+    public void addItem(ItemStack item) {
-     * Gets the number of items per page
+        this.items.add(item);
-     * @return the page size
+        updateInventory();
-     */
-    public int getPageSize() {
-        return pageSize;
     }
 
-    /**
+    public void show(Player player) {
-     * Sets the number of items per page
+        updateInventory();
-     * @param pageSize the page size to set
+        player.openInventory(this.inventory);
-     */
-    public void setPageSize(int pageSize) {
-        this.pageSize = pageSize;
     }
 
-    /**
+    public void nextPage() {
-     * Sets the inventory to be displayed
+        if ((currentPage + 1) * pageSize < items.size()) {
-     * @param inventory the inventory to set
+            currentPage++;
-     */
+            updateInventory();
-    public void setInventory(Inventory inventory) {
+        }
-        this.inventory = inventory;
+    }
+
+    public void previousPage() {
+        if (currentPage > 0) {
+            currentPage--;
+            updateInventory();
+        }
+    }
+
+    public int getPagesAmount() {
+        return (int) Math.ceil((double) items.size() / pageSize);
+    }
+
+    private void updateInventory() {
+        // Create inventory for the current page
+        int size = Math.min(pageSize, MAX_INVENTORY_SIZE);
+        this.inventory = Bukkit.createInventory(this, size, title);
+        int start = currentPage * pageSize;
+        int end = Math.min(start + pageSize, items.size());
+        List<ItemStack> pageItems = items.subList(start, end);
+        for (int i = 0; i < pageItems.size(); i++) {
+            this.inventory.setItem(i, pageItems.get(i));
+        }
+        // TODO: Add navigation items if needed
     }
 
     @Override
     public Inventory getInventory() {
-        if (items.size() <= MAX_INVENTORY_SIZE) {
+        return this.inventory;
-            inventory = Bukkit.createInventory(this, MAX_INVENTORY_SIZE, "Coordinates Menu");
-            for (ItemStack item : items) {
-                inventory.addItem(item);
-            }
-            return inventory;
-        }
-
-        throw new UnsupportedOperationException("Paged inventory not yet implemented");
     }
-    
 }

ic_plugin_core/src/main/java/nl/interestingcorner/core/gui/GUIBuilder.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 public class GUIBuilder {
@@ -22,7 +21,7 @@ public class GUIBuilder {
         int itemsAmount = items.size();
         int pagesAmount = getPagesAmount(itemsAmount);
 
-        Inventory gui = Bukkit.createInventory(null, MAX_INVENTORY_SIZE, "Coordinates Menu");
+        Inventory gui = Bukkit.createInventory(null, GUI.MAX_INVENTORY_SIZE, "Coordinates Menu");
 
         for (ItemStack item : items) {
             gui.addItem(item);
@@ -32,8 +31,8 @@ public class GUIBuilder {
     }
 
     private static int getPagesAmount(int itemsAmount) {
-        if (itemsAmount > MAX_INVENTORY_SIZE) {
+        if (itemsAmount > GUI.MAX_INVENTORY_SIZE) {
-            return ((itemsAmount / MAX_PAGE_INVENTORY_SIZE) + 1);
+            return ((itemsAmount / GUI.DEFAULT_PAGE_SIZE) + 1);
         }
         return 1;
     }