From 07bbec22537a8977b93c01a55e0805b93751c0d8 Mon Sep 17 00:00:00 2001 From: Big Pappa Date: Fri, 28 Aug 2026 13:16:32 -0500 Subject: [PATCH] 1.1.2 Visual: - Removed empty blacked squares from filler panes. --- pom.xml | 2 +- .../mobstand/gui/AdultFilterMenu.java | 14 +----- .../mobstand/gui/BabyFilterMenu.java | 14 +----- .../mobstand/gui/ConversionMenu.java | 14 +----- .../mobstand/gui/LeaveAliveMenu.java | 21 ++------- .../rsscripting/mobstand/gui/RSAdminMenu.java | 16 +------ .../rsscripting/mobstand/gui/RadiusMenu.java | 21 ++------- .../rsscripting/mobstand/gui/StandMenu.java | 14 +----- .../mobstand/utils/RSMenuUtils.java | 43 +++++++++++++++++++ 9 files changed, 62 insertions(+), 97 deletions(-) create mode 100644 src/main/java/com/rsscripting/mobstand/utils/RSMenuUtils.java diff --git a/pom.xml b/pom.xml index 847de0d..3d34515 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.rsscripting rs-mobstand - 1.1.1 + 1.1.2 RS-MobStand diff --git a/src/main/java/com/rsscripting/mobstand/gui/AdultFilterMenu.java b/src/main/java/com/rsscripting/mobstand/gui/AdultFilterMenu.java index 2f30d6a..1a1500f 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/AdultFilterMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/AdultFilterMenu.java @@ -3,6 +3,7 @@ package com.rsscripting.mobstand.gui; import com.rsscripting.mobstand.RSMobStandPlugin; import com.rsscripting.mobstand.data.MobFilterData; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -85,18 +86,7 @@ public class AdultFilterMenu { ); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { diff --git a/src/main/java/com/rsscripting/mobstand/gui/BabyFilterMenu.java b/src/main/java/com/rsscripting/mobstand/gui/BabyFilterMenu.java index 3e52fac..9c4ad26 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/BabyFilterMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/BabyFilterMenu.java @@ -3,6 +3,7 @@ package com.rsscripting.mobstand.gui; import com.rsscripting.mobstand.RSMobStandPlugin; import com.rsscripting.mobstand.data.MobFilterData; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -85,18 +86,7 @@ public class BabyFilterMenu { ); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { diff --git a/src/main/java/com/rsscripting/mobstand/gui/ConversionMenu.java b/src/main/java/com/rsscripting/mobstand/gui/ConversionMenu.java index 652f803..a16a7e6 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/ConversionMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/ConversionMenu.java @@ -1,5 +1,6 @@ package com.rsscripting.mobstand.gui; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -29,18 +30,7 @@ public class ConversionMenu { ); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { diff --git a/src/main/java/com/rsscripting/mobstand/gui/LeaveAliveMenu.java b/src/main/java/com/rsscripting/mobstand/gui/LeaveAliveMenu.java index e18dfa7..69e0354 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/LeaveAliveMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/LeaveAliveMenu.java @@ -1,5 +1,6 @@ package com.rsscripting.mobstand.gui; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -32,18 +33,7 @@ public class LeaveAliveMenu { ); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { @@ -101,11 +91,8 @@ public class LeaveAliveMenu { inventory.setItem( 13, - createItem( - Material.GRAY_STAINED_GLASS_PANE, - " ", - List.of(), - 1 + RSMenuUtils.createFillerPane( + Material.GRAY_STAINED_GLASS_PANE ) ); diff --git a/src/main/java/com/rsscripting/mobstand/gui/RSAdminMenu.java b/src/main/java/com/rsscripting/mobstand/gui/RSAdminMenu.java index 827bca3..d029a50 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/RSAdminMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/RSAdminMenu.java @@ -1,6 +1,7 @@ package com.rsscripting.mobstand.gui; import com.rsscripting.mobstand.RSMobStandPlugin; +import com.rsscripting.mobstand.utils.RSMenuUtils; import com.rsscripting.mobstand.utils.VersionChecker; import org.bukkit.Bukkit; @@ -39,20 +40,7 @@ public class RSAdminMenu { */ ItemStack filler = - new ItemStack( - Material.WHITE_STAINED_GLASS_PANE - ); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { diff --git a/src/main/java/com/rsscripting/mobstand/gui/RadiusMenu.java b/src/main/java/com/rsscripting/mobstand/gui/RadiusMenu.java index 607919a..4ea5b92 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/RadiusMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/RadiusMenu.java @@ -1,5 +1,6 @@ package com.rsscripting.mobstand.gui; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -30,18 +31,7 @@ public class RadiusMenu { ); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { @@ -99,11 +89,8 @@ public class RadiusMenu { inventory.setItem( 13, - createItem( - Material.GRAY_STAINED_GLASS_PANE, - " ", - List.of(), - 1 + RSMenuUtils.createFillerPane( + Material.GRAY_STAINED_GLASS_PANE ) ); diff --git a/src/main/java/com/rsscripting/mobstand/gui/StandMenu.java b/src/main/java/com/rsscripting/mobstand/gui/StandMenu.java index 0565e7e..581c548 100644 --- a/src/main/java/com/rsscripting/mobstand/gui/StandMenu.java +++ b/src/main/java/com/rsscripting/mobstand/gui/StandMenu.java @@ -3,6 +3,7 @@ package com.rsscripting.mobstand.gui; import com.rsscripting.mobstand.RSMobStandPlugin; import com.rsscripting.mobstand.managers.StandManager; +import com.rsscripting.mobstand.utils.RSMenuUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -70,18 +71,7 @@ public class StandMenu { armorStand.hasArms(); ItemStack filler = - new ItemStack(Material.WHITE_STAINED_GLASS_PANE); - - ItemMeta fillerMeta = - filler.getItemMeta(); - - if (fillerMeta != null) { - - fillerMeta.setDisplayName(" "); - - filler.setItemMeta(fillerMeta); - - } + RSMenuUtils.createFillerPane(); for (int i = 0; i < inventory.getSize(); i++) { diff --git a/src/main/java/com/rsscripting/mobstand/utils/RSMenuUtils.java b/src/main/java/com/rsscripting/mobstand/utils/RSMenuUtils.java new file mode 100644 index 0000000..28fcf0c --- /dev/null +++ b/src/main/java/com/rsscripting/mobstand/utils/RSMenuUtils.java @@ -0,0 +1,43 @@ +package com.rsscripting.mobstand.utils; + +import net.kyori.adventure.text.Component; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +public final class RSMenuUtils { + + private RSMenuUtils() { + // Utility class + } + + public static ItemStack createFillerPane() { + + return createFillerPane( + Material.WHITE_STAINED_GLASS_PANE + ); + } + + public static ItemStack createFillerPane( + Material material + ) { + + ItemStack filler = + new ItemStack(material); + + ItemMeta fillerMeta = + filler.getItemMeta(); + + if (fillerMeta != null) { + + fillerMeta.setHideTooltip(true); + + filler.setItemMeta( + fillerMeta + ); + + } + + return filler; + } +} \ No newline at end of file