From 3aebe1318264f93965a24aac768dbb8103bd3adf Mon Sep 17 00:00:00 2001 From: FakE Date: Thu, 7 Aug 2025 03:26:06 +0330 Subject: [PATCH 1/8] add nested placeholder and enable bypasspermission --- .../deluxemenus/action/ClickActionTask.java | 8 ++++-- .../command/subcommand/ExecuteCommand.java | 2 +- .../command/subcommand/MetaCommand.java | 12 +++++--- .../deluxemenus/config/DeluxeMenusConfig.java | 4 ++- .../extendedclip/deluxemenus/menu/Menu.java | 4 ++- .../deluxemenus/menu/MenuHolder.java | 28 ++++++++++--------- .../deluxemenus/menu/options/MenuOptions.java | 22 +++++++++++++++ .../deluxemenus/utils/StringUtils.java | 25 +++++++++++++---- 8 files changed, 78 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java b/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java index d0feb75c..8089406c 100644 --- a/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java +++ b/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java @@ -36,6 +36,7 @@ public class ClickActionTask extends BukkitRunnable { private final Map arguments; private final boolean parsePlaceholdersInArguments; private final boolean parsePlaceholdersAfterArguments; + private final boolean parseNestedPlaceholders; public ClickActionTask( @NotNull final DeluxeMenus plugin, @@ -44,7 +45,8 @@ public ClickActionTask( @NotNull final String exec, @NotNull final Map arguments, final boolean parsePlaceholdersInArguments, - final boolean parsePlaceholdersAfterArguments + final boolean parsePlaceholdersAfterArguments, + final boolean parseNestedPlaceholders ) { this.plugin = plugin; this.uuid = uuid; @@ -53,6 +55,7 @@ public ClickActionTask( this.arguments = arguments; this.parsePlaceholdersInArguments = parsePlaceholdersInArguments; this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments; + this.parseNestedPlaceholders = parseNestedPlaceholders; } @Override @@ -73,7 +76,8 @@ public void run() { this.arguments, target, this.parsePlaceholdersInArguments, - this.parsePlaceholdersAfterArguments); + this.parsePlaceholdersAfterArguments, + this.parseNestedPlaceholders); switch (actionType) { case META: diff --git a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java index c1ce0da1..8201ef0c 100644 --- a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java +++ b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java @@ -84,7 +84,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List type = DataType.getSupportedTypeByName(typeName); if (type == null) { plugin.sms(sender, Messages.META_TYPE_UNSUPPORTED.message().replaceText(TYPE_REPLACER_BUILDER.replacement(typeName).build())); @@ -129,7 +132,8 @@ public void execute(@NotNull final CommandSender sender, @NotNull final List typedArgs; public MenuHolder(final @NotNull DeluxeMenus plugin, final @NotNull Player viewer) { @@ -109,7 +111,7 @@ public Optional getMenu() { return string; } - return StringUtils.replacePlaceholders(string, player); + return StringUtils.replacePlaceholders(string, player, parseNestedPlaceholders); } public @NotNull String setArguments(final @NotNull String string) { @@ -343,21 +345,21 @@ public void setTypedArgs(Map typedArgs) { this.typedArgs = typedArgs; } - public void parsePlaceholdersInArguments(final boolean parsePlaceholdersInArguments) { - this.parsePlaceholdersInArguments = parsePlaceholdersInArguments; - } + public void parsePlaceholdersInArguments(final boolean parsePlaceholdersInArguments) {this.parsePlaceholdersInArguments = parsePlaceholdersInArguments;} - public void parsePlaceholdersAfterArguments(final boolean parsePlaceholdersAfterArguments) { - this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments; - } + public void parsePlaceholdersAfterArguments(final boolean parsePlaceholdersAfterArguments) {this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments;} - public boolean parsePlaceholdersInArguments() { - return parsePlaceholdersInArguments; - } + public void parseNestedPlaceholders(final boolean parseNestedPlaceholders) {this.parseNestedPlaceholders = parseNestedPlaceholders;} - public boolean parsePlaceholdersAfterArguments() { - return parsePlaceholdersAfterArguments; - } + public void enableBypassPerm(final boolean enableBypassPerm) {this.enableBypassPerm = enableBypassPerm;} + + public boolean parsePlaceholdersInArguments() {return parsePlaceholdersInArguments;} + + public boolean parsePlaceholdersAfterArguments() {return parsePlaceholdersAfterArguments;} + + public boolean parseNestedPlaceholders() {return parseNestedPlaceholders;} + + public boolean enableBypassPerm() {return enableBypassPerm;} public void setPlaceholderPlayer(Player placeholderPlayer) { this.placeholderPlayer = placeholderPlayer; diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java index 26c5b039..ac7698e7 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java @@ -20,6 +20,8 @@ public class MenuOptions { private final boolean refresh; private final boolean parsePlaceholdersInArguments; private final boolean parsePlaceholdersAfterArguments; + private final boolean parseNestedPlaceholders; + private final boolean enableBypassPerm; private final List commands; private final boolean registerCommands; @@ -41,6 +43,8 @@ private MenuOptions(final @NotNull MenuOptionsBuilder builder) { this.refresh = builder.refresh; this.parsePlaceholdersInArguments = builder.parsePlaceholdersInArguments; this.parsePlaceholdersAfterArguments = builder.parsePlaceholdersAfterArguments; + this.parseNestedPlaceholders = builder.parseNestedPlaceholders; + this.enableBypassPerm = builder.enableBypassPerm; this.commands = builder.commands; this.registerCommands = builder.registerCommands; @@ -93,6 +97,10 @@ public boolean parsePlaceholdersAfterArguments() { return this.parsePlaceholdersAfterArguments; } + public boolean parseNestedPlaceholders() {return this.parseNestedPlaceholders;} + + public boolean enableBypassPerm() {return this.enableBypassPerm;} + public @NotNull List<@NotNull String> commands() { return this.commands; } @@ -134,6 +142,8 @@ public boolean registerCommands() { .refresh(this.refresh) .parsePlaceholdersInArguments(this.parsePlaceholdersInArguments) .parsePlaceholdersAfterArguments(this.parsePlaceholdersAfterArguments) + .parseNestedPlaceholders(this.parseNestedPlaceholders) + .enableBypassPerm(this.enableBypassPerm) .commands(this.commands) .registerCommands(this.registerCommands) .arguments(this.arguments) @@ -155,6 +165,8 @@ public static class MenuOptionsBuilder { private boolean refresh; private boolean parsePlaceholdersInArguments = false; private boolean parsePlaceholdersAfterArguments = false; + private boolean parseNestedPlaceholders = false; + private boolean enableBypassPerm = false; private List commands = List.of(); private boolean registerCommands = false; @@ -216,6 +228,16 @@ public MenuOptionsBuilder parsePlaceholdersAfterArguments(final boolean parsePla return this; } + public MenuOptionsBuilder parseNestedPlaceholders(final boolean parseNestedPlaceholders) { + this.parseNestedPlaceholders = parseNestedPlaceholders; + return this; + } + + public MenuOptionsBuilder enableBypassPerm(final boolean enableBypassPerm) { + this.enableBypassPerm = enableBypassPerm; + return this; + } + public MenuOptionsBuilder commands(final @NotNull List<@NotNull String> commands) { this.commands = commands; return this; diff --git a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java index 6ae95804..3bc1d4e7 100644 --- a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java +++ b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java @@ -41,20 +41,35 @@ public static String color(@NotNull String input) { public static String replacePlaceholdersAndArguments(@NotNull String input, final @Nullable Map arguments, final @Nullable Player player, final boolean parsePlaceholdersInsideArguments, - final boolean parsePlaceholdersAfterArguments) { + final boolean parsePlaceholdersAfterArguments, + final boolean parseNestedPlaceholders) { if (player == null) { return replaceArguments(input, arguments, null, parsePlaceholdersInsideArguments); } if (parsePlaceholdersAfterArguments) { - return replacePlaceholders(replaceArguments(input, arguments, player, parsePlaceholdersInsideArguments), player); + return replacePlaceholders(replaceArguments(input, arguments, player, parsePlaceholdersInsideArguments), player, parseNestedPlaceholders); } - return replaceArguments(replacePlaceholders(input, player), arguments, player, parsePlaceholdersInsideArguments); + return replaceArguments(replacePlaceholders(input, player, parseNestedPlaceholders), arguments, player, parsePlaceholdersInsideArguments); } @NotNull - public static String replacePlaceholders(final @NotNull String input, final @NotNull Player player) { + public static String replacePlaceholders(@NotNull String input, final @NotNull Player player , boolean parseNestedPlaceholders) { + if (!parseNestedPlaceholders){ + return PlaceholderAPI.setPlaceholders(player, input); + } + while (input.contains("{") && input.contains("}")) { + int startIndex = input.lastIndexOf("{"); + int endIndex = input.indexOf("}", startIndex); + if (startIndex != -1 && endIndex != -1) { + String placeholderName = input.substring(startIndex + 1, endIndex); + String placeholderValue = PlaceholderAPI.setPlaceholders(player, "%" + placeholderName + "%"); + input = ("%"+placeholderName+"%").equals(placeholderValue) ? input.substring(0, startIndex) + placeholderName + input.substring(endIndex + 1) : input.substring(0, startIndex) + placeholderValue + input.substring(endIndex + 1); + } else { + break; + } + } return PlaceholderAPI.setPlaceholders(player, input); } @@ -67,7 +82,7 @@ public static String replaceArguments(@NotNull String input, final @Nullable Map for (final Map.Entry entry : arguments.entrySet()) { final String value = player != null && parsePlaceholdersInsideArguments - ? replacePlaceholders(entry.getValue(), player) + ? replacePlaceholders(entry.getValue(), player, false) : entry.getValue(); input = input.replace("{" + entry.getKey() + "}", value); } From 0b36fbbf005ee19f078d4d05319e6eb6ef6c7e1f Mon Sep 17 00:00:00 2001 From: FakE Date: Thu, 7 Aug 2025 03:28:15 +0330 Subject: [PATCH 2/8] add permission to meta command --- .../deluxemenus/command/subcommand/MetaCommand.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/MetaCommand.java b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/MetaCommand.java index 73d453cf..7e79b9b3 100644 --- a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/MetaCommand.java +++ b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/MetaCommand.java @@ -33,6 +33,7 @@ public class MetaCommand extends SubCommand { private static final List SUB_COMMANDS = List.of("list", "show", "set", "remove", "add", "subtract", "switch"); + private static final String META_COMMAND = "deluxemenus.meta"; public MetaCommand(@NotNull final DeluxeMenus plugin) { super(plugin); @@ -45,7 +46,7 @@ public MetaCommand(@NotNull final DeluxeMenus plugin) { @Override public void execute(@NotNull final CommandSender sender, @NotNull final List arguments) { - if (!sender.isOp()) { + if (!sender.hasPermission(META_COMMAND)) { plugin.sms(sender, Messages.NO_PERMISSION); return; } @@ -155,7 +156,7 @@ public void execute(@NotNull final CommandSender sender, @NotNull final List onTabComplete(@NotNull final CommandSender sender, @NotNull final List arguments) { - if (!sender.isOp() || !VersionHelper.IS_PDC_VERSION || plugin.getPersistentMetaHandler() == null) { + if (!sender.hasPermission(META_COMMAND) || !VersionHelper.IS_PDC_VERSION || plugin.getPersistentMetaHandler() == null) { return null; } From 21a25308ab477686fc3f217d13d1b1a5569dbaab Mon Sep 17 00:00:00 2001 From: FakE Date: Fri, 8 Aug 2025 02:16:36 +0330 Subject: [PATCH 3/8] no nested parsing --- .../deluxemenus/action/ClickActionTask.java | 8 ++---- .../command/subcommand/ExecuteCommand.java | 2 +- .../command/subcommand/MetaCommand.java | 12 +++------ .../deluxemenus/config/DeluxeMenusConfig.java | 3 +-- .../extendedclip/deluxemenus/menu/Menu.java | 1 - .../deluxemenus/menu/MenuHolder.java | 7 +----- .../deluxemenus/menu/options/MenuOptions.java | 11 -------- .../deluxemenus/utils/StringUtils.java | 25 ++++--------------- 8 files changed, 14 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java b/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java index 8089406c..d0feb75c 100644 --- a/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java +++ b/src/main/java/com/extendedclip/deluxemenus/action/ClickActionTask.java @@ -36,7 +36,6 @@ public class ClickActionTask extends BukkitRunnable { private final Map arguments; private final boolean parsePlaceholdersInArguments; private final boolean parsePlaceholdersAfterArguments; - private final boolean parseNestedPlaceholders; public ClickActionTask( @NotNull final DeluxeMenus plugin, @@ -45,8 +44,7 @@ public ClickActionTask( @NotNull final String exec, @NotNull final Map arguments, final boolean parsePlaceholdersInArguments, - final boolean parsePlaceholdersAfterArguments, - final boolean parseNestedPlaceholders + final boolean parsePlaceholdersAfterArguments ) { this.plugin = plugin; this.uuid = uuid; @@ -55,7 +53,6 @@ public ClickActionTask( this.arguments = arguments; this.parsePlaceholdersInArguments = parsePlaceholdersInArguments; this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments; - this.parseNestedPlaceholders = parseNestedPlaceholders; } @Override @@ -76,8 +73,7 @@ public void run() { this.arguments, target, this.parsePlaceholdersInArguments, - this.parsePlaceholdersAfterArguments, - this.parseNestedPlaceholders); + this.parsePlaceholdersAfterArguments); switch (actionType) { case META: diff --git a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java index 8201ef0c..c1ce0da1 100644 --- a/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java +++ b/src/main/java/com/extendedclip/deluxemenus/command/subcommand/ExecuteCommand.java @@ -84,7 +84,7 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List type = DataType.getSupportedTypeByName(typeName); if (type == null) { plugin.sms(sender, Messages.META_TYPE_UNSUPPORTED.message().replaceText(TYPE_REPLACER_BUILDER.replacement(typeName).build())); @@ -133,8 +130,7 @@ public void execute(@NotNull final CommandSender sender, @NotNull final List typedArgs; @@ -111,7 +110,7 @@ public Optional getMenu() { return string; } - return StringUtils.replacePlaceholders(string, player, parseNestedPlaceholders); + return StringUtils.replacePlaceholders(string, player); } public @NotNull String setArguments(final @NotNull String string) { @@ -349,16 +348,12 @@ public void setTypedArgs(Map typedArgs) { public void parsePlaceholdersAfterArguments(final boolean parsePlaceholdersAfterArguments) {this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments;} - public void parseNestedPlaceholders(final boolean parseNestedPlaceholders) {this.parseNestedPlaceholders = parseNestedPlaceholders;} - public void enableBypassPerm(final boolean enableBypassPerm) {this.enableBypassPerm = enableBypassPerm;} public boolean parsePlaceholdersInArguments() {return parsePlaceholdersInArguments;} public boolean parsePlaceholdersAfterArguments() {return parsePlaceholdersAfterArguments;} - public boolean parseNestedPlaceholders() {return parseNestedPlaceholders;} - public boolean enableBypassPerm() {return enableBypassPerm;} public void setPlaceholderPlayer(Player placeholderPlayer) { diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java index ac7698e7..91ae3d98 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java @@ -20,7 +20,6 @@ public class MenuOptions { private final boolean refresh; private final boolean parsePlaceholdersInArguments; private final boolean parsePlaceholdersAfterArguments; - private final boolean parseNestedPlaceholders; private final boolean enableBypassPerm; private final List commands; @@ -43,7 +42,6 @@ private MenuOptions(final @NotNull MenuOptionsBuilder builder) { this.refresh = builder.refresh; this.parsePlaceholdersInArguments = builder.parsePlaceholdersInArguments; this.parsePlaceholdersAfterArguments = builder.parsePlaceholdersAfterArguments; - this.parseNestedPlaceholders = builder.parseNestedPlaceholders; this.enableBypassPerm = builder.enableBypassPerm; this.commands = builder.commands; @@ -97,8 +95,6 @@ public boolean parsePlaceholdersAfterArguments() { return this.parsePlaceholdersAfterArguments; } - public boolean parseNestedPlaceholders() {return this.parseNestedPlaceholders;} - public boolean enableBypassPerm() {return this.enableBypassPerm;} public @NotNull List<@NotNull String> commands() { @@ -142,7 +138,6 @@ public boolean registerCommands() { .refresh(this.refresh) .parsePlaceholdersInArguments(this.parsePlaceholdersInArguments) .parsePlaceholdersAfterArguments(this.parsePlaceholdersAfterArguments) - .parseNestedPlaceholders(this.parseNestedPlaceholders) .enableBypassPerm(this.enableBypassPerm) .commands(this.commands) .registerCommands(this.registerCommands) @@ -165,7 +160,6 @@ public static class MenuOptionsBuilder { private boolean refresh; private boolean parsePlaceholdersInArguments = false; private boolean parsePlaceholdersAfterArguments = false; - private boolean parseNestedPlaceholders = false; private boolean enableBypassPerm = false; private List commands = List.of(); @@ -228,11 +222,6 @@ public MenuOptionsBuilder parsePlaceholdersAfterArguments(final boolean parsePla return this; } - public MenuOptionsBuilder parseNestedPlaceholders(final boolean parseNestedPlaceholders) { - this.parseNestedPlaceholders = parseNestedPlaceholders; - return this; - } - public MenuOptionsBuilder enableBypassPerm(final boolean enableBypassPerm) { this.enableBypassPerm = enableBypassPerm; return this; diff --git a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java index 3bc1d4e7..84d0907e 100644 --- a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java +++ b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java @@ -41,35 +41,20 @@ public static String color(@NotNull String input) { public static String replacePlaceholdersAndArguments(@NotNull String input, final @Nullable Map arguments, final @Nullable Player player, final boolean parsePlaceholdersInsideArguments, - final boolean parsePlaceholdersAfterArguments, - final boolean parseNestedPlaceholders) { + final boolean parsePlaceholdersAfterArguments) { if (player == null) { return replaceArguments(input, arguments, null, parsePlaceholdersInsideArguments); } if (parsePlaceholdersAfterArguments) { - return replacePlaceholders(replaceArguments(input, arguments, player, parsePlaceholdersInsideArguments), player, parseNestedPlaceholders); + return replacePlaceholders(replaceArguments(input, arguments, player, parsePlaceholdersInsideArguments), player); } - return replaceArguments(replacePlaceholders(input, player, parseNestedPlaceholders), arguments, player, parsePlaceholdersInsideArguments); + return replaceArguments(replacePlaceholders(input, player), arguments, player, parsePlaceholdersInsideArguments); } @NotNull - public static String replacePlaceholders(@NotNull String input, final @NotNull Player player , boolean parseNestedPlaceholders) { - if (!parseNestedPlaceholders){ - return PlaceholderAPI.setPlaceholders(player, input); - } - while (input.contains("{") && input.contains("}")) { - int startIndex = input.lastIndexOf("{"); - int endIndex = input.indexOf("}", startIndex); - if (startIndex != -1 && endIndex != -1) { - String placeholderName = input.substring(startIndex + 1, endIndex); - String placeholderValue = PlaceholderAPI.setPlaceholders(player, "%" + placeholderName + "%"); - input = ("%"+placeholderName+"%").equals(placeholderValue) ? input.substring(0, startIndex) + placeholderName + input.substring(endIndex + 1) : input.substring(0, startIndex) + placeholderValue + input.substring(endIndex + 1); - } else { - break; - } - } + public static String replacePlaceholders(@NotNull String input, final @NotNull Player player) { return PlaceholderAPI.setPlaceholders(player, input); } @@ -82,7 +67,7 @@ public static String replaceArguments(@NotNull String input, final @Nullable Map for (final Map.Entry entry : arguments.entrySet()) { final String value = player != null && parsePlaceholdersInsideArguments - ? replacePlaceholders(entry.getValue(), player, false) + ? replacePlaceholders(entry.getValue(), player) : entry.getValue(); input = input.replace("{" + entry.getKey() + "}", value); } From 464266f46ebfc7799251b051e0fa4e24fe4072ea Mon Sep 17 00:00:00 2001 From: FakE Date: Fri, 8 Aug 2025 02:20:56 +0330 Subject: [PATCH 4/8] missed this --- .../java/com/extendedclip/deluxemenus/utils/StringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java index 84d0907e..6ae95804 100644 --- a/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java +++ b/src/main/java/com/extendedclip/deluxemenus/utils/StringUtils.java @@ -54,7 +54,7 @@ public static String replacePlaceholdersAndArguments(@NotNull String input, fina } @NotNull - public static String replacePlaceholders(@NotNull String input, final @NotNull Player player) { + public static String replacePlaceholders(final @NotNull String input, final @NotNull Player player) { return PlaceholderAPI.setPlaceholders(player, input); } From 1fa0573a28b3513431d8e9259d2eb87d2683ed8d Mon Sep 17 00:00:00 2001 From: FakE Date: Fri, 8 Aug 2025 20:25:30 +0330 Subject: [PATCH 5/8] not used, not needed --- .../deluxemenus/menu/MenuHolder.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java b/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java index 3f08406b..a4fa8c10 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java @@ -35,7 +35,6 @@ public class MenuHolder implements InventoryHolder { private boolean updating; private boolean parsePlaceholdersInArguments; private boolean parsePlaceholdersAfterArguments; - private boolean enableBypassPerm; private Map typedArgs; public MenuHolder(final @NotNull DeluxeMenus plugin, final @NotNull Player viewer) { @@ -344,17 +343,21 @@ public void setTypedArgs(Map typedArgs) { this.typedArgs = typedArgs; } - public void parsePlaceholdersInArguments(final boolean parsePlaceholdersInArguments) {this.parsePlaceholdersInArguments = parsePlaceholdersInArguments;} - - public void parsePlaceholdersAfterArguments(final boolean parsePlaceholdersAfterArguments) {this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments;} - - public void enableBypassPerm(final boolean enableBypassPerm) {this.enableBypassPerm = enableBypassPerm;} + public void parsePlaceholdersInArguments(final boolean parsePlaceholdersInArguments) { + this.parsePlaceholdersInArguments = parsePlaceholdersInArguments; + } - public boolean parsePlaceholdersInArguments() {return parsePlaceholdersInArguments;} + public void parsePlaceholdersAfterArguments(final boolean parsePlaceholdersAfterArguments) { + this.parsePlaceholdersAfterArguments = parsePlaceholdersAfterArguments; + } - public boolean parsePlaceholdersAfterArguments() {return parsePlaceholdersAfterArguments;} + public boolean parsePlaceholdersInArguments() { + return parsePlaceholdersInArguments; + } - public boolean enableBypassPerm() {return enableBypassPerm;} + public boolean parsePlaceholdersAfterArguments() { + return parsePlaceholdersAfterArguments; + } public void setPlaceholderPlayer(Player placeholderPlayer) { this.placeholderPlayer = placeholderPlayer; @@ -367,4 +370,4 @@ public Player getPlaceholderPlayer() { public @NotNull DeluxeMenus getPlugin() { return plugin; } -} +} \ No newline at end of file From 9329546f72a6430c69b13376f84a4647861ce937 Mon Sep 17 00:00:00 2001 From: FakE Date: Fri, 8 Aug 2025 20:31:17 +0330 Subject: [PATCH 6/8] not used, not needed --- src/main/java/com/extendedclip/deluxemenus/menu/Menu.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/Menu.java b/src/main/java/com/extendedclip/deluxemenus/menu/Menu.java index 1cecd783..615bedf7 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/Menu.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/Menu.java @@ -285,7 +285,6 @@ public void openMenu(final @NotNull Player viewer, final @Nullable Map Date: Fri, 8 Aug 2025 20:37:17 +0330 Subject: [PATCH 7/8] Update MenuHolder.java --- src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java b/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java index a4fa8c10..adc23192 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/MenuHolder.java @@ -370,4 +370,4 @@ public Player getPlaceholderPlayer() { public @NotNull DeluxeMenus getPlugin() { return plugin; } -} \ No newline at end of file +} From f29ed7d3a5c3dd939f4dc1dbb49338866ee86d95 Mon Sep 17 00:00:00 2001 From: FakEEE14 <68513641+FakEEE14@users.noreply.github.com> Date: Fri, 8 Aug 2025 20:38:14 +0330 Subject: [PATCH 8/8] Update MenuOptions.java --- .../extendedclip/deluxemenus/menu/options/MenuOptions.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java index 91ae3d98..c5c4df0a 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuOptions.java @@ -95,7 +95,9 @@ public boolean parsePlaceholdersAfterArguments() { return this.parsePlaceholdersAfterArguments; } - public boolean enableBypassPerm() {return this.enableBypassPerm;} + public boolean enableBypassPerm() { + return this.enableBypassPerm; + } public @NotNull List<@NotNull String> commands() { return this.commands;