1.4.0

Added Server Player Commands section.

src/main/java/com/rsscripting/rswarehouse/RSWarehouse.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse;
 
-import com.rsscripting.rswarehouse.admin.admindao.PurgeVariantsDAO;
+import com.rsscripting.rswarehouse.dao.admin.PurgeVariantsDAO;
 import com.rsscripting.rswarehouse.chestautoprocess.ChestAutoProcessingTask;
 import com.rsscripting.rswarehouse.commands.RSPluginCommand;
 import com.rsscripting.rswarehouse.commands.RSTabCompleter;

src/main/java/com/rsscripting/rswarehouse/admin/adminsessions/CategoryOptionsMenuListener.java

@@ -1,4 +0,0 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
-
-public class CategoryOptionsMenuListener {
-}

src/main/java/com/rsscripting/rswarehouse/adminmenu/AdminMenu.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin;
+package com.rsscripting.rswarehouse.adminmenu;
 
 
-import com.rsscripting.rswarehouse.admin.admindao.WarehouseStatisticsDAO;
+import com.rsscripting.rswarehouse.dao.admin.WarehouseStatisticsDAO;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;
 import com.rsscripting.rswarehouse.utils.VersionUtils;
@@ -29,7 +29,7 @@ public class AdminMenu {
                         new RSMenuHolder(
                                 "ADMIN"
                         ),
-                        9,
+                        18,
                         Component.text(
                                 MENU_TITLE
                         ).color(
@@ -184,6 +184,17 @@ public class AdminMenu {
                 )
         );
 
+        menu.setItem(
+                12,
+                RSMenuUtils.createMenuItemWithLore(
+                        Material.COMMAND_BLOCK,
+                        "§aCreate Server Command",
+                        List.of(
+                                "§7Create a server command entry."
+                        )
+                )
+        );
+
 
         player.openInventory(menu);
 

src/main/java/com/rsscripting/rswarehouse/adminmenu/AdminMenuListener.java

@@ -1,12 +1,13 @@
-package com.rsscripting.rswarehouse.admin;
+package com.rsscripting.rswarehouse.adminmenu;
 
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
 import com.rsscripting.rswarehouse.config.ConfigManager;
-import com.rsscripting.rswarehouse.conversion.ConvertMenuListener;
+import com.rsscripting.rswarehouse.chestconvert.ConvertMenuListener;
 import com.rsscripting.rswarehouse.category.categorycreation.CategoryNameMenu;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.constants.RSConstants;
-import com.rsscripting.rswarehouse.main.MainMenu;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
+import com.rsscripting.rswarehouse.servercommands.ServerCommandInternalNameMenu;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;
 import org.bukkit.block.Block;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
@@ -133,6 +134,19 @@ public class AdminMenuListener
 
         }
 
+        if (event.getRawSlot() == 12) {
+
+            ServerCommandCreationSessionManager.createSession(
+                    player.getUniqueId()
+            );
+
+            ServerCommandInternalNameMenu.open(
+                    player
+            );
+
+            return;
+        }
+
     }
 
 }

src/main/java/com/rsscripting/rswarehouse/assignpageslot/CategoryPageNumberMenu.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSessionManager;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSessionManager;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
@@ -9,7 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MenuType;
 import org.bukkit.inventory.meta.ItemMeta;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import org.bukkit.inventory.view.AnvilView;
 

src/main/java/com/rsscripting/rswarehouse/assignpageslot/CategoryPageNumberMenuListener.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSessionManager;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSessionManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/CategorySlotNumberMenu.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSessionManager;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSessionManager;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Material;
@@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MenuType;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.view.AnvilView;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 
 import java.util.List;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/CategorySlotNumberMenuListener.java

@@ -1,8 +1,8 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.admindao.CategoryPlacementDAO;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSessionManager;
+import com.rsscripting.rswarehouse.dao.admin.CategoryPlacementDAO;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSessionManager;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/PageNumberMenu.java

@@ -1,8 +1,8 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSessionManager;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSession;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSessionManager;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/PageNumberMenuListener.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSessionManager;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSession;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSessionManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/SlotNumberMenu.java

@@ -1,8 +1,8 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSessionManager;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSession;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSessionManager;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

src/main/java/com/rsscripting/rswarehouse/assignpageslot/SlotNumberMenuListener.java

@@ -1,8 +1,8 @@
-package com.rsscripting.rswarehouse.admin.assignpageslot;
+package com.rsscripting.rswarehouse.assignpageslot;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSessionManager;
-import com.rsscripting.rswarehouse.placement.placementdao.ItemPlacementDAO;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSession;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSessionManager;
+import com.rsscripting.rswarehouse.dao.ItemPlacementDAO;
 import com.rsscripting.rswarehouse.item.ItemsMenu;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/autodeposit/AutoDepositMenu.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.autodeposit;
 
-import com.rsscripting.rswarehouse.autodeposit.autodepositdao.AutoDepositDAO;
+import com.rsscripting.rswarehouse.dao.AutoDepositDAO;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;

src/main/java/com/rsscripting/rswarehouse/autodeposit/AutoDepositMenuListener.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.autodeposit;
 
-import com.rsscripting.rswarehouse.autodeposit.autodepositdao.AutoDepositDAO;
+import com.rsscripting.rswarehouse.dao.AutoDepositDAO;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;

src/main/java/com/rsscripting/rswarehouse/autodeposit/AutoDepositPickupListener.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.autodeposit;
 
-import com.rsscripting.rswarehouse.autodeposit.autodepositdao.AutoDepositDAO;
-import com.rsscripting.rswarehouse.inventory.inventorydao.InventoryLookupDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.AutoDepositDAO;
+import com.rsscripting.rswarehouse.dao.InventoryLookupDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/rsscripting/rswarehouse/category/categorycreation/CategoryDisplayNameMenuListener.java

@@ -1,7 +1,7 @@
 package com.rsscripting.rswarehouse.category.categorycreation;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.admin.AdminMenu;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.adminmenu.AdminMenu;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;

src/main/java/com/rsscripting/rswarehouse/category/categorycreation/CategoryLoreMenuListener.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.category.categorycreation;
 
-import com.rsscripting.rswarehouse.admin.admindao.CreateCategoryDAO;
+import com.rsscripting.rswarehouse.dao.admin.CreateCategoryDAO;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.session.GuiSession;

src/main/java/com/rsscripting/rswarehouse/category/categorycreation/CategoryNameMenuListener.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.category.categorycreation;
 
-import com.rsscripting.rswarehouse.admin.AdminMenu;
+import com.rsscripting.rswarehouse.adminmenu.AdminMenu;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;

src/main/java/com/rsscripting/rswarehouse/category/categoryedit/CategoryEditDisplayNameMenuListener.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.category.categoryedit;
 
-import com.rsscripting.rswarehouse.admin.admindao.UpdateCategoryDAO;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.dao.admin.UpdateCategoryDAO;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
 import com.rsscripting.rswarehouse.category.categoryoptions.CategoryOptionsMenu;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/category/categoryedit/CategoryEditLoreMenu.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.category.categoryedit;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;

src/main/java/com/rsscripting/rswarehouse/category/categoryedit/CategoryEditLoreMenuChatListener.java

@@ -1,7 +1,7 @@
 package com.rsscripting.rswarehouse.category.categoryedit;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/category/categoryedit/CategoryEditLoreMenuListener.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.category.categoryedit;
 
-import com.rsscripting.rswarehouse.admin.admindao.UpdateCategoryDAO;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.dao.admin.UpdateCategoryDAO;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
 import com.rsscripting.rswarehouse.category.categoryoptions.CategoryOptionsMenu;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;

src/main/java/com/rsscripting/rswarehouse/category/categoryedit/CategoryEditMaterialMenuListener.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.category.categoryedit;
 
-import com.rsscripting.rswarehouse.admin.admindao.UpdateCategoryDAO;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.dao.admin.UpdateCategoryDAO;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
 import com.rsscripting.rswarehouse.category.categoryoptions.CategoryOptionsMenu;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/category/categorymenu/CategoryMenu.java

@@ -1,5 +1,7 @@
 package com.rsscripting.rswarehouse.category.categorymenu;
 
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.config.ConfigManager;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.constants.RSKeys;
@@ -97,6 +99,9 @@ public class CategoryMenu {
         WarehouseCategory uncategorized =
                 null;
 
+        WarehouseCategory serverCommands =
+                null;
+
         List<WarehouseCategory> displayCategories =
                 new ArrayList<>();
 
@@ -104,7 +109,6 @@ public class CategoryMenu {
                 WarehouseCategory category
                 : categories
         ) {
-
             if (
                     category.displayName()
                             .equalsIgnoreCase(
@@ -115,6 +119,16 @@ public class CategoryMenu {
                 uncategorized =
                         category;
 
+            }
+            else if (category.id() == 1001) {
+
+
+                if (ConfigManager.isServerCommandsEnabled()) {
+
+                    serverCommands = category;
+
+                }
+
             }
             else {
 
@@ -420,6 +434,54 @@ public class CategoryMenu {
 
         }
 
+        if (serverCommands != null) {
+
+            ItemStack icon =
+                    RSMenuUtils.createMenuItemWithLore(
+                            Material.valueOf(
+                                    serverCommands.material()
+                            ),
+                            "§a"
+                                    + serverCommands.displayName(),
+                            serverCommands.lore() == null
+                                    || serverCommands.lore().isBlank()
+                                    ? List.of()
+                                    : Arrays.asList(
+                                    serverCommands.lore()
+                                    .split("\n")
+                            )
+                    );
+
+            ItemMeta meta =
+                    icon.getItemMeta();
+
+            if (meta != null) {
+
+                meta.addItemFlags(
+                        ItemFlag.HIDE_ATTRIBUTES,
+                        ItemFlag.HIDE_ADDITIONAL_TOOLTIP
+                );
+
+                meta.getPersistentDataContainer()
+                        .set(
+                                RSKeys.CATEGORY_ID,
+                                PersistentDataType.INTEGER,
+                                serverCommands.id()
+                        );
+
+                icon.setItemMeta(
+                        meta
+                );
+
+            }
+
+            menu.setItem(
+                    6,
+                    icon
+            );
+
+        }
+
         player.openInventory(
                 menu
         );

src/main/java/com/rsscripting/rswarehouse/category/categorymenu/CategoryMenuListener.java

@@ -3,7 +3,6 @@ package com.rsscripting.rswarehouse.category.categorymenu;
 
 import com.rsscripting.rswarehouse.category.categoryoptions.CategoryOptionsMenu;
 import com.rsscripting.rswarehouse.autodeposit.AutoDepositMenu;
-import com.rsscripting.rswarehouse.item.ItemsMenu;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;

src/main/java/com/rsscripting/rswarehouse/category/categoryoptions/CategoryOptionsMenuListener.java

@@ -1,15 +1,15 @@
 package com.rsscripting.rswarehouse.category.categoryoptions;
 
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryEditSessionManager;
-import com.rsscripting.rswarehouse.admin.assignpageslot.CategoryPageNumberMenu;
-import com.rsscripting.rswarehouse.admin.adminsessions.CategoryPageSlotSessionManager;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.CategoryEditSessionManager;
+import com.rsscripting.rswarehouse.assignpageslot.CategoryPageNumberMenu;
+import com.rsscripting.rswarehouse.session.admin.CategoryPageSlotSessionManager;
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditDisplayNameMenu;
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditLoreMenu;
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditMaterialMenu;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

src/main/java/com/rsscripting/rswarehouse/category/copytocategory/CopyToCategoryMenu.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.category.copytocategory;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.constants.RSKeys;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;

src/main/java/com/rsscripting/rswarehouse/category/copytocategory/CopyToCategoryMenuListener.java

@@ -1,7 +1,7 @@
 package com.rsscripting.rswarehouse.category.copytocategory;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.placement.placementdao.ItemPlacementDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemPlacementDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.constants.RSKeys;
 import com.rsscripting.rswarehouse.item.ItemsMenu;

src/main/java/com/rsscripting/rswarehouse/category/movetocategory/MoveToCategoryMenu.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.category.movetocategory;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;

src/main/java/com/rsscripting/rswarehouse/category/movetocategory/MoveToCategoryMenuListener.java

@@ -1,7 +1,7 @@
 package com.rsscripting.rswarehouse.category.movetocategory;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.placement.placementdao.ItemPlacementDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemPlacementDAO;
 import com.rsscripting.rswarehouse.item.ItemsMenu;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.constants.RSKeys;

src/main/java/com/rsscripting/rswarehouse/chestautoprocess/ChestAutoProcessingTask.java

@@ -1,7 +1,7 @@
 package com.rsscripting.rswarehouse.chestautoprocess;
 
-import com.rsscripting.rswarehouse.deposit.dao.ChestDAO;
-import com.rsscripting.rswarehouse.deposit.dao.WarehouseChestDAO;
+import com.rsscripting.rswarehouse.dao.ChestDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseChestDAO;
 import org.bukkit.block.Chest;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

src/main/java/com/rsscripting/rswarehouse/chestconvert/ConvertMenu.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.conversion;
+package com.rsscripting.rswarehouse.chestconvert;
 
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;

src/main/java/com/rsscripting/rswarehouse/chestconvert/ConvertMenuListener.java

@@ -1,10 +1,9 @@
-package com.rsscripting.rswarehouse.conversion;
+package com.rsscripting.rswarehouse.chestconvert;
 
-import com.rsscripting.rswarehouse.deposit.dao.ChestDAO;
-import com.rsscripting.rswarehouse.deposit.dao.WarehouseChestDAO;
-import com.rsscripting.rswarehouse.deposit.dao.VerifyIsChestDAO;
+import com.rsscripting.rswarehouse.dao.ChestDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseChestDAO;
+import com.rsscripting.rswarehouse.dao.VerifyIsChestDAO;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
-import com.rsscripting.rswarehouse.main.MainMenu;
 import com.rsscripting.rswarehouse.constants.RSConstants;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import com.rsscripting.rswarehouse.session.GuiSession;

src/main/java/com/rsscripting/rswarehouse/commands/RSPluginCommand.java

@@ -1,7 +1,6 @@
 package com.rsscripting.rswarehouse.commands;
 
 import com.rsscripting.rswarehouse.config.ConfigManager;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.constants.RSConstants;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import com.rsscripting.rswarehouse.utils.VersionUtils;

src/main/java/com/rsscripting/rswarehouse/commands/ShopCommand.java

@@ -1,6 +1,5 @@
 package com.rsscripting.rswarehouse.commands;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.deposit.DepositInventory;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import org.bukkit.command.Command;

src/main/java/com/rsscripting/rswarehouse/config/ConfigManager.java

@@ -53,19 +53,6 @@ public class ConfigManager {
 
     }
 
-    /*
-    | Warehouse Chest name
-     */
-
-    public String getWarehouseChestName() {
-
-        return config.getString(
-                "warehouse-chest-name",
-                "Community Warehouse"
-        );
-
-    }
-
     /*
     | Uncateforized enabled
     */
@@ -80,13 +67,15 @@ public class ConfigManager {
     }
 
     /*
-    | Chest Protection Enabled
-     */
+|--------------------------------------------------------------------------
+| Server Commands Enabled
+|--------------------------------------------------------------------------
+*/
 
-    public boolean isWarehouseChestProtectionEnabled() {
+    public static boolean isServerCommandsEnabled() {
 
         return config.getBoolean(
-                "protect-warehouse-chests",
+                "display.show-server-commands",
                 true
         );
 

src/main/java/com/rsscripting/rswarehouse/dao/AutoDepositDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.autodeposit.autodepositdao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;

src/main/java/com/rsscripting/rswarehouse/dao/CategoryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.category.categorymenu;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;

src/main/java/com/rsscripting/rswarehouse/dao/ChestDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.deposit.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.RSWarehouse;
 import com.rsscripting.rswarehouse.database.DatabaseManager;

src/main/java/com/rsscripting/rswarehouse/dao/DamagedVariantsDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.variants.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.DamagedVariant;

src/main/java/com/rsscripting/rswarehouse/dao/DiscoveryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.discovery.discoverydao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/EnchantedVariantsDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.variants.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.EnchantedVariant;

src/main/java/com/rsscripting/rswarehouse/dao/InventoryCreationDAO.java

@@ -1,6 +1,5 @@
-package com.rsscripting.rswarehouse.inventory.inventorydao;
+package com.rsscripting.rswarehouse.dao;
 
-import com.rsscripting.rswarehouse.references.referencesdao.WarehouseReferenceDAO;
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/rsscripting/rswarehouse/dao/InventoryLookupDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.inventory.inventorydao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;

src/main/java/com/rsscripting/rswarehouse/dao/InventoryQuantityDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.inventory;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/ItemDAO.java

@@ -1,11 +1,6 @@
-package com.rsscripting.rswarehouse.item.itemdao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.RSWarehouse;
-import com.rsscripting.rswarehouse.discovery.discoverydao.DiscoveryDAO;
-import com.rsscripting.rswarehouse.inventory.inventorydao.InventoryCreationDAO;
-import com.rsscripting.rswarehouse.inventory.inventorydao.InventoryLookupDAO;
-import com.rsscripting.rswarehouse.inventory.InventoryQuantityDAO;
-import com.rsscripting.rswarehouse.references.referencesdao.WarehouseReferenceDAO;
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;

src/main/java/com/rsscripting/rswarehouse/dao/ItemPlacementDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.placement.placementdao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
@@ -7,7 +7,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import static com.rsscripting.rswarehouse.item.itemdao.ItemDAO.getItemById;
+import static com.rsscripting.rswarehouse.dao.ItemDAO.getItemById;
 
 public class ItemPlacementDAO {
 

src/main/java/com/rsscripting/rswarehouse/dao/PartiallyFilledVariantsDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.variants.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.PartiallyFilledVariant;

src/main/java/com/rsscripting/rswarehouse/dao/SubCategoryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.subcategory.subcategorydao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;

src/main/java/com/rsscripting/rswarehouse/dao/VerifyIsChestDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.deposit.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.RSWarehouse;
 import com.rsscripting.rswarehouse.database.DatabaseManager;

src/main/java/com/rsscripting/rswarehouse/dao/WarehouseChestDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.deposit.dao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.RSWarehouse;
 import com.rsscripting.rswarehouse.config.ConfigManager;
@@ -18,7 +18,7 @@ import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.rsscripting.rswarehouse.deposit.dao.VerifyIsChestDAO.isWarehouseChest;
+import static com.rsscripting.rswarehouse.dao.VerifyIsChestDAO.isWarehouseChest;
 
 public class WarehouseChestDAO {
 

src/main/java/com/rsscripting/rswarehouse/dao/WarehouseReferenceDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.references.referencesdao;
+package com.rsscripting.rswarehouse.dao;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
@@ -11,7 +11,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static com.rsscripting.rswarehouse.item.itemdao.ItemDAO.getItemById;
+import static com.rsscripting.rswarehouse.dao.ItemDAO.getItemById;
 
 public class WarehouseReferenceDAO {
 

src/main/java/com/rsscripting/rswarehouse/dao/admin/CategoryPlacementDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/admin/CreateCategoryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/admin/CreateServerCommandDAO.java

@@ -0,0 +1,257 @@
+package com.rsscripting.rswarehouse.dao.admin;
+
+import com.rsscripting.rswarehouse.database.DatabaseManager;
+import com.rsscripting.rswarehouse.utils.ItemStackUtils;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.sql.SQLException;
+
+public class CreateServerCommandDAO {
+
+    public static int createServerCommand(
+            String internalName,
+            String displayName,
+            String material,
+            String lore
+    ) {
+
+        try (
+                Connection connection =
+                        DatabaseManager.getConnection()
+        ) {
+
+            connection.setAutoCommit(false);
+
+            try {
+
+                /*
+                 * Create the Server Command category.
+                 */
+
+                int nextDisplayOrder = 1;
+
+                try (
+                        PreparedStatement maxStatement =
+                                connection.prepareStatement(
+                                        """
+                                        SELECT COALESCE(
+                                            MAX(display_order),
+                                            0
+                                        )
+                                        FROM warehouse_categories
+                                        """
+                                )
+                ) {
+
+                    ResultSet resultSet =
+                            maxStatement.executeQuery();
+
+                    if (resultSet.next()) {
+
+                        nextDisplayOrder =
+                                resultSet.getInt(1) + 1;
+
+                    }
+
+                }
+
+                int commandCategoryId;
+
+                try (
+                        PreparedStatement statement =
+                                connection.prepareStatement(
+                                        """
+                                        INSERT INTO warehouse_categories (
+                                            parent_category_id,
+                                            internal_name,
+                                            display_name,
+                                            material,
+                                            lore,
+                                            display_order,
+                                            page,
+                                            slot
+                                        )
+                                        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                                        """,
+                                        Statement.RETURN_GENERATED_KEYS
+                                )
+                ) {
+
+                    statement.setInt(
+                            1,
+                            1001
+                    );
+
+                    statement.setString(
+                            2,
+                            internalName
+                    );
+
+                    statement.setString(
+                            3,
+                            displayName
+                    );
+
+                    statement.setString(
+                            4,
+                            material
+                    );
+
+                    statement.setString(
+                            5,
+                            lore
+                    );
+
+                    statement.setInt(
+                            6,
+                            nextDisplayOrder
+                    );
+
+                    statement.setInt(
+                            7,
+                            0
+                    );
+
+                    statement.setInt(
+                            8,
+                            0
+                    );
+
+                    statement.executeUpdate();
+
+                    ResultSet keys =
+                            statement.getGeneratedKeys();
+
+                    if (!keys.next()) {
+
+                        connection.rollback();
+
+                        return -1;
+
+                    }
+
+                    commandCategoryId =
+                            keys.getInt(1);
+
+                }
+
+
+                /*
+                 * Create the display-only navigation item.
+                 */
+
+                ItemStack item =
+                        new ItemStack(
+                                Material.valueOf(
+                                        material
+                                )
+                        );
+
+                String serializedItem =
+                        ItemStackUtils.serialize(
+                                item
+                        );
+
+                try (
+                        PreparedStatement statement =
+                                connection.prepareStatement(
+                                        """
+                                        INSERT INTO warehouse_items (
+                                            category_id,
+                                            serialized_item,
+                                            default_lore,
+                                            inventory_id,
+                                            subcategory_id,
+                                            created_at,
+                                            page,
+                                            slot
+                                        )
+                                        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                                        """
+                                )
+                ) {
+
+                    statement.setInt(
+                            1,
+                            1001
+                    );
+
+                    statement.setString(
+                            2,
+                            serializedItem
+                    );
+
+                    statement.setString(
+                            3,
+                            null
+                    );
+
+                    statement.setObject(
+                            4,
+                            null
+                    );
+
+                    statement.setInt(
+                            5,
+                            commandCategoryId
+                    );
+
+                    statement.setString(
+                            6,
+                            String.valueOf(
+                                    System.currentTimeMillis()
+                            )
+                    );
+
+                    statement.setObject(
+                            7,
+                            null
+                    );
+
+                    statement.setObject(
+                            8,
+                            null
+                    );
+
+                    statement.executeUpdate();
+
+                }
+
+                connection.commit();
+
+                return commandCategoryId;
+
+            }
+
+            catch (SQLException exception) {
+
+                connection.rollback();
+
+                exception.printStackTrace();
+
+            }
+
+            finally {
+
+                connection.setAutoCommit(true);
+
+            }
+
+        }
+
+        catch (SQLException exception) {
+
+            exception.printStackTrace();
+
+        }
+
+        return -1;
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/dao/admin/CreateSubCategoryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/admin/PurgeVariantsDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 import org.bukkit.Bukkit;

src/main/java/com/rsscripting/rswarehouse/dao/admin/UpdateCategoryDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/dao/admin/WarehouseStatisticsDAO.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.admindao;
+package com.rsscripting.rswarehouse.dao.admin;
 
 import com.rsscripting.rswarehouse.database.DatabaseManager;
 

src/main/java/com/rsscripting/rswarehouse/database/DatabaseTableCreator.java

@@ -92,6 +92,31 @@ public class DatabaseTableCreator {
                             """
             );
 
+            connection.createStatement().execute(
+                    """
+                    INSERT OR IGNORE INTO warehouse_categories (
+                        id,
+                        internal_name,
+                        display_name,
+                        material,
+                        lore,
+                        display_order,
+                        page,
+                        slot
+                    )
+                    VALUES (
+                        1001,
+                        'server_commands',
+                        'Server Commands',
+                        'BOOK',
+                        '\nCommands and descriptions available on this server.',
+                        0,
+                        0,
+                        6
+                    )
+                    """
+            );
+
             connection.createStatement().execute(
                     """
                             
@@ -183,7 +208,6 @@ public class DatabaseTableCreator {
             );
 
         } catch (Exception e) {
-
             plugin.getLogger().log(
                     Level.SEVERE,
                     "Failed to create tables.",

src/main/java/com/rsscripting/rswarehouse/deposit/WarehouseChestProcessor.java

@@ -1,12 +1,12 @@
 package com.rsscripting.rswarehouse.deposit;
 
-import com.rsscripting.rswarehouse.deposit.dao.ChestDAO;
-import com.rsscripting.rswarehouse.inventory.inventorydao.InventoryCreationDAO;
-import com.rsscripting.rswarehouse.inventory.inventorydao.InventoryLookupDAO;
-import com.rsscripting.rswarehouse.variants.dao.DamagedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.EnchantedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.PartiallyFilledVariantsDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ChestDAO;
+import com.rsscripting.rswarehouse.dao.InventoryCreationDAO;
+import com.rsscripting.rswarehouse.dao.InventoryLookupDAO;
+import com.rsscripting.rswarehouse.dao.DamagedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.EnchantedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.PartiallyFilledVariantsDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.config.ConfigManager;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;
 import org.bukkit.block.Chest;

src/main/java/com/rsscripting/rswarehouse/deposit/WarehouseCloseListener.java

@@ -1,9 +1,7 @@
 package com.rsscripting.rswarehouse.deposit;
 
-import com.rsscripting.rswarehouse.admin.admindao.PurgeVariantsDAO;
-import com.rsscripting.rswarehouse.deposit.dao.VerifyIsChestDAO;
+import com.rsscripting.rswarehouse.dao.VerifyIsChestDAO;
 import com.rsscripting.rswarehouse.config.ConfigManager;
-import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import org.bukkit.block.Chest;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/item/ItemsBuilder.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;

src/main/java/com/rsscripting/rswarehouse/item/ItemsMenuListener.java

@@ -1,8 +1,7 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.item.options.ItemOptionsMenu;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;

src/main/java/com/rsscripting/rswarehouse/item/ItemsPagination.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 
 import java.util.ArrayList;

src/main/java/com/rsscripting/rswarehouse/item/TransactionAmountMenu.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;

src/main/java/com/rsscripting/rswarehouse/item/TransactionAmountMenuListener.java

@@ -1,7 +1,6 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.session.GuiSession;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;

src/main/java/com/rsscripting/rswarehouse/item/TransactionConfirmHandler.java

@@ -3,7 +3,7 @@ package com.rsscripting.rswarehouse.item;
 import com.rsscripting.rswarehouse.session.TransactionSession;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 
 public class TransactionConfirmHandler {
 

src/main/java/com/rsscripting/rswarehouse/item/TransactionVariantBuilder.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.variants.dao.DamagedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.EnchantedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.PartiallyFilledVariantsDAO;
+import com.rsscripting.rswarehouse.dao.DamagedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.EnchantedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.PartiallyFilledVariantsDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;
 import com.rsscripting.rswarehouse.constants.RSKeys;

src/main/java/com/rsscripting/rswarehouse/item/TransactionWithdrawHandler.java

@@ -1,8 +1,8 @@
 package com.rsscripting.rswarehouse.item;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
-import com.rsscripting.rswarehouse.autodeposit.autodepositdao.AutoDepositDAO;
+import com.rsscripting.rswarehouse.dao.AutoDepositDAO;
 import com.rsscripting.rswarehouse.session.TransactionSession;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

src/main/java/com/rsscripting/rswarehouse/item/deleteitem/DeleteConfirmationMenu.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.item.deleteitem;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.ItemStackUtils;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;

src/main/java/com/rsscripting/rswarehouse/item/deleteitem/DeleteConfirmationMenuListener.java

@@ -1,12 +1,12 @@
 package com.rsscripting.rswarehouse.item.deleteitem;
 
 import com.rsscripting.rswarehouse.item.options.ItemOptionsMenu;
-import com.rsscripting.rswarehouse.inventory.InventoryQuantityDAO;
-import com.rsscripting.rswarehouse.references.referencesdao.WarehouseReferenceDAO;
-import com.rsscripting.rswarehouse.variants.dao.DamagedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.EnchantedVariantsDAO;
-import com.rsscripting.rswarehouse.variants.dao.PartiallyFilledVariantsDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.InventoryQuantityDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseReferenceDAO;
+import com.rsscripting.rswarehouse.dao.DamagedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.EnchantedVariantsDAO;
+import com.rsscripting.rswarehouse.dao.PartiallyFilledVariantsDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/item/options/ItemOptionsMenu.java

@@ -1,9 +1,9 @@
 package com.rsscripting.rswarehouse.item.options;
 
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import com.rsscripting.rswarehouse.utils.RSMenuUtils;
-import com.rsscripting.rswarehouse.references.referencesdao.WarehouseReferenceDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseReferenceDAO;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;

src/main/java/com/rsscripting/rswarehouse/item/options/ItemOptionsMenuListener.java

@@ -5,18 +5,18 @@ import com.rsscripting.rswarehouse.subcategory.copytosubcategory.CopyToSubCatego
 import com.rsscripting.rswarehouse.item.deleteitem.DeleteConfirmationMenu;
 import com.rsscripting.rswarehouse.category.movetocategory.MoveToCategoryMenu;
 import com.rsscripting.rswarehouse.subcategory.movetosubcategory.MoveToSubCategoryMenu;
-import com.rsscripting.rswarehouse.admin.adminsessions.SubCategoryCreationSessionManager;
-import com.rsscripting.rswarehouse.admin.adminsessions.SubCategoryEditSession;
-import com.rsscripting.rswarehouse.admin.adminsessions.SubCategoryEditSessionManager;
+import com.rsscripting.rswarehouse.session.admin.SubCategoryCreationSessionManager;
+import com.rsscripting.rswarehouse.session.admin.SubCategoryEditSession;
+import com.rsscripting.rswarehouse.session.admin.SubCategoryEditSessionManager;
 import com.rsscripting.rswarehouse.subcategory.items.SubCategoryEditDisplayNameMenu;
 import com.rsscripting.rswarehouse.subcategory.items.SubCategoryEditLoreMenu;
 import com.rsscripting.rswarehouse.subcategory.items.SubCategoryInternalNameMenu;
-import com.rsscripting.rswarehouse.admin.adminsessions.PageSlotAssignmentSessionManager;
-import com.rsscripting.rswarehouse.admin.assignpageslot.PageNumberMenu;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.subcategory.subcategorydao.SubCategoryDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
-import com.rsscripting.rswarehouse.references.referencesdao.WarehouseReferenceDAO;
+import com.rsscripting.rswarehouse.session.admin.PageSlotAssignmentSessionManager;
+import com.rsscripting.rswarehouse.assignpageslot.PageNumberMenu;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.SubCategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseReferenceDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 import org.bukkit.entity.Player;

src/main/java/com/rsscripting/rswarehouse/mainmenu/MainMenu.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.main;
+package com.rsscripting.rswarehouse.mainmenu;
 
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
 import com.rsscripting.rswarehouse.constants.RSConstants;

src/main/java/com/rsscripting/rswarehouse/mainmenu/MainMenuListener.java

@@ -1,10 +1,9 @@
-package com.rsscripting.rswarehouse.main;
+package com.rsscripting.rswarehouse.mainmenu;
 
-import com.rsscripting.rswarehouse.deposit.dao.WarehouseChestDAO;
+import com.rsscripting.rswarehouse.dao.WarehouseChestDAO;
 import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
-import com.rsscripting.rswarehouse.admin.AdminMenu;
-import com.rsscripting.rswarehouse.conversion.ConvertMenuListener;
+import com.rsscripting.rswarehouse.adminmenu.AdminMenu;
+import com.rsscripting.rswarehouse.chestconvert.ConvertMenuListener;
 import com.rsscripting.rswarehouse.constants.RSConstants;
 import com.rsscripting.rswarehouse.navigation.NavigationManager;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;

src/main/java/com/rsscripting/rswarehouse/navigation/NavigationManager.java

@@ -2,7 +2,7 @@ package com.rsscripting.rswarehouse.navigation;
 
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenu;
 import com.rsscripting.rswarehouse.item.ItemsMenu;
-import com.rsscripting.rswarehouse.main.MainMenu;
+import com.rsscripting.rswarehouse.mainmenu.MainMenu;
 import com.rsscripting.rswarehouse.session.GuiSessionManager;
 import org.bukkit.entity.Player;
 

src/main/java/com/rsscripting/rswarehouse/otherlisteners/WarehouseChestBreakListener.java

@@ -1,6 +1,6 @@
 package com.rsscripting.rswarehouse.otherlisteners;
 
-import com.rsscripting.rswarehouse.deposit.dao.VerifyIsChestDAO;
+import com.rsscripting.rswarehouse.dao.VerifyIsChestDAO;
 import com.rsscripting.rswarehouse.utils.RSMessageUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/rsscripting/rswarehouse/registration/ListenerRegistration.java

@@ -6,12 +6,13 @@ import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditDisplayName
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditLoreMenuChatListener;
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditLoreMenuListener;
 import com.rsscripting.rswarehouse.category.categoryedit.CategoryEditMaterialMenuListener;
+import com.rsscripting.rswarehouse.servercommands.*;
 import com.rsscripting.rswarehouse.subcategory.items.*;
-import com.rsscripting.rswarehouse.admin.AdminMenuListener;
-import com.rsscripting.rswarehouse.admin.assignpageslot.CategoryPageNumberMenuListener;
-import com.rsscripting.rswarehouse.admin.assignpageslot.CategorySlotNumberMenuListener;
-import com.rsscripting.rswarehouse.admin.assignpageslot.PageNumberMenuListener;
-import com.rsscripting.rswarehouse.admin.assignpageslot.SlotNumberMenuListener;
+import com.rsscripting.rswarehouse.adminmenu.AdminMenuListener;
+import com.rsscripting.rswarehouse.assignpageslot.CategoryPageNumberMenuListener;
+import com.rsscripting.rswarehouse.assignpageslot.CategorySlotNumberMenuListener;
+import com.rsscripting.rswarehouse.assignpageslot.PageNumberMenuListener;
+import com.rsscripting.rswarehouse.assignpageslot.SlotNumberMenuListener;
 import com.rsscripting.rswarehouse.category.categoryoptions.CategoryOptionsMenuListener;
 import com.rsscripting.rswarehouse.category.copytocategory.CopyToCategoryMenuListener;
 import com.rsscripting.rswarehouse.subcategory.copytosubcategory.CopyToSubCategoryMenuListener;
@@ -20,7 +21,7 @@ import com.rsscripting.rswarehouse.item.options.ItemOptionsMenuListener;
 import com.rsscripting.rswarehouse.category.movetocategory.MoveToCategoryMenuListener;
 import com.rsscripting.rswarehouse.subcategory.movetosubcategory.MoveToSubCategoryMenuListener;
 import com.rsscripting.rswarehouse.deposit.WarehouseCloseListener;
-import com.rsscripting.rswarehouse.conversion.ConvertMenuListener;
+import com.rsscripting.rswarehouse.chestconvert.ConvertMenuListener;
 import com.rsscripting.rswarehouse.autodeposit.AutoDepositMenuListener;
 import com.rsscripting.rswarehouse.autodeposit.AutoDepositPickupListener;
 import com.rsscripting.rswarehouse.category.categorymenu.CategoryMenuListener;
@@ -30,7 +31,7 @@ import com.rsscripting.rswarehouse.variantsenchanted.EnchantedVariantsMenuListen
 import com.rsscripting.rswarehouse.variantsenchanted.EnchantedVariantsTransactionMenuListener;
 import com.rsscripting.rswarehouse.item.ItemsMenuListener;
 import com.rsscripting.rswarehouse.item.TransactionAmountMenuListener;
-import com.rsscripting.rswarehouse.main.MainMenuListener;
+import com.rsscripting.rswarehouse.mainmenu.MainMenuListener;
 import com.rsscripting.rswarehouse.otherlisteners.RSUpdateNotificationListener;
 import com.rsscripting.rswarehouse.otherlisteners.WarehouseChestBreakListener;
 import com.rsscripting.rswarehouse.variantspartiallyfilled.PartiallyFilledVariantsMenuListener;
@@ -46,6 +47,8 @@ public final class ListenerRegistration {
             RSWarehouse plugin
     ) {
 
+        /* Convert Menu */
+
         ConvertMenuListener conversionListener =
                 new ConvertMenuListener();
 
@@ -61,9 +64,81 @@ public final class ListenerRegistration {
                 )
         );
 
+        /* Admin Menu */
+
         ListenerRegistrar.register(
                 plugin,
-                new SubCategoryDisplayNameMenuListener()
+                new AdminMenuListener(
+                        conversionListener
+                )
+        );
+
+        /* Assign Page/Slot */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryPageNumberMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategorySlotNumberMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new PageNumberMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new SlotNumberMenuListener()
+        );
+
+        /* Auto Deposit */
+
+        ListenerRegistrar.register(
+                plugin,
+                new AutoDepositMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new AutoDepositPickupListener()
+        );
+
+        /* Category Creation */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryDisplayNameMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryLoreChatListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryLoreMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryMaterialPickerMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryNameMenuListener()
+        );
+
+        /* Category Edit */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryEditDisplayNameMenuListener()
         );
 
         ListenerRegistrar.register(
@@ -74,11 +149,6 @@ public final class ListenerRegistration {
         ListenerRegistrar.register(
                 plugin,
                 new CategoryEditLoreMenuListener()
-                );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryEditDisplayNameMenuListener()
         );
 
         ListenerRegistrar.register(
@@ -86,6 +156,135 @@ public final class ListenerRegistration {
                 new CategoryEditMaterialMenuListener()
         );
 
+        /* Category Menu */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryMenuListener()
+        );
+
+        /* Category Options */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CategoryOptionsMenuListener()
+        );
+
+        /* Copy To Category */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CopyToSubCategoryMenuListener()
+        );
+
+        /* Move To Category */
+
+        ListenerRegistrar.register(
+                plugin,
+                new MoveToCategoryMenuListener()
+        );
+
+        /* Deposit */
+
+        ListenerRegistrar.register(
+                plugin,
+                new WarehouseCloseListener()
+        );
+
+        /* Items Deletion */
+
+        ListenerRegistrar.register(
+                plugin,
+                new DeleteConfirmationMenuListener()
+        );
+
+        /* Item Options */
+
+        ListenerRegistrar.register(
+                plugin,
+                new ItemOptionsMenuListener()
+        );
+
+        /* Items */
+
+        ListenerRegistrar.register(
+                plugin,
+                new ItemsMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new TransactionAmountMenuListener()
+        );
+
+        /* Warehouse Chest Break */
+
+        ListenerRegistrar.register(
+                plugin,
+                new WarehouseChestBreakListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new RSUpdateNotificationListener()
+        );
+
+        /* Server Commands */
+
+        ListenerRegistrar.register(
+                plugin,
+                new ServerCommandDisplayNameMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new ServerCommandInternalNameMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new ServerCommandLoreChatListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new ServerCommandLoreMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new ServerCommandMaterialPickerMenuListener()
+        );
+
+        /*  Copy To SubCategory */
+
+        ListenerRegistrar.register(
+                plugin,
+                new CopyToCategoryMenuListener()
+        );
+
+        /* Subcategory Items */
+
+        ListenerRegistrar.register(
+                plugin,
+                new SubCategoryDisplayNameMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new SubCategoryEditDisplayNameMenuListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new SubCategoryEditLoreChatListener()
+        );
+
+        ListenerRegistrar.register(
+                plugin,
+                new SubCategoryEditLoreMenuListener()
+        );
+
         ListenerRegistrar.register(
                 plugin,
                 new SubCategoryInternalNameMenuListener()
@@ -101,127 +300,14 @@ public final class ListenerRegistration {
                 new SubCategoryLoreMenuListener()
         );
 
+        /* Move To SubCategory */
+
         ListenerRegistrar.register(
                 plugin,
                 new MoveToSubCategoryMenuListener()
         );
 
-        ListenerRegistrar.register(
-                plugin,
-                new RSUpdateNotificationListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new SubCategoryEditDisplayNameMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new SubCategoryEditLoreMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new SubCategoryEditLoreChatListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new DeleteConfirmationMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new ItemOptionsMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new AdminMenuListener(
-                        conversionListener
-                )
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryLoreMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new EnchantedVariantsMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new EnchantedVariantsTransactionMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new PartiallyFilledVariantsTransactionMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryLoreChatListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new MoveToCategoryMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new AutoDepositMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new AutoDepositPickupListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new WarehouseChestBreakListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new WarehouseCloseListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new PartiallyFilledVariantsMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryNameMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryDisplayNameMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryMaterialPickerMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new ItemsMenuListener()
-        );
+        /* Variants Damaged */
 
         ListenerRegistrar.register(
                 plugin,
@@ -233,47 +319,30 @@ public final class ListenerRegistration {
                 new DamagedVariantsTransactionMenuListener()
         );
 
+        /* Variants Enchanted */
+
         ListenerRegistrar.register(
                 plugin,
-                new TransactionAmountMenuListener()
+                new EnchantedVariantsMenuListener()
         );
 
         ListenerRegistrar.register(
                 plugin,
-                new PageNumberMenuListener()
+                new EnchantedVariantsTransactionMenuListener()
+        );
+
+        /* Variants Parially Filled */
+
+        ListenerRegistrar.register(
+                plugin,
+                new PartiallyFilledVariantsTransactionMenuListener()
         );
 
         ListenerRegistrar.register(
                 plugin,
-                new SlotNumberMenuListener()
+                new PartiallyFilledVariantsMenuListener()
         );
 
-        ListenerRegistrar.register(
-                plugin,
-                new CopyToSubCategoryMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CopyToCategoryMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryOptionsMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategoryPageNumberMenuListener()
-        );
-
-        ListenerRegistrar.register(
-                plugin,
-                new CategorySlotNumberMenuListener()
-        );
-
-
     }
 
 }

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandDisplayNameMenu.java

@@ -0,0 +1,86 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.MenuType;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.view.AnvilView;
+
+import java.util.List;
+
+public class ServerCommandDisplayNameMenu {
+
+    public static final String TITLE =
+            "Command Display Title";
+
+    public static void open(Player player) {
+
+        AnvilView view = MenuType.ANVIL
+                .builder()
+                .title(
+                        Component.text(
+                                TITLE
+                        )
+                )
+                .build(player);
+
+        ItemStack confirm = new ItemStack(Material.LIME_WOOL);
+
+        ItemMeta meta = confirm.getItemMeta();
+
+        meta.displayName(
+                Component.text("")
+        );
+
+        meta.lore(
+                List.of(
+                        Component.text(
+                                "Save and proceed to description."
+                        ).color(
+                                NamedTextColor.WHITE
+                        )
+                )
+        );
+
+        confirm.setItemMeta(meta);
+
+        view.setItem(
+                0,
+                confirm
+        );
+
+
+        ItemStack cancel = new ItemStack(Material.RED_WOOL);
+
+        ItemMeta metacancel = cancel.getItemMeta();
+
+        metacancel.displayName(
+                Component.text("")
+        );
+
+        metacancel.lore(
+                List.of(
+                        Component.text(
+                                "Cancel"
+                        ).color(
+                                NamedTextColor.WHITE
+                        )
+                )
+        );
+
+        cancel.setItemMeta(metacancel);
+
+
+        view.setItem(
+                1,
+                cancel
+        );
+
+        view.open();
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandDisplayNameMenuListener.java

@@ -0,0 +1,135 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.adminmenu.AdminMenu;
+import com.rsscripting.rswarehouse.utils.RSMessageUtils;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.view.AnvilView;
+
+public class ServerCommandDisplayNameMenuListener implements Listener {
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+
+        if (!(event.getView() instanceof AnvilView anvilView)) {
+            return;
+        }
+
+        if (!event.getView()
+                .title()
+                .toString()
+                .contains(
+                        ServerCommandDisplayNameMenu.TITLE
+                )) {
+
+            return;
+
+        }
+
+        Player player =
+                (Player) event.getWhoClicked();
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        if (session == null) {
+
+            return;
+
+        }
+
+        event.setCancelled(true);
+
+        if (event.getCurrentItem() == null) {
+            return;
+        }
+
+        if (event.getRawSlot() == 0) {
+
+            String categoryName =
+                    anvilView.getRenameText();
+
+            if (categoryName.length() > 25) {
+
+                RSMessageUtils.error(
+                        player,
+                        "Command titles may not exceed 25 characters."
+                );
+
+                return;
+
+            }
+
+            if (categoryName.isBlank()) {
+
+                RSMessageUtils.error(
+                        player,
+                        "Command title cannot be empty."
+                );
+
+                return;
+
+            }
+
+            session.setPendingServerCommandDisplayName(
+                    categoryName
+            );
+
+            event.getView().getTopInventory().clear();
+
+            ServerCommandLoreMenu.open(
+                player
+             );
+
+            return;
+
+        }
+
+        if (event.getRawSlot() == 1) {
+
+            event.getView().getTopInventory().clear();
+
+            AdminMenu.open(
+                    player
+            );
+
+        }
+    }
+
+    @EventHandler
+    public void onInventoryClose(
+            InventoryCloseEvent event
+    ) {
+
+        if (!(event.getView()
+                instanceof AnvilView)) {
+
+            return;
+
+        }
+
+        if (!event.getView()
+                .title()
+                .toString()
+                .contains(
+                        ServerCommandDisplayNameMenu.TITLE
+                )) {
+
+            return;
+
+        }
+
+        event.getView()
+                .getTopInventory()
+                .clear();
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandInternalNameMenu.java

@@ -0,0 +1,87 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.MenuType;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.view.AnvilView;
+
+import java.util.List;
+
+
+public class ServerCommandInternalNameMenu {
+
+    public static final String TITLE =
+            "Command Internal Name";
+
+    public static void open(Player player) {
+
+        AnvilView view = MenuType.ANVIL
+                .builder()
+                .title(
+                        Component.text(
+                                TITLE
+                        )
+                )
+                .build(player);
+
+        ItemStack confirm = new ItemStack(Material.LIME_WOOL);
+
+        ItemMeta meta = confirm.getItemMeta();
+
+        meta.displayName(
+                Component.text("")
+        );
+
+        meta.lore(
+                List.of(
+                        Component.text(
+                                "Save and proceed to title."
+                        ).color(
+                                NamedTextColor.WHITE
+                        )
+                )
+        );
+
+        confirm.setItemMeta(meta);
+
+        view.setItem(
+                0,
+                confirm
+        );
+
+
+        ItemStack cancel = new ItemStack(Material.RED_WOOL);
+
+        ItemMeta metacancel = cancel.getItemMeta();
+
+        metacancel.displayName(
+                Component.text("")
+        );
+
+        metacancel.lore(
+                List.of(
+                        Component.text(
+                                "Cancel"
+                        ).color(
+                                NamedTextColor.WHITE
+                        )
+                )
+        );
+
+        cancel.setItemMeta(metacancel);
+
+
+        view.setItem(
+                1,
+                cancel
+        );
+
+        view.open();
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandInternalNameMenuListener.java

@@ -0,0 +1,135 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.adminmenu.AdminMenu;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import com.rsscripting.rswarehouse.utils.RSMessageUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.view.AnvilView;
+
+public class ServerCommandInternalNameMenuListener implements Listener {
+
+    @EventHandler
+    public void onInventoryClick(InventoryClickEvent event) {
+
+        if (!(event.getView() instanceof AnvilView anvilView)) {
+            return;
+        }
+
+        if (!event.getView()
+                .title()
+                .toString()
+                .contains(
+                        ServerCommandInternalNameMenu.TITLE
+                )) {
+
+            return;
+
+        }
+
+        Player player =
+                (Player) event.getWhoClicked();
+
+        event.setCancelled(true);
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        if (session == null) {
+
+            return;
+
+        }
+
+        if (event.getCurrentItem() == null) {
+            return;
+        }
+
+        if (event.getRawSlot() == 0) {
+
+            String categoryName =
+                    anvilView.getRenameText();
+
+            if (categoryName.length() > 25) {
+
+                RSMessageUtils.error(
+                        player,
+                        "Command names may not exceed 25 characters."
+                );
+
+                return;
+
+            }
+
+            if (categoryName.isBlank()) {
+
+                RSMessageUtils.error(
+                        player,
+                        "Command name cannot be empty."
+                );
+
+                return;
+
+            }
+
+            session.setPendingServerCommandName(
+                    categoryName
+            );
+
+            event.getView().getTopInventory().clear();
+
+            ServerCommandDisplayNameMenu.open(
+                    player
+            );
+
+            return;
+
+        }
+
+        if (event.getRawSlot() == 1) {
+
+            event.getView().getTopInventory().clear();
+
+            AdminMenu.open(
+                    player
+            );
+
+        }
+    }
+
+    @EventHandler
+    public void onInventoryClose(
+            InventoryCloseEvent event
+    ) {
+
+        if (!(event.getView()
+                instanceof AnvilView)) {
+
+            return;
+
+        }
+
+        if (!event.getView()
+                .title()
+                .toString()
+                .contains(
+                        ServerCommandInternalNameMenu.TITLE
+                )) {
+
+            return;
+
+        }
+
+        event.getView()
+                .getTopInventory()
+                .clear();
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandLoreChatListener.java

@@ -0,0 +1,136 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import com.rsscripting.rswarehouse.utils.RSMessageUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+
+public class ServerCommandLoreChatListener
+        implements Listener {
+
+    @EventHandler
+    public void onPlayerChat(
+            AsyncPlayerChatEvent event
+    ) {
+
+        Player player =
+                event.getPlayer();
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        if (session == null) {
+
+            return;
+
+        }
+
+        int loreSlot =
+                session.getPendingServerCommandLoreSlot();
+
+        if (loreSlot < 0) {
+
+            return;
+
+        }
+
+        event.setCancelled(
+                true
+        );
+
+        String message =
+                event.getMessage();
+
+        if (message.length() > 50) {
+
+            RSMessageUtils.error(
+                    player,
+                    "Lore lines may not exceed 50 characters."
+            );
+
+            Bukkit.getScheduler()
+                    .runTask(
+                            Bukkit.getPluginManager()
+                                    .getPlugin(
+                                            "RS-Warehouse"
+                                    ),
+                            () -> ServerCommandLoreMenu.open(
+                                    player
+                            )
+                    );
+
+            return;
+
+        }
+
+        if (
+                message.equalsIgnoreCase(
+                        "cancel"
+                )
+        ) {
+
+            session.setPendingServerCommandLoreSlot(
+                    -1
+            );
+
+            session.setPendingServerCommandLoreExpiration(
+                    0
+            );
+
+            Bukkit.getScheduler()
+                    .runTask(
+                            Bukkit.getPluginManager()
+                                    .getPlugin(
+                                            "RS-Warehouse"
+                                    ),
+                            () -> ServerCommandLoreMenu.open(
+                                    player
+                            )
+                    );
+
+            return;
+
+        }
+
+        session.setPendingServerCommandLore(
+                loreSlot,
+                message
+        );
+
+        session.setPendingServerCommandLoreSlot(
+                -1
+        );
+
+        session.setPendingServerCommandLoreExpiration(
+                0
+        );
+
+        Bukkit.getScheduler()
+                .runTask(
+                        Bukkit.getPluginManager()
+                                .getPlugin(
+                                        "RS-Warehouse"
+                                ),
+                        () -> {
+
+                            RSMessageUtils.success(
+                                    player,
+                                    "Lore line saved."
+                            );
+
+                            ServerCommandLoreMenu.open(
+                                    player
+                            );
+
+                        }
+                );
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandLoreMenu.java

@@ -0,0 +1,142 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import com.rsscripting.rswarehouse.utils.RSMenuUtils;
+import net.kyori.adventure.text.Component;
+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 java.util.ArrayList;
+import java.util.List;
+
+public class ServerCommandLoreMenu {
+
+    public static void open(
+            Player player
+    ) {
+
+        Inventory menu =
+                Bukkit.createInventory(
+                        new RSMenuHolder(
+                                "SERVER_COMMAND_LORE"
+                        ),
+                        27,
+                        Component.text(
+                                "Server Command Lore"
+                        )
+                );
+
+        for (int i = 0; i < menu.getSize(); i++) {
+
+            menu.setItem(
+                    i,
+                    RSMenuUtils.createFillerPane()
+            );
+
+        }
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        for (int i = 0; i < 5; i++) {
+
+            ItemStack book =
+                    new ItemStack(
+                            Material.WRITABLE_BOOK
+                    );
+
+            ItemMeta meta =
+                    book.getItemMeta();
+
+            meta.displayName(
+                    Component.text(
+                            "Lore Line "
+                                    + (i + 1)
+                    )
+            );
+
+            List<Component> lore =
+                    new ArrayList<>();
+
+            String value =
+                    session.getPendingServerCommandLore(i);
+
+            if (
+                    value == null
+                            || value.isBlank()
+            ) {
+
+                lore.add(
+                        Component.text(
+                                "(Empty)"
+                        )
+                );
+
+            }
+
+            else {
+
+                lore.add(
+                        Component.text(
+                                value
+                        )
+                );
+
+            }
+
+            lore.add(
+                    Component.empty()
+            );
+
+            lore.add(
+                    Component.text(
+                            "Click to edit."
+                    )
+            );
+
+            meta.lore(
+                    lore
+            );
+
+            book.setItemMeta(
+                    meta
+            );
+
+            menu.setItem(
+                    11 + i,
+                    book
+            );
+
+        }
+
+        menu.setItem(
+                22,
+                RSMenuUtils.createMenuItem(
+                        Material.LIME_WOOL,
+                        "§aCreate Server Command"
+                )
+        );
+
+        menu.setItem(
+                4,
+                RSMenuUtils.createMenuItem(
+                        Material.OAK_DOOR,
+                        "§eBack"
+                )
+        );
+
+        player.openInventory(
+                menu
+        );
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandLoreMenuListener.java

@@ -0,0 +1,171 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import com.rsscripting.rswarehouse.utils.RSMessageUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+
+public class ServerCommandLoreMenuListener
+        implements Listener {
+
+    @EventHandler
+    public void onInventoryClick(
+            InventoryClickEvent event
+    ) {
+
+        if (!(event.getInventory()
+                .getHolder()
+                instanceof RSMenuHolder holder)) {
+
+            return;
+
+        }
+
+        if (!holder.getMenuId().equals(
+                "SERVER_COMMAND_LORE"
+        )) {
+
+            return;
+
+        }
+
+        event.setCancelled(
+                true
+        );
+
+        Player player =
+                (Player) event.getWhoClicked();
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        switch (event.getSlot()) {
+
+            case 4 -> ServerCommandDisplayNameMenu.open(
+                    player
+            );
+
+            case 11 -> editLore(
+                    player,
+                    session,
+                    0
+            );
+
+            case 12 -> editLore(
+                    player,
+                    session,
+                    1
+            );
+
+            case 13 -> editLore(
+                    player,
+                    session,
+                    2
+            );
+
+            case 14 -> editLore(
+                    player,
+                    session,
+                    3
+            );
+
+            case 15 -> editLore(
+                    player,
+                    session,
+                    4
+            );
+
+            case 22 -> {
+
+                ServerCommandMaterialPickerMenu.open(
+                        player,
+                        0
+                );
+
+            }
+
+        }
+
+    }
+
+    private void editLore(
+            Player player,
+            ServerCommandCreationSession session,
+            int loreSlot
+    ) {
+
+        session.setPendingServerCommandLoreSlot(
+                loreSlot
+        );
+
+        session.setPendingServerCommandLoreExpiration(
+                System.currentTimeMillis()
+                        + 30000
+        );
+
+        final long expiration =
+                session.getPendingServerCommandLoreExpiration();
+
+        Bukkit.getScheduler()
+                .runTaskLater(
+                        Bukkit.getPluginManager()
+                                .getPlugin(
+                                        "RS-Warehouse"
+                                ),
+                        () -> {
+
+                            if (
+                                    session.getPendingServerCommandLoreExpiration()
+                                            != expiration
+                            ) {
+
+                                return;
+
+                            }
+
+                            session.setPendingServerCommandLoreSlot(
+                                    -1
+                            );
+
+                            session.setPendingServerCommandLoreExpiration(
+                                    0
+                            );
+
+                            RSMessageUtils.error(
+                                    player,
+                                    "Lore input timed out."
+                            );
+
+                        },
+                        20L * 30
+                );
+
+        player.closeInventory();
+
+        RSMessageUtils.info(
+                player,
+                "Enter lore for line "
+                        + (loreSlot + 1)
+                        + " in chat."
+        );
+
+        RSMessageUtils.info(
+                player,
+                "Type 'cancel' to abort."
+        );
+
+        RSMessageUtils.info(
+                player,
+                "Auto-Cancels after 30 seconds."
+        );
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandMaterialPickerMenu.java

@@ -0,0 +1,110 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
+import com.rsscripting.rswarehouse.utils.RSMenuUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ServerCommandMaterialPickerMenu {
+
+    public static void open(
+            Player player,
+            int page
+    ) {
+
+        Inventory menu =
+                Bukkit.createInventory(
+                        new RSMenuHolder(
+                                "SERVER_COMMAND_MATERIAL_PICKER"
+                        ),
+                        54,
+                        "Select Command Material"
+                );
+
+        int slot = 0;
+
+        List<Material> materials =
+                Arrays.stream(
+                                Material.values()
+                        )
+                        .filter(
+                                Material::isItem
+                        )
+                        .filter(
+                                material ->
+                                        !material.name().endsWith(
+                                                "_SMITHING_TEMPLATE"
+                                        )
+                        )
+                        .toList();
+
+        int startIndex =
+                page * 45;
+
+        int maxPages =
+                (int) Math.ceil(
+                        (double) materials.size()
+                                / 45
+                );
+
+        for (int inventorySlot = 0;
+             inventorySlot < 45;
+             inventorySlot++) {
+
+            int materialIndex =
+                    startIndex + inventorySlot;
+
+            if (materialIndex >= materials.size()) {
+
+                break;
+
+            }
+
+            menu.setItem(
+                    inventorySlot,
+                    new ItemStack(
+                            materials.get(
+                                    materialIndex
+                            )
+                    )
+            );
+
+        }
+
+        if (page > 0) {
+
+            menu.setItem(
+                    45,
+                    RSMenuUtils.createMenuItem(
+                            Material.ARROW,
+                            "§cPrevious Page"
+                    )
+            );
+
+        }
+
+        if (page < maxPages - 1) {
+
+            menu.setItem(
+                    53,
+                    RSMenuUtils.createMenuItem(
+                            Material.ARROW,
+                            "§aNext Page"
+                    )
+            );
+
+        }
+
+        player.openInventory(
+                menu
+        );
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/servercommands/ServerCommandMaterialPickerMenuListener.java

@@ -0,0 +1,167 @@
+package com.rsscripting.rswarehouse.servercommands;
+
+import com.rsscripting.rswarehouse.dao.admin.CreateServerCommandDAO;
+import com.rsscripting.rswarehouse.menuholder.RSMenuHolder;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSession;
+import com.rsscripting.rswarehouse.session.admin.ServerCommandCreationSessionManager;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+
+public class ServerCommandMaterialPickerMenuListener
+        implements Listener {
+
+    @EventHandler
+    public void onInventoryClick(
+            InventoryClickEvent event
+    ) {
+
+        if (!(event.getInventory()
+                .getHolder()
+                instanceof RSMenuHolder holder)) {
+
+            return;
+
+        }
+
+        if (!holder.getMenuId().equals(
+                "SERVER_COMMAND_MATERIAL_PICKER"
+        )) {
+
+            return;
+
+        }
+
+        event.setCancelled(
+                true
+        );
+
+        if (event.getCurrentItem() == null) {
+
+            return;
+
+        }
+
+        Player player =
+                (Player) event.getWhoClicked();
+
+        ServerCommandCreationSession session =
+                ServerCommandCreationSessionManager.getSession(
+                        player.getUniqueId()
+                );
+
+        if (session == null) {
+
+            player.closeInventory();
+
+            return;
+        }
+
+        int page =
+                session.getPendingServerCommandMaterialPickerPage();
+
+        if (event.getSlot() == 45) {
+
+            session.setPendingServerCommandMaterialPickerPage(
+                    Math.max(
+                            0,
+                            page - 1
+                    )
+            );
+
+            ServerCommandMaterialPickerMenu.open(
+                    player,
+                    session.getPendingServerCommandMaterialPickerPage()
+            );
+
+            return;
+        }
+
+        if (event.getSlot() == 53) {
+
+            session.setPendingServerCommandMaterialPickerPage(
+                    page + 1
+            );
+
+            ServerCommandMaterialPickerMenu.open(
+                    player,
+                    session.getPendingServerCommandMaterialPickerPage()
+            );
+
+            return;
+        }
+
+        session.setPendingServerCommandMaterial(
+                event.getCurrentItem()
+                        .getType()
+                        .name()
+        );
+
+        int commandCategoryId =
+                CreateServerCommandDAO.createServerCommand(
+                        session.getPendingServerCommandName(),
+                        session.getPendingServerCommandDisplayName(),
+                        session.getPendingServerCommandMaterial(),
+                        buildLore(session)
+                );
+
+        if (commandCategoryId == -1) {
+
+            player.sendMessage(
+                    "§cFailed to create Server Command."
+            );
+
+            return;
+        }
+
+        player.sendMessage(
+                "§aServer Command created successfully."
+        );
+
+
+  //      CategoryLoreMenu.open(
+  //              player
+  //      );
+
+    }
+
+    private String buildLore(
+            ServerCommandCreationSession session
+    ) {
+
+        StringBuilder loreBuilder =
+                new StringBuilder();
+
+        for (int i = 0; i < 5; i++) {
+
+            String line =
+                    session.getPendingServerCommandLore(
+                            i
+                    );
+
+            if (line == null) {
+
+                line = "";
+
+            }
+
+            loreBuilder.append(
+                    line
+            );
+
+            if (i < 4) {
+
+                loreBuilder.append(
+                        "\n"
+                );
+
+            }
+
+        }
+
+        return loreBuilder.toString();
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/session/admin/CategoryEditSession.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 public class CategoryEditSession {
 

src/main/java/com/rsscripting/rswarehouse/session/admin/CategoryEditSessionManager.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/rsscripting/rswarehouse/session/admin/CategoryPageSlotSession.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 public class CategoryPageSlotSession {
 

src/main/java/com/rsscripting/rswarehouse/session/admin/CategoryPageSlotSessionManager.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/rsscripting/rswarehouse/session/admin/PageSlotAssignmentSession.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 public class PageSlotAssignmentSession {
 

src/main/java/com/rsscripting/rswarehouse/session/admin/PageSlotAssignmentSessionManager.java

@@ -1,7 +1,7 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
-import com.rsscripting.rswarehouse.category.categorymenu.CategoryDAO;
-import com.rsscripting.rswarehouse.item.itemdao.ItemDAO;
+import com.rsscripting.rswarehouse.dao.CategoryDAO;
+import com.rsscripting.rswarehouse.dao.ItemDAO;
 import com.rsscripting.rswarehouse.model.WarehouseCategory;
 import com.rsscripting.rswarehouse.model.WarehouseItem;
 

src/main/java/com/rsscripting/rswarehouse/session/admin/ServerCommandCreationSession.java

@@ -0,0 +1,149 @@
+package com.rsscripting.rswarehouse.session.admin;
+
+public class ServerCommandCreationSession {
+
+    private String pendingServerCommandName;
+
+    private String pendingServerCommandDisplayName;
+
+    private final String[] pendingServerCommandLore =
+            new String[5];
+
+    private int pendingServerCommandLoreSlot = -1;
+
+    private long pendingServerCommandLoreExpiration;
+
+    private String pendingServerCommandMaterial;
+
+    private int pendingServerCommandMaterialPickerPage = 0;
+
+
+    public String getPendingServerCommandName() {
+
+        return pendingServerCommandName;
+
+    }
+
+    public void setPendingServerCommandName(
+            String pendingServerCommandName
+    ) {
+
+        this.pendingServerCommandName =
+                pendingServerCommandName;
+
+    }
+
+
+    public String getPendingServerCommandDisplayName() {
+
+        return pendingServerCommandDisplayName;
+
+    }
+
+    public void setPendingServerCommandDisplayName(
+            String pendingServerCommandDisplayName
+    ) {
+
+        this.pendingServerCommandDisplayName =
+                pendingServerCommandDisplayName;
+
+    }
+
+
+    public String getPendingServerCommandLore(
+            int index
+    ) {
+
+        return pendingServerCommandLore[index];
+
+    }
+
+    public void setPendingServerCommandLore(
+            int index,
+            String value
+    ) {
+
+        pendingServerCommandLore[index] =
+                value;
+
+    }
+
+    public void clearPendingServerCommandLore() {
+
+        for (
+                int i = 0;
+                i < pendingServerCommandLore.length;
+                i++
+        ) {
+
+            pendingServerCommandLore[i] =
+                    null;
+
+        }
+
+    }
+
+
+    public int getPendingServerCommandLoreSlot() {
+
+        return pendingServerCommandLoreSlot;
+
+    }
+
+    public void setPendingServerCommandLoreSlot(
+            int pendingServerCommandLoreSlot
+    ) {
+
+        this.pendingServerCommandLoreSlot =
+                pendingServerCommandLoreSlot;
+
+    }
+
+
+    public long getPendingServerCommandLoreExpiration() {
+
+        return pendingServerCommandLoreExpiration;
+
+    }
+
+    public void setPendingServerCommandLoreExpiration(
+            long pendingServerCommandLoreExpiration
+    ) {
+
+        this.pendingServerCommandLoreExpiration =
+                pendingServerCommandLoreExpiration;
+
+    }
+
+
+    public String getPendingServerCommandMaterial() {
+
+        return pendingServerCommandMaterial;
+
+    }
+
+    public void setPendingServerCommandMaterial(
+            String pendingServerCommandMaterial
+    ) {
+
+        this.pendingServerCommandMaterial =
+                pendingServerCommandMaterial;
+
+    }
+
+    public int getPendingServerCommandMaterialPickerPage() {
+
+        return pendingServerCommandMaterialPickerPage;
+
+    }
+
+    public void setPendingServerCommandMaterialPickerPage(
+            int pendingServerCommandMaterialPickerPage
+    ) {
+
+        this.pendingServerCommandMaterialPickerPage =
+                pendingServerCommandMaterialPickerPage;
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/session/admin/ServerCommandCreationSessionManager.java

@@ -0,0 +1,46 @@
+package com.rsscripting.rswarehouse.session.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class ServerCommandCreationSessionManager {
+
+    private static final Map<UUID, ServerCommandCreationSession> sessions =
+            new HashMap<>();
+
+
+    public static void createSession(
+            UUID uuid
+    ) {
+
+        sessions.put(
+                uuid,
+                new ServerCommandCreationSession()
+        );
+
+    }
+
+
+    public static ServerCommandCreationSession getSession(
+            UUID uuid
+    ) {
+
+        return sessions.get(
+                uuid
+        );
+
+    }
+
+
+    public static void removeSession(
+            UUID uuid
+    ) {
+
+        sessions.remove(
+                uuid
+        );
+
+    }
+
+}

src/main/java/com/rsscripting/rswarehouse/session/admin/SubCategoryCreationSession.java

@@ -1,4 +1,4 @@
-package com.rsscripting.rswarehouse.admin.adminsessions;
+package com.rsscripting.rswarehouse.session.admin;
 
 public class SubCategoryCreationSession {