Skip to content

pass args with dm open command #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FakEEE14 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

pass args with dm open command #259

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff2d024
pass args with dm open
FakEEE14 Oct 6, 2025
4efdb62
command fix
FakEEE14 Jun 25, 2026
1c7a0c9
Update OpenCommand.java
FakEEE14 Jul 27, 2026
256471d
Update OpenCommand.java
FakEEE14 Jul 27, 2026
46e80d9
Update OpenCommand.java
FakEEE14 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 142 additions & 77 deletions src/main/java/com/extendedclip/deluxemenus/command/subcommand/OpenCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.extendedclip.deluxemenus.DeluxeMenus;
import com.extendedclip.deluxemenus.menu.Menu;
import com.extendedclip.deluxemenus.utils.DebugLevel;
import com.extendedclip.deluxemenus.utils.Messages;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
Expand All @@ -10,14 +11,19 @@
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.logging.Level;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class OpenCommand extends SubCommand {

private static final String OPEN_COMMAND = "deluxemenus.open";
private static final String ARGS_MARKER = "-args:";
private static final String PLACEHOLDER_FLAG = "-p:";

public OpenCommand(final @NotNull DeluxeMenus plugin) {
super(plugin);
Expand Down Expand Up @@ -47,52 +53,51 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List<Str
return;
}

Player viewer;
String placeholderPlayer = null;
final String menuName = arguments.get(0);

if (arguments.size() == 2 && arguments.get(1).startsWith("-p:")) {
if (!sender.hasPermission("deluxemenus.placeholdersfor")) {
plugin.sms(sender, Messages.NO_PERMISSION_PLAYER_ARGUMENT);
return;
}
String viewerName = null;
String placeholderPlayerName = null;
List<String> rawArgumentValues = null;

int index = 1;

placeholderPlayer = arguments.get(1).replace("-p:", "");
if (index < arguments.size()
&& !arguments.get(index).startsWith(PLACEHOLDER_FLAG)
&& !arguments.get(index).equals(ARGS_MARKER)) {
viewerName = arguments.get(index);
index++;
}

} else if (arguments.size() >= 3 && arguments.get(2).startsWith("-p:")) {
if (index < arguments.size() && arguments.get(index).startsWith(PLACEHOLDER_FLAG)) {
if (!sender.hasPermission("deluxemenus.placeholdersfor")) {
plugin.sms(sender, Messages.NO_PERMISSION_PLAYER_ARGUMENT);
return;
}

placeholderPlayer = arguments.get(2).replace("-p:", "");
placeholderPlayerName = arguments.get(index).substring(PLACEHOLDER_FLAG.length());
index++;
}

if (arguments.size() >= 2) {
if (placeholderPlayer == null) {
if (player && !sender.hasPermission("deluxemenus.open.others")) {
plugin.sms(sender, Messages.NO_PERMISSION);
return;
}

viewer = Bukkit.getPlayerExact(arguments.get(1));
if (index < arguments.size() && arguments.get(index).equals(ARGS_MARKER)) {
index++;
rawArgumentValues = index < arguments.size()
? arguments.subList(index, arguments.size())
: List.of();
}

} else {
if (arguments.size() >= 3) {
if (!sender.hasPermission("deluxemenus.open.others")) {
plugin.sms(sender, Messages.NO_PERMISSION);
return;
}
Player viewer;

viewer = Bukkit.getPlayerExact(arguments.get(1));
if (viewerName != null) {
if (player && !sender.hasPermission("deluxemenus.open.others")) {
plugin.sms(sender, Messages.NO_PERMISSION);
return;
}

} else {
if (!player) {
plugin.sms(sender, Messages.MUST_SPECIFY_PLAYER);
return;
}
viewer = Bukkit.getPlayerExact(viewerName);

viewer = (Player) sender;
}
if (viewer == null) {
plugin.sms(sender, Messages.PLAYER_IS_NOT_ONLINE.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(viewerName).build()));
return;
}

} else {
Expand All @@ -104,37 +109,72 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List<Str
viewer = (Player) sender;
}

if (viewer == null) {
plugin.sms(sender, Messages.PLAYER_IS_NOT_ONLINE.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(arguments.get(1)).build()));
return;
}

Player placeholder = null;

if (placeholderPlayer != null) {
placeholder = Bukkit.getPlayerExact(placeholderPlayer);
if (placeholderPlayerName != null) {
placeholder = Bukkit.getPlayerExact(placeholderPlayerName);

if (placeholder == null) {
plugin.sms(sender, Messages.PLAYER_IS_NOT_ONLINE.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(placeholderPlayer).build()));
plugin.sms(sender, Messages.PLAYER_IS_NOT_ONLINE.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(placeholderPlayerName).build()));
return;

} else {
if (placeholder.hasPermission("deluxemenus.placeholdersfor.exempt")) {
plugin.sms(sender, Messages.PLAYER_IS_EXEMPT.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(placeholderPlayer).build()));

return;
}
} else if (placeholder.hasPermission("deluxemenus.placeholdersfor.exempt")) {
plugin.sms(sender, Messages.PLAYER_IS_EXEMPT.message().replaceText(PLAYER_REPLACER_BUILDER.replacement(placeholderPlayerName).build()));
return;
}
}

Optional<Menu> menu = Menu.getMenuByName(arguments.get(0));
Optional<Menu> menu = Menu.getMenuByName(menuName);

if (menu.isEmpty()) {
plugin.sms(sender, Messages.INVALID_MENU.message().replaceText(MENU_REPLACER_BUILDER.replacement(arguments.get(0)).build()));
plugin.sms(sender, Messages.INVALID_MENU.message().replaceText(MENU_REPLACER_BUILDER.replacement(menuName).build()));
return;
}

menu.get().openMenu(viewer, null, placeholder);
final Menu menuToOpen = menu.get();
final List<String> menuArgumentNames = menuToOpen.options().arguments();

Map<String, String> argumentsMap = null;

if (menuArgumentNames.isEmpty()) {
if (rawArgumentValues != null && !rawArgumentValues.isEmpty()) {
plugin.debug(
DebugLevel.HIGHEST,
Level.WARNING,
"Arguments were given for menu " + menuName + " via /dm open, but the menu does not support arguments!"
);
}

} else if (rawArgumentValues != null && !rawArgumentValues.isEmpty()) {
if (rawArgumentValues.size() < menuArgumentNames.size()) {
plugin.debug(
DebugLevel.HIGHEST,
Level.WARNING,
"Not enough arguments given for menu " + menuName + " when opening using /dm open!"
);
plugin.sms(sender, Messages.WRONG_USAGE_OPEN_COMMAND);
return;
}

argumentsMap = new HashMap<>();

for (int argIndex = 0; argIndex < menuArgumentNames.size(); argIndex++) {
final String argumentName = menuArgumentNames.get(argIndex);

if (menuArgumentNames.size() == argIndex + 1) {
final String lastArgumentValue = String.join(
" ",
rawArgumentValues.subList(argIndex, rawArgumentValues.size())
);
argumentsMap.put(argumentName, lastArgumentValue);
break;
}

argumentsMap.put(argumentName, rawArgumentValues.get(argIndex));
}
}

menuToOpen.openMenu(viewer, argumentsMap, placeholder);
}

@Override
Expand All @@ -147,18 +187,10 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List<Str
return List.of(getName());
}

if (arguments.size() > 4) {
return null;
}

if (arguments.size() == 1) {
if (arguments.get(0).isEmpty()) {
return List.of(getName());
}

final String firstArgument = arguments.get(0).toLowerCase();

if (getName().startsWith(firstArgument)) {
if (firstArgument.isEmpty() || getName().startsWith(firstArgument)) {
return List.of(getName());
}

Expand Down Expand Up @@ -194,42 +226,75 @@ public void execute(final @NotNull CommandSender sender, final @NotNull List<Str
.map(Player::getName)
.collect(Collectors.toList());

if (arguments.size() == 3) {
final String thirdArgument = arguments.get(2).toLowerCase();
boolean viewerConsumed = false;
boolean placeholderConsumed = false;
boolean argsMarkerConsumed = false;

for (int i = 2; i < arguments.size() - 1; i++) {
final String current = arguments.get(i);

if (thirdArgument.isEmpty()) {
return Stream.concat(onlinePlayerNames.stream(), Stream.of("-p:")).collect(Collectors.toList());
if (argsMarkerConsumed) {
continue;
}

if (!thirdArgument.startsWith("-")) {
return onlinePlayerNames.stream()
.filter(playerName -> playerName.toLowerCase().startsWith(thirdArgument))
if (!viewerConsumed && !placeholderConsumed
&& !current.startsWith(PLACEHOLDER_FLAG)
&& !current.equals(ARGS_MARKER)) {
viewerConsumed = true;
} else if (!placeholderConsumed && current.startsWith(PLACEHOLDER_FLAG)) {
placeholderConsumed = true;
} else if (current.equals(ARGS_MARKER)) {
argsMarkerConsumed = true;
}
}

if (argsMarkerConsumed) {
return null;
}

final String lastArgument = arguments.get(arguments.size() - 1);
final String lastArgumentLower = lastArgument.toLowerCase();

if (!viewerConsumed && !placeholderConsumed) {
// Still in the viewer slot: suggest online players, -p:, or -args:
if (lastArgumentLower.isEmpty()) {
return Stream.concat(onlinePlayerNames.stream(), Stream.of(PLACEHOLDER_FLAG, ARGS_MARKER))
.collect(Collectors.toList());
}

if (lastArgumentLower.startsWith("-")) {
return Stream.of(PLACEHOLDER_FLAG, ARGS_MARKER)
.filter(option -> option.startsWith(lastArgumentLower))
.collect(Collectors.toList());
}

return onlinePlayerNames.stream()
.map(playerName -> "-p:" + playerName)
.filter(playerName -> playerName.toLowerCase().startsWith(thirdArgument))
.filter(playerName -> playerName.toLowerCase().startsWith(lastArgumentLower))
.collect(Collectors.toList());
}

if (arguments.size() == 4) {
final String thirdArgument = arguments.get(2).toLowerCase();
final String fourthArgument = arguments.get(3).toLowerCase();

if (!thirdArgument.startsWith("-p:")) {
return null;
if (viewerConsumed && !placeholderConsumed) {
// Viewer already given: suggest -p:<target> or -args:
if (lastArgumentLower.isEmpty()) {
return List.of(PLACEHOLDER_FLAG, ARGS_MARKER);
}

if (fourthArgument.isEmpty()) {
return onlinePlayerNames;
if (lastArgumentLower.startsWith(PLACEHOLDER_FLAG)) {
return onlinePlayerNames.stream()
.map(playerName -> PLACEHOLDER_FLAG + playerName)
.filter(option -> option.toLowerCase().startsWith(lastArgumentLower))
.collect(Collectors.toList());
}

return onlinePlayerNames.stream()
.filter(playerName -> playerName.toLowerCase().startsWith(fourthArgument))
return Stream.of(PLACEHOLDER_FLAG, ARGS_MARKER)
.filter(option -> option.startsWith(lastArgumentLower))
.collect(Collectors.toList());
}

if (lastArgumentLower.isEmpty() || ARGS_MARKER.startsWith(lastArgumentLower)) {
return List.of(ARGS_MARKER);
}

return null;
}
}
Loading