Upstream/CommandPanels
2
0
Fork 1
mirror of https://github.com/rockyhawk64/CommandPanels.git synced 2025-11-18 07:14:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

custom command new method subcommand ability added

Browse Source
This commit is contained in:
rockyhawk64 2025-05-28 18:06:53 +10:00
parent b691e10d10
commit dc52161a57
2 changed files with 63 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/me/rockyhawk/commandpanels/commands/opencommands/BaseCommandPanel.java
View File

@ -16,47 +16,67 @@ public class BaseCommandPanel extends Command {
private final Context ctx;
private final Panel panel;
private final List<String> subcommandPatterns;
public BaseCommandPanel(Context ctx, Panel panel, String name, List<String> aliases) {
public BaseCommandPanel(Context ctx, Panel panel, String name, List<String> subcommandPatterns) {
super(name);
this.ctx = ctx;
this.panel = panel;
setAliases(aliases);
this.subcommandPatterns = subcommandPatterns;
}
@Override
public boolean execute(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] strings) {
if (!(commandSender instanceof Player)) {
commandSender.sendMessage("This command can only be used by players.");
public boolean execute(@NotNull CommandSender sender, @NotNull String label, @NotNull String[] args) {
if (!(sender instanceof Player)) {
sender.sendMessage("This command can only be used by players.");
return true;
}
Player player = (Player) sender;
Player player = (Player) commandSender;
if (strings.length == 0) {
// If no args and empty pattern allowed
if (args.length == 0 && subcommandPatterns.contains("")) {
panel.copy().open(player, PanelPosition.Top);
return true;
}
List<String> args = Arrays.asList(strings);
List<String[]> placeholders = new ArrayList<>();
String[] phEnds = ctx.placeholders.getPlaceholderEnds(panel,true);
String[] phEnds = ctx.placeholders.getPlaceholderEnds(panel, true);
for(int i = 0; i < args.size(); i++){
if(args.get(i).startsWith(phEnds[0])){
placeholders.add(new String[]{args.get(i).replace(phEnds[0],"").replace(phEnds[1],""), args.get(i+1)});
i++;
}else if(!args.get(i).equals(args.get(i+1))){
return false;
// Try to match each subcommand pattern
for (String pattern : subcommandPatterns) {
if (pattern.isEmpty() && args.length == 0) {
panel.copy().open(player, PanelPosition.Top);
return true;
}
String[] patternParts = pattern.split(" ");
if (patternParts.length != args.length) {
continue; // length mismatch
}
Panel openPanel = panel.copy();
boolean matched = true;
for (int i = 0; i < patternParts.length; i++) {
String expected = patternParts[i];
String actual = args[i];
if (expected.startsWith(phEnds[0]) && expected.endsWith(phEnds[1])) {
// Placeholder found: extract key without phEnds
String key = expected.substring(phEnds[0].length(), expected.length() - phEnds[1].length());
openPanel.placeholders.addPlaceholder(key, actual);
} else if (!expected.equalsIgnoreCase(actual)) {
matched = false;
break;
}
}
if (matched) {
openPanel.open(player, PanelPosition.Top);
return true;
}
}
Panel openPanel = panel.copy();
for(String[] placeholder : placeholders){
openPanel.placeholders.addPlaceholder(placeholder[0],placeholder[1]);
}
openPanel.open(player,PanelPosition.Top);
return true;
// No pattern matched
return false;
}
}

22
src/me/rockyhawk/commandpanels/commands/opencommands/OpenCommands.java
View File

@ -9,6 +9,7 @@ import org.bukkit.command.CommandMap;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.entity.Player;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -59,10 +60,25 @@ public class OpenCommands {
return;
}
String commandName = panelCommands.remove(0);
Command command = new BaseCommandPanel(ctx, panel, commandName, panelCommands);
// Extract the root command (first word of first command)
String firstFullCommand = panelCommands.get(0);
String commandName = firstFullCommand.split(" ")[0]; // e.g. "home"
// Forcefully replace command if it was known from another plugin
// Collect all subcommand patterns (without root)
List<String> subcommandPatterns = new ArrayList<>();
for (String cmd : panelCommands) {
String[] parts = cmd.split(" ", 2);
if (parts.length == 2) {
subcommandPatterns.add(parts[1]); // e.g. "help", "%player%"
} else {
subcommandPatterns.add(""); // no subcommand, just root
}
}
// Pass subcommandPatterns to BaseCommandPanel constructor
Command command = new BaseCommandPanel(ctx, panel, commandName, subcommandPatterns);
// Unregister old
Command existing = knownCommands.remove(commandName);
if (existing != null) {
command.unregister(commandMap);