Added menu filling FILL, BORDER

Devlrxxh · Feb 4, 2024 · 8c4b957 · 8c4b957
1 parent d722494
commit 8c4b957
Show file tree

Hide file tree

Showing 20 changed files with 136 additions and 56 deletions.
diff --git a/src/main/java/me/funky/praxi/Praxi.java b/src/main/java/me/funky/praxi/Praxi.java
@@ -216,7 +216,8 @@ private void registerCommands() {
                 new MainCommand(),
                 new KitCommand(),
                 new FlyCommand(),
-                new SettingsCommand()
+                new SettingsCommand(),
+                new HostCommand()
         ).forEach(command -> paperCommandManager.registerCommand(command));
     }
 

diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventAddMapCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventAddMapCommand.java
@@ -13,7 +13,7 @@ public class EventAddMapCommand {
     public void execute(Player player, @CPL("event") Event event, @CPL("map") EventGameMap gameMap) {
         if (event == null) {
             player.sendMessage(CC.RED + "An event type by that name does not exist.");
-            player.sendMessage(CC.RED + "Types: sumo, corners");
+            player.sendMessage(CC.RED + "Types: sumo");
             return;
         }
 

diff --git a/src/main/java/me/funky/praxi/commands/event/admin/EventRemoveMapCommand.java b/src/main/java/me/funky/praxi/commands/event/admin/EventRemoveMapCommand.java
@@ -13,7 +13,7 @@ public class EventRemoveMapCommand {
     public void execute(Player player, @CPL("event") Event event, @CPL("map") EventGameMap gameMap) {
         if (event == null) {
             player.sendMessage(CC.RED + "An event type by that name does not exist.");
-            player.sendMessage(CC.RED + "Types: sumo, corners");
+            player.sendMessage(CC.RED + "Types: sumo");
             return;
         }
 

diff --git a/src/main/java/me/funky/praxi/commands/event/user/EventHostCommand.java b/src/main/java/me/funky/praxi/commands/event/user/EventHostCommand.java
@@ -46,7 +46,7 @@ public void execute(Player player, @CPL("event") Event event) {
 
         if (event == null) {
             player.sendMessage(CC.RED + "That type of event does not exist.");
-            player.sendMessage(CC.RED + "Types: sumo, corners");
+            player.sendMessage(CC.RED + "Types: sumo");
             return;
         }
 
@@ -103,7 +103,7 @@ public void execute(Player player, @CPL("event") Event event, Integer slots) {
 
         if (event == null) {
             player.sendMessage(CC.RED + "That type of event does not exist.");
-            player.sendMessage(CC.RED + "Types: sumo, corners");
+            player.sendMessage(CC.RED + "Types: sumo");
             return;
         }
 

diff --git a/src/main/java/me/funky/praxi/commands/event/user/HostCommand.java b/src/main/java/me/funky/praxi/commands/event/user/HostCommand.java
@@ -0,0 +1,17 @@
+package me.funky.praxi.commands.event.user;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.Default;
+import co.aikar.commands.annotation.Description;
+import me.funky.praxi.event.game.menu.EventHostMenu;
+import org.bukkit.entity.Player;
+
+@CommandAlias("hosts")
+@Description("Host Events.")
+public class HostCommand extends BaseCommand {
+    @Default
+    public void open(Player player) {
+        new EventHostMenu().openMenu(player);
+    }
+}
diff --git a/src/main/java/me/funky/praxi/duel/menu/DuelSelectArenaMenu.java b/src/main/java/me/funky/praxi/duel/menu/DuelSelectArenaMenu.java
@@ -8,6 +8,7 @@
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -29,8 +30,8 @@ public int getSize() {
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("DUEL.FILTER"));
     }
 
     @Override

diff --git a/src/main/java/me/funky/praxi/duel/menu/DuelSelectKitMenu.java b/src/main/java/me/funky/praxi/duel/menu/DuelSelectKitMenu.java
@@ -8,6 +8,7 @@
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -28,10 +29,11 @@ public int getSize() {
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("DUEL.FILTER"));
     }
 
+
     @Override
     public Map<Integer, Button> getButtons(Player player) {
         Map<Integer, Button> buttons = new HashMap<>();

diff --git a/src/main/java/me/funky/praxi/event/EventTypeAdapter.java b/src/main/java/me/funky/praxi/event/EventTypeAdapter.java
@@ -3,10 +3,7 @@
 import me.funky.praxi.event.impl.sumo.SumoEvent;
 import me.funky.praxi.util.command.command.adapter.CommandTypeAdapter;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class EventTypeAdapter implements CommandTypeAdapter {
 
@@ -24,7 +21,7 @@ public <T> T convert(String string, Class<T> type) {
 
     @Override
     public <T> List<String> tabComplete(String string, Class<T> type) {
-        return Arrays.asList("Sumo", "Corners");
+        return Collections.singletonList("Sumo");
     }
 
 }
diff --git a/src/main/java/me/funky/praxi/event/game/menu/EventHostMenu.java b/src/main/java/me/funky/praxi/event/game/menu/EventHostMenu.java
@@ -1,13 +1,15 @@
 package me.funky.praxi.event.game.menu;
 
 import lombok.AllArgsConstructor;
+import me.funky.praxi.Praxi;
 import me.funky.praxi.event.Event;
 import me.funky.praxi.util.CC;
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.TextSplitter;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
 import me.funky.praxi.util.menu.button.DisplayButton;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -18,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Filter;
 
 public class EventHostMenu extends Menu {
 
@@ -27,26 +30,26 @@ public class EventHostMenu extends Menu {
 
     @Override
     public String getTitle(Player player) {
-        return "&6Select an Event";
+        return Praxi.getInstance().getMenusConfig().getString("EVENTS.TITLE");
+    }
+
+    @Override
+    public int getSize() {
+        return Praxi.getInstance().getMenusConfig().getInteger("EVENTS.SIZE");
+    }
+
+    @Override
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("EVENTS.FILTER"));
     }
 
     @Override
     public Map<Integer, Button> getButtons(Player player) {
         Map<Integer, Button> buttons = new HashMap<>();
 
-        int pos = 10;
-
         for (Event event : Event.events) {
-            buttons.put(pos++, new SelectEventButton(event));
+            buttons.put(13, new SelectEventButton(event));
         }
-
-        if (pos <= 16) {
-            for (int i = pos; i < 16; i++) {
-                buttons.put(i, new DisplayButton(new ItemBuilder(Material.STAINED_GLASS_PANE)
-                        .durability(7).name(" ").build(), true));
-            }
-        }
-
         return buttons;
     }
 

diff --git a/src/main/java/me/funky/praxi/kit/menu/KitEditorSelectKitMenu.java b/src/main/java/me/funky/praxi/kit/menu/KitEditorSelectKitMenu.java
@@ -7,6 +7,7 @@
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -30,8 +31,8 @@ public int getSize() {
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("KIT-EDITOR.FILTER"));
     }
 
     @Override

diff --git a/src/main/java/me/funky/praxi/party/menu/OtherPartiesMenu.java b/src/main/java/me/funky/praxi/party/menu/OtherPartiesMenu.java
@@ -7,6 +7,8 @@
 import me.funky.praxi.util.CC;
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
+import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import me.funky.praxi.util.menu.pagination.PaginatedMenu;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -19,15 +21,25 @@
 import java.util.List;
 import java.util.Map;
 
-public class OtherPartiesMenu extends PaginatedMenu {
+public class OtherPartiesMenu extends Menu {
 
     @Override
-    public String getPrePaginatedTitle(Player player) {
+    public String getTitle(Player player) {
         return Praxi.getInstance().getMenusConfig().getString("PARTY.OTHER-PARTIES.TITLE");
     }
+    @Override
+    public int getSize() {
+        return Praxi.getInstance().getMenusConfig().getInteger("PARTY.OTHER-PARTIES.SIZE");
+    }
+
+    @Override
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("PARTY.FILTER"));
+    }
+
 
     @Override
-    public Map<Integer, Button> getAllPagesButtons(Player player) {
+    public Map<Integer, Button> getButtons(Player player) {
         Profile profile = Profile.getByUuid(player.getUniqueId());
 
         Map<Integer, Button> buttons = new HashMap<>();

diff --git a/src/main/java/me/funky/praxi/party/menu/PartyEventSelectEventMenu.java b/src/main/java/me/funky/praxi/party/menu/PartyEventSelectEventMenu.java
@@ -8,6 +8,7 @@
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -29,8 +30,8 @@ public int getSize() {
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("PARTY.EVENTS.FILTER"));
     }
 
     @Override

diff --git a/src/main/java/me/funky/praxi/queue/menu/QueueSelectKitMenu.java b/src/main/java/me/funky/praxi/queue/menu/QueueSelectKitMenu.java
@@ -9,6 +9,7 @@
 import me.funky.praxi.util.ItemBuilder;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.inventory.ItemStack;
@@ -29,12 +30,13 @@ public class QueueSelectKitMenu extends Menu {
 
     @Override
     public int getSize() {
-        return 36;
+        return Praxi.getInstance().getMenusConfig().getInteger("QUEUES-MENUS.SIZE");
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        System.out.println(Praxi.getInstance().getMenusConfig().getString("QUEUES-MENUS.FILTER"));
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("QUEUES-MENUS.FILTER"));
     }
 
     @Override

diff --git a/src/main/java/me/funky/praxi/setting/SettingsCommand.java b/src/main/java/me/funky/praxi/setting/SettingsCommand.java
@@ -7,8 +7,8 @@
 import co.aikar.commands.annotation.Description;
 import org.bukkit.entity.Player;
 
-@CommandAlias(value = "settings")
-@Description(value = "Settings Command.")
+@CommandAlias("settings")
+@Description("Settings Command.")
 public class SettingsCommand extends BaseCommand {
     @Default
     public void open(Player player) {

diff --git a/src/main/java/me/funky/praxi/setting/SettingsMenu.java b/src/main/java/me/funky/praxi/setting/SettingsMenu.java
@@ -10,6 +10,7 @@
 import me.funky.praxi.util.assemble.events.AssembleBoardDestroyEvent;
 import me.funky.praxi.util.menu.Button;
 import me.funky.praxi.util.menu.Menu;
+import me.funky.praxi.util.menu.filters.Filters;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
@@ -35,10 +36,11 @@ public int getSize() {
     }
 
     @Override
-    public boolean getFill() {
-        return true;
+    public Filters getFilter() {
+        return Filters.valueOf(Praxi.getInstance().getMenusConfig().getString("SETTINGS.FILTER"));
     }
 
+
     @Override
     public Map<Integer, Button> getButtons(Player player) {
         HashMap<Integer, Button> buttons = new HashMap<>();