update Structure

zitreF · Jul 25, 2023 · 6c4cede · 6c4cede
1 parent dc0e62b
commit 6c4cede
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 68 deletions.
diff --git a/src/main/java/me/cocos/gui/builder/gui/GuiBuilder.java b/src/main/java/me/cocos/gui/builder/gui/GuiBuilder.java
@@ -1,7 +1,7 @@
 package me.cocos.gui.builder.gui;
 
 import me.cocos.gui.data.GuiItem;
-import me.cocos.gui.data.Structure;
+import me.cocos.gui.structure.Structure;
 import me.cocos.gui.gui.Gui;
 import me.cocos.gui.gui.impl.NormalGui;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/me/cocos/gui/data/Structure.java b/src/main/java/me/cocos/gui/data/Structure.java
diff --git a/src/main/java/me/cocos/gui/gui/Gui.java b/src/main/java/me/cocos/gui/gui/Gui.java
@@ -2,7 +2,7 @@
 
 import me.cocos.gui.CocosGui;
 import me.cocos.gui.data.GuiItem;
-import me.cocos.gui.data.Structure;
+import me.cocos.gui.structure.Structure;
 import me.cocos.gui.gui.holder.GuiHolder;
 import me.cocos.gui.helper.ChatHelper;
 import org.bukkit.Bukkit;
@@ -80,6 +80,7 @@ public boolean isDisposable() {
 
     public void applyStructure(Structure structure) {
         this.structure = structure;
+        structure.apply(this);
     }
 
     public Structure getStructure() {
@@ -101,5 +102,9 @@ public BiConsumer<InventoryCloseEvent, Player> onClose() {
         return this.onClose;
     }
 
+    public void open(Player player) {
+        player.openInventory(this.getInventory());
+    }
+
     public abstract void dispose();
 }
diff --git a/src/main/java/me/cocos/gui/gui/impl/NormalGui.java b/src/main/java/me/cocos/gui/gui/impl/NormalGui.java
@@ -2,7 +2,7 @@
 
 import me.cocos.gui.builder.gui.GuiBuilder;
 import me.cocos.gui.data.GuiItem;
-import me.cocos.gui.data.Structure;
+import me.cocos.gui.structure.Structure;
 import me.cocos.gui.gui.Gui;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -20,6 +20,7 @@ public NormalGui(String name, int rows) {
     public void dispose() {
         this.actions.clear();
         this.inventory.clear();
+        if (structure != null) this.structure.dispose();
     }
 
     public static class NormalGuiBuilder implements GuiBuilder<NormalGui, NormalGuiBuilder> {

diff --git a/src/main/java/me/cocos/gui/listener/InventoryCloseListener.java b/src/main/java/me/cocos/gui/listener/InventoryCloseListener.java
@@ -1,13 +1,11 @@
 package me.cocos.gui.listener;
 
-import me.cocos.gui.data.GuiItem;
 import me.cocos.gui.gui.Gui;
 import me.cocos.gui.gui.holder.GuiHolder;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.inventory.PlayerInventory;
 
 public final class InventoryCloseListener implements Listener {
 
@@ -22,5 +20,9 @@ public void onInventoryClose(InventoryCloseEvent event) {
         if (gui.onClose() != null) {
             gui.onClose().accept(event, player);
         }
+
+        if (gui.isDisposable()) {
+            gui.dispose();
+        }
     }
 }
diff --git a/src/main/java/me/cocos/gui/structure/Structure.java b/src/main/java/me/cocos/gui/structure/Structure.java
@@ -0,0 +1,77 @@
+package me.cocos.gui.structure;
+
+import me.cocos.gui.data.GuiItem;
+import me.cocos.gui.gui.Gui;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public final class Structure {
+
+    private static final Map<Character, GuiItem> globalIngredients = new HashMap<>();
+
+    private final Map<Character, GuiItem> ingredients;
+    private final Map<Character, List<GuiItem>> ingredientList;
+    private final String pattern;
+
+    public Structure(String... pattern) {
+        this.pattern = Arrays.stream(pattern).map(string -> string.replace(" ", "")).collect(Collectors.joining());
+        this.ingredients = new HashMap<>();
+        this.ingredientList = new HashMap<>();
+    }
+
+    public Structure ingredient(char character, GuiItem guiItem) {
+        this.ingredients.put(character, guiItem);
+        return this;
+    }
+
+    public void apply(Gui gui) {
+        for (int i = 0; i < pattern.length(); i++) {
+            char character = this.pattern.charAt(i);
+            GuiItem guiItem = this.getGuiItem(character);
+            if (guiItem != null) {
+                gui.setItem(i, guiItem);
+            }
+        }
+    }
+
+
+    private GuiItem getGuiItem(char character) {
+        return Optional.ofNullable(ingredients.get(character))
+                .orElseGet(() -> {
+                    List<GuiItem> guiItems = ingredientList.get(character);
+                    if (guiItems != null) {
+                        Iterator<GuiItem> guiItemIterator = guiItems.iterator();
+                        if (guiItemIterator.hasNext()) {
+                            GuiItem nextGuiItem = guiItemIterator.next();
+                            guiItemIterator.remove();
+                            return nextGuiItem;
+                        }
+                    }
+                    return globalIngredients.get(character);
+                });
+    }
+
+    public Structure contents(char character, List<GuiItem> guiItems) {
+        ingredientList.put(character, new ArrayList<>(guiItems));
+        return this;
+    }
+
+    public void dispose() {
+        this.ingredients.clear();
+        this.ingredientList.clear();
+    }
+
+    public static void globalIngredient(char character, GuiItem guiItem) {
+        globalIngredients.put(character, guiItem);
+    }
+
+    public static Structure of(String... pattern) {
+        return new Structure(pattern);
+    }
+}
diff --git a/src/test/java/Main.java b/src/test/java/Main.java
@@ -7,4 +7,4 @@ public final class Main extends JavaPlugin {
     public void onEnable() {
         this.getCommand("test").setExecutor(new TestCommand());
     }
-}
+}
diff --git a/src/test/java/command/TestCommand.java b/src/test/java/command/TestCommand.java
@@ -13,7 +13,7 @@ public class TestCommand implements CommandExecutor {
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Player player = (Player) sender;
-        testMenu.openGui(player);
+        testMenu.openSecondGui(player);
         return false;
     }
 }
diff --git a/src/test/java/menu/TestMenu.java b/src/test/java/menu/TestMenu.java
@@ -2,25 +2,53 @@
 
 import me.cocos.gui.builder.gui.GuiBuilder;
 import me.cocos.gui.data.GuiItem;
-import me.cocos.gui.data.Structure;
+import me.cocos.gui.structure.Structure;
 import me.cocos.gui.gui.Gui;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class TestMenu {
 
     public void openGui(Player player) {
         Gui gui = GuiBuilder.normal("&7Test", 3)
                 .onClick((event, p) -> event.setCancelled(true))
                 .disposable(true)
+                .structure(Structure.of(
+                                "# # # # # # # # #",
+                                "# # & # & # & # #",
+                                "# # # # # # # # #"
+                        )
+                        .ingredient('&', GuiItem.of(Material.DIAMOND).onClick((inventoryClickEvent, p) -> {
+                            p.sendMessage("diament");
+                        }))
+                        .ingredient('#', GuiItem.of(Material.BLACK_STAINED_GLASS_PANE).onClick(((inventoryClickEvent, p) -> {
+                            p.sendMessage("glass");
+                        }))))
+                .build();
+        gui.open(player);
+    }
+
+    public void openSecondGui(Player player) {
+        List<GuiItem> randomList = Arrays.stream(Material.values())
+                .limit(10)
+                .filter(material -> material != Material.AIR)
+                .map(GuiItem::of)
+                .toList();
+        Gui gui = GuiBuilder.normal("&7Test 2", 3)
+                .onClick((event, p) -> event.setCancelled(true))
+                .disposable(true)
+                .structure(Structure.of(
+                        "& & & & & & & & &",
+                        "& # # # # # # # &",
+                        "& & & & & & & & &"
+                        )
+                        .ingredient('&', GuiItem.of(Material.BLACK_STAINED_GLASS))
+                        .contents('#', randomList)
+                )
                 .build();
-        Structure structure = Structure.of(
-                "# # # # # # # # #",
-                "# # & # & # & # #",
-                "# # # # # # # # #"
-        ).ingredient('&', GuiItem.of(Material.DIAMOND).onClick((inventoryClickEvent, player1) -> player1.sendMessage("diament")))
-                .ingredient('#', GuiItem.of(Material.BLACK_STAINED_GLASS_PANE).onClick(((inventoryClickEvent, player1) -> player1.sendMessage("glass"))));
-        structure.apply(gui);
-        player.openInventory(gui.getInventory());
+        gui.open(player);
     }
 }