Rework gui p1

VoChiDanh · Jun 15, 2022 · 795091f · 795091f
1 parent d173e29
commit 795091f
Show file tree

Hide file tree

Showing 14 changed files with 434 additions and 1,558 deletions.
diff --git a/src/main/java/net/danh/storage/Commands/Storage.java b/src/main/java/net/danh/storage/Commands/Storage.java
@@ -1,6 +1,7 @@
 package net.danh.storage.Commands;
 
 import net.danh.dcore.Commands.CMDBase;
+import net.danh.storage.Gui.OpenGui;
 import net.danh.storage.Manager.Files;
 import net.danh.storage.Manager.PlayerData;
 import net.danh.storage.Manager.SpigotUpdater;
@@ -15,8 +16,6 @@
 import static net.danh.dcore.Utils.Chat.colorize;
 import static net.danh.dcore.Utils.Player.sendConsoleMessage;
 import static net.danh.dcore.Utils.Player.sendPlayerMessage;
-import static net.danh.storage.Gui.LoadMenu.ReloadMenu;
-import static net.danh.storage.Gui.OpenGui.OpenGuiMenu;
 import static net.danh.storage.Manager.Data.*;
 import static net.danh.storage.Manager.Files.*;
 import static net.danh.storage.Manager.Items.*;
@@ -29,7 +28,7 @@ public Storage(JavaPlugin core) {
     @Override
     public void playerexecute(Player p, String[] args) {
         if (args.length == 0) {
-            OpenGuiMenu(p);
+            p.openInventory(OpenGui.Open(p));
         }
         if (args.length == 1) {
             if (args[0].equalsIgnoreCase("help")) {
@@ -54,7 +53,6 @@ public void playerexecute(Player p, String[] args) {
                     sendPlayerMessage(p, "&aDone");
                 }
                 if (args[0].equalsIgnoreCase("reload")) {
-                    ReloadMenu();
                     reloadfiles();
                     sendPlayerMessage(p, getlanguagefile().getString("Admin.Reload"));
                     try {
@@ -282,7 +280,7 @@ public void consoleexecute(ConsoleCommandSender c, String[] args) {
                 return;
             }
             if (args[1].equalsIgnoreCase("open")) {
-                OpenGuiMenu(p);
+                p.openInventory(OpenGui.Open(p));
             }
         }
         if (args.length == 1) {
@@ -305,7 +303,6 @@ public void consoleexecute(ConsoleCommandSender c, String[] args) {
                 sendConsoleMessage(c, "&aDone");
             }
             if (args[0].equalsIgnoreCase("reload")) {
-                ReloadMenu();
                 reloadfiles();
                 sendConsoleMessage(c, getlanguagefile().getString("Admin.Reload"));
                 try {

diff --git a/src/main/java/net/danh/storage/Gui/CatchInput.java b/src/main/java/net/danh/storage/Gui/CatchInput.java
diff --git a/src/main/java/net/danh/storage/Gui/Chat.java b/src/main/java/net/danh/storage/Gui/Chat.java
@@ -0,0 +1,60 @@
+package net.danh.storage.Gui;
+
+import net.danh.storage.Manager.Data;
+import net.danh.storage.Storage;
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import static net.danh.dcore.Random.Number.isInteger;
+
+public class Chat implements Listener {
+
+    @EventHandler
+    public void onChat(AsyncPlayerChatEvent e) {
+        Player p = e.getPlayer();
+        String msg = ChatColor.stripColor(e.getMessage());
+        if (isInteger(msg)) {
+            if (!Data.item.isEmpty() && Data.click.containsValue(ClickType.LEFT) && Data.click.containsKey(p) && Data.action.contains(p)) {
+                new BukkitRunnable() {
+                    @Override
+                    public void run() {
+                        p.performCommand("storage take " + Data.item.get(p) + " " + Integer.parseInt(msg));
+                    }
+                }.runTask(Storage.get());
+                Data.item.remove(p);
+                Data.click.remove(p);
+                Data.action.remove(p);
+                e.setCancelled(true);
+            }
+            if (!Data.item.isEmpty() && Data.click.containsValue(ClickType.RIGHT) && Data.click.containsKey(p) && Data.action.contains(p)) {
+                new BukkitRunnable() {
+                    @Override
+                    public void run() {
+                        p.performCommand("storage add " + Data.item.get(p) + " " + Integer.parseInt(msg));
+                    }
+                }.runTask(Storage.get());
+                Data.item.remove(p);
+                Data.click.remove(p);
+                Data.action.remove(p);
+                e.setCancelled(true);
+            }
+            if (!Data.item.isEmpty() && Data.click.containsValue(ClickType.DROP) && Data.click.containsKey(p) && Data.action.contains(p)) {
+                new BukkitRunnable() {
+                    @Override
+                    public void run() {
+                        p.performCommand("storage sell " + Data.item.get(p) + " " + Integer.parseInt(msg));
+                    }
+                }.runTask(Storage.get());
+                Data.item.remove(p);
+                Data.click.remove(p);
+                Data.action.remove(p);
+                e.setCancelled(true);
+            }
+        }
+    }
+}
diff --git a/src/main/java/net/danh/storage/Gui/GuiEventListener.java b/src/main/java/net/danh/storage/Gui/GuiEventListener.java