From 6eea38d344fe9b9415b6f746bd4cc49e0899f575 Mon Sep 17 00:00:00 2001 From: Big Pappa Date: Sun, 16 Aug 2026 02:52:13 -0500 Subject: [PATCH] 1.5.0 Added Server Rules Section. Finished. --- .../rswarehouse/item/ItemsMenu.java | 14 +++++++++ .../ServerRuleMaterialPickerMenuListener.java | 29 ++++++++++++++++--- .../admin/ServerRuleCreationSession.java | 17 +++++++++++ 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rsscripting/rswarehouse/item/ItemsMenu.java b/src/main/java/com/rsscripting/rswarehouse/item/ItemsMenu.java index 11cf3d8..27bdda0 100644 --- a/src/main/java/com/rsscripting/rswarehouse/item/ItemsMenu.java +++ b/src/main/java/com/rsscripting/rswarehouse/item/ItemsMenu.java @@ -179,11 +179,25 @@ public class ItemsMenu { if (isSubCategory) { + int loreStart = + lore.size(); + ItemsBuilder.applySubCategoryLore( warehouseItem, lore ); + if ( + warehouseItem.categoryId() == 1000 + || warehouseItem.categoryId() == 1001 + ) { + + lore.remove( + loreStart + ); + + } + } else { diff --git a/src/main/java/com/rsscripting/rswarehouse/serverrule/ServerRuleMaterialPickerMenuListener.java b/src/main/java/com/rsscripting/rswarehouse/serverrule/ServerRuleMaterialPickerMenuListener.java index 12c8857..c9be506 100644 --- a/src/main/java/com/rsscripting/rswarehouse/serverrule/ServerRuleMaterialPickerMenuListener.java +++ b/src/main/java/com/rsscripting/rswarehouse/serverrule/ServerRuleMaterialPickerMenuListener.java @@ -69,19 +69,37 @@ public class ServerRuleMaterialPickerMenuListener } + /* + * Previous page + */ + + /* + * Current material picker page. + */ + + int page = + session.getPendingServerRuleMaterialPickerPage(); + + /* * Previous page */ if (event.getSlot() == 45) { + session.setPendingServerRuleMaterialPickerPage( + Math.max( + 0, + page - 1 + ) + ); + ServerRuleMaterialPickerMenu.open( player, - 0 + session.getPendingServerRuleMaterialPickerPage() ); return; - } @@ -91,13 +109,16 @@ public class ServerRuleMaterialPickerMenuListener if (event.getSlot() == 53) { + session.setPendingServerRuleMaterialPickerPage( + page + 1 + ); + ServerRuleMaterialPickerMenu.open( player, - 1 + session.getPendingServerRuleMaterialPickerPage() ); return; - } diff --git a/src/main/java/com/rsscripting/rswarehouse/session/admin/ServerRuleCreationSession.java b/src/main/java/com/rsscripting/rswarehouse/session/admin/ServerRuleCreationSession.java index f35e2d5..b3bde5e 100644 --- a/src/main/java/com/rsscripting/rswarehouse/session/admin/ServerRuleCreationSession.java +++ b/src/main/java/com/rsscripting/rswarehouse/session/admin/ServerRuleCreationSession.java @@ -15,6 +15,8 @@ public class ServerRuleCreationSession { private String pendingServerRuleMaterial; + private int pendingServerRuleMaterialPickerPage = 0; + public String getPendingServerRuleName() { @@ -129,4 +131,19 @@ public class ServerRuleCreationSession { } + public int getPendingServerRuleMaterialPickerPage() { + + return pendingServerRuleMaterialPickerPage; + + } + + public void setPendingServerRuleMaterialPickerPage( + int pendingServerRuleMaterialPickerPage + ) { + + this.pendingServerRuleMaterialPickerPage = + pendingServerRuleMaterialPickerPage; + + } + } \ No newline at end of file