Introduce command trees; improve Commandessentials#5384

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

Closed
mdcfe wants to merge 10 commits into from
Closed

Introduce command trees; improve Commandessentials #5384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c63220e
Implement rough command node parser
mdcfe Jun 6, 2023
b8e33d9
More sensible types
mdcfe Jun 6, 2023
c18f54b
Implement aliases, child validation and tree build tests
mdcfe Jun 6, 2023
a4ef47b
Start to reimplement /essentials
mdcfe Jun 6, 2023
a94f29d
First attempt at tab completing literals
mdcfe Jun 6, 2023
c7a271b
Throw more specific arguments
mdcfe Jun 6, 2023
6d9b04f
Add "legacy" wrapper
mdcfe Jun 7, 2023
5697392
Use tree for all /ess subcommands
mdcfe Jun 7, 2023
03c7e12
Fix tests and checkstyle
mdcfe Jun 7, 2023
b3f71dd
Merge branch '2.x' into feature/improve-ess-command
JRoy Jul 20, 2025
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
199 changes: 85 additions & 114 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
);
private transient TuneRunnable currentTune = null;

private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
// Info commands
root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
root.literal("dump", ctx -> ctx.execute(this::runDump));

// Config commands
root.literal("reload", ctx -> ctx.execute(this::runReload));
root.literal("locale", locale -> {
// TODO
locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
}, "lang");

// Data commands
root.literal("reset", ctx -> ctx.execute(this::runReset));
root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
root.literal("homes", ctx -> ctx.execute(this::runHomes));
root.literal("usermap", usermap -> {
// TODO: split these out from #runUsermap
usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
});

// Internal debugging and #EasterEgg
root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
// TODO: hide from tab-complete
root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

// TODO: missing tab completions
/*
switch (args[0]) {
case "moo":
if (args.length == 2) {
return Lists.newArrayList("moo");
}
break;
case "reset":
if (args.length == 2) {
return getPlayers(server, sender);
}
break;
case "cleanup":
if (args.length == 2) {
return COMMON_DURATIONS;
} else if (args.length == 3 || args.length == 4) {
return Lists.newArrayList("-1", "0");
}
break;
case "homes":
if (args.length == 2) {
return Lists.newArrayList("fix", "delete");
} else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
}
break;
case "dump":
final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
for (String arg : args) {
if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
list.clear();
return list;
}
list.remove(arg.toLowerCase(Locale.ENGLISH));
}
return list;
}

return Collections.emptyList();

*/
});

public Commandessentials() {
super("essentials");
}

@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
if (args.length == 0) {
showUsage(sender);
}

switch (args[0]) {
// Info commands
case "debug":
case "verbose":
runDebug(server, sender, commandLabel, args);
break;
case "ver":
case "version":
runVersion(server, sender, commandLabel, args);
break;
case "cmd":
case "commands":
runCommands(server, sender, commandLabel, args);
break;
case "dump":
runDump(server, sender, commandLabel, args);
break;

// Data commands
case "reload":
runReload(server, sender, commandLabel, args);
break;
case "reset":
runReset(server, sender, commandLabel, args);
break;
case "cleanup":
runCleanup(server, sender, commandLabel, args);
break;
case "homes":
runHomes(server, sender, commandLabel, args);
break;
case "usermap":
runUserMap(sender, args);
break;

case "itemtest":
runItemTest(server, sender, commandLabel, args);
break;

// "#EasterEgg"
case "nya":
case "nyan":
runNya(server, sender, commandLabel, args);
break;
case "moo":
runMoo(server, sender, commandLabel, args);
break;
default:
showUsage(sender);
break;
}
tree.run(server, sender, commandLabel, args);
}

public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
return;
}
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
}

// Displays the command's usage.
// todo: remove
private void showUsage(final CommandSource sender) throws Exception {
throw new NotEnoughArgumentsException();
}
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
}

// Toggles debug mode.
private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
ess.getSettings().setDebug(!ess.getSettings().isDebug());
sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
}

// Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1) {
final List<String> options = Lists.newArrayList();
options.add("reload");
options.add("version");
options.add("dump");
options.add("commands");
options.add("debug");
options.add("reset");
options.add("cleanup");
options.add("homes");
//options.add("uuidconvert");
//options.add("nya");
//options.add("moo");
return options;
}

switch (args[0]) {
case "moo":
if (args.length == 2) {
return Lists.newArrayList("moo");
}
break;
case "reset":
if (args.length == 2) {
return getPlayers(server, sender);
}
break;
case "cleanup":
if (args.length == 2) {
return COMMON_DURATIONS;
} else if (args.length == 3 || args.length == 4) {
return Lists.newArrayList("-1", "0");
}
break;
case "homes":
if (args.length == 2) {
return Lists.newArrayList("fix", "delete");
} else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
}
break;
case "dump":
final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
for (String arg : args) {
if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
list.clear();
return list;
}
list.remove(arg.toLowerCase(Locale.ENGLISH));
}
return list;
try {
return tree.tabComplete(server, sender, commandLabel, args);
} catch (Exception e) {
// TODO: ???
throw new RuntimeException(e);
}

return Collections.emptyList();
}

private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Introduce command trees; improve Commandessentials#5384

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

 Closed

mdcfe
wants to merge
10
commits into

from

 Closed


Introduce command trees; improve Commandessentials
#5384
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
c63220e

Implement rough command node parser


mdcfe Jun 6, 2023
b8e33d9

More sensible types


mdcfe Jun 6, 2023
c18f54b

Implement aliases, child validation and tree build tests


mdcfe Jun 6, 2023
a4ef47b

Start to reimplement /essentials


mdcfe Jun 6, 2023
a94f29d

First attempt at tab completing literals


mdcfe Jun 6, 2023
c7a271b

Throw more specific arguments


mdcfe Jun 6, 2023
6d9b04f

Add "legacy" wrapper


mdcfe Jun 7, 2023
5697392

Use tree for all /ess subcommands


mdcfe Jun 7, 2023
03c7e12

Fix tests and checkstyle


mdcfe Jun 7, 2023
b3f71dd

Merge branch '2.x' into feature/improve-ess-command


JRoy Jul 20, 2025

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


199 changes: 85 additions & 114 deletions
Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
import com.earth2me.essentials.utils.RegistryUtil;
import com.earth2me.essentials.utils.VersionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.JsonArray;
import com.google.gson.JsonNull;
import com.google.gson.JsonObject;
Expand All@@ -31,7 +30,6 @@
import org.bukkit.Material;
import org.bukkit.Server;
import org.bukkit.Sound;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
Expand DownExpand Up@@ -62,7 +60,6 @@
import java.util.concurrent.CompletableFuture;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.stream.Collectors;

import static com.earth2me.essentials.I18n.tlLiteral;

Expand DownExpand Up@@ -118,70 +115,91 @@ public class Commandessentials extends EssentialsCommand {
 );
 private transient TuneRunnable currentTune = null;

 private final EssentialsCommandNode.Root<CommandSource> tree = EssentialsCommandNode.root(root -> {
 // Info commands
 root.literal("debug", ctx -> ctx.execute(this::runDebug), "verbose");
 root.literal("version", ctx -> ctx.execute(this::runVersion), "ver");
 root.literal("commands", ctx -> ctx.execute(this::runCommands), "cmd");
 root.literal("dump", ctx -> ctx.execute(this::runDump));

 // Config commands
 root.literal("reload", ctx -> ctx.execute(this::runReload));
 root.literal("locale", locale -> {
 // TODO
 locale.execute(ctx -> ctx.sender().sendMessage("Not yet implemented"), Arrays.asList("create", "export", "getraw"));
 }, "lang");

 // Data commands
 root.literal("reset", ctx -> ctx.execute(this::runReset));
 root.literal("cleanup", ctx -> ctx.execute(this::runCleanup));
 root.literal("homes", ctx -> ctx.execute(this::runHomes));
 root.literal("usermap", usermap -> {
 // TODO: split these out from #runUsermap
 usermap.literal("full", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("purge", ctx -> ctx.execute(TODO -> {}));
 usermap.literal("lookup", ctx -> ctx.execute(TODO -> {}));
 });

 // Internal debugging and #EasterEgg
 root.literal("itemtest", ctx -> ctx.execute(this::runItemTest));
 // TODO: hide from tab-complete
 root.literal("moo", ctx -> ctx.execute(this::runMoo)); // todo: moo moo
 root.literal("nyan", ctx -> ctx.execute(this::runNya), "nya");

 // TODO: missing tab completions
 /*
 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 }

 return Collections.emptyList();

 */
 });

 public Commandessentials() {
 super("essentials");
 }

 @Override
 public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 if (args.length == 0) {
 showUsage(sender);
 }

 switch (args[0]) {
 // Info commands
 case "debug":
 case "verbose":
 runDebug(server, sender, commandLabel, args);
 break;
 case "ver":
 case "version":
 runVersion(server, sender, commandLabel, args);
 break;
 case "cmd":
 case "commands":
 runCommands(server, sender, commandLabel, args);
 break;
 case "dump":
 runDump(server, sender, commandLabel, args);
 break;

 // Data commands
 case "reload":
 runReload(server, sender, commandLabel, args);
 break;
 case "reset":
 runReset(server, sender, commandLabel, args);
 break;
 case "cleanup":
 runCleanup(server, sender, commandLabel, args);
 break;
 case "homes":
 runHomes(server, sender, commandLabel, args);
 break;
 case "usermap":
 runUserMap(sender, args);
 break;

 case "itemtest":
 runItemTest(server, sender, commandLabel, args);
 break;

 // "#EasterEgg"
 case "nya":
 case "nyan":
 runNya(server, sender, commandLabel, args);
 break;
 case "moo":
 runMoo(server, sender, commandLabel, args);
 break;
 default:
 showUsage(sender);
 break;
 }
 tree.run(server, sender, commandLabel, args);
 }

 public void runItemTest(Server server, CommandSource sender, String commandLabel, String[] args) {
 public void runItemTest(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (!sender.isAuthorized("essentials.itemtest") || args.length < 2 || !sender.isPlayer()) {
 return;
 }
Expand DownExpand Up@@ -232,6 +250,7 @@ public void runItemTest(Server server, CommandSource sender, String commandLabel
 }

 // Displays the command's usage.
 // todo: remove
 private void showUsage(final CommandSource sender) throws Exception {
 throw new NotEnoughArgumentsException();
 }
Expand DownExpand Up@@ -491,9 +510,9 @@ private void runReset(final Server server, final CommandSource sender, final Str
 }

 // Toggles debug mode.
 private void runDebug(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
 private void runDebug(final EssentialsCommandNode.WalkContext<CommandSource> context) {
 ess.getSettings().setDebug(!ess.getSettings().isDebug());
 sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
context.sender().sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
 }

 // Reloads all reloadable configs.
Expand DownExpand Up@@ -848,60 +867,12 @@ private void runVersion(final Server server, final CommandSource sender, final S

 @Override
 protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
 if (args.length == 1) {
 final List<String> options = Lists.newArrayList();
 options.add("reload");
 options.add("version");
 options.add("dump");
 options.add("commands");
 options.add("debug");
 options.add("reset");
 options.add("cleanup");
 options.add("homes");
 //options.add("uuidconvert");
 //options.add("nya");
 //options.add("moo");
 return options;
 }

 switch (args[0]) {
 case "moo":
 if (args.length == 2) {
 return Lists.newArrayList("moo");
 }
 break;
 case "reset":
 if (args.length == 2) {
 return getPlayers(server, sender);
 }
 break;
 case "cleanup":
 if (args.length == 2) {
 return COMMON_DURATIONS;
 } else if (args.length == 3 || args.length == 4) {
 return Lists.newArrayList("-1", "0");
 }
 break;
 case "homes":
 if (args.length == 2) {
 return Lists.newArrayList("fix", "delete");
 } else if (args.length == 3 && args[1].equalsIgnoreCase("delete")) {
 return server.getWorlds().stream().map(World::getName).collect(Collectors.toList());
 }
 break;
 case "dump":
 final List<String> list = Lists.newArrayList("config", "kits", "log", "discord", "worth", "tpr", "spawns", "commands", "all");
 for (String arg : args) {
 if (arg.equals("*") || arg.equalsIgnoreCase("all")) {
 list.clear();
 return list;
 }
 list.remove(arg.toLowerCase(Locale.ENGLISH));
 }
 return list;
 try {
 return tree.tabComplete(server, sender, commandLabel, args);
 } catch (Exception e) {
 // TODO: ???
 throw new RuntimeException(e);
 }

 return Collections.emptyList();
 }

 private static class TuneRunnable extends BukkitRunnable {
Expand Down
Loading