From 4c80a5df6637a3f227c332a5848e3b206da9b30a Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Mon, 9 Jan 2023 20:36:15 -0500 Subject: [PATCH 1/2] Small fixes -Fix relative coordinates for /bot settings region -Fix command aliases --- .../net/nuggetmc/tplus/command/CommandHandler.java | 1 + .../net/nuggetmc/tplus/command/CommandInstance.java | 10 ++++++++-- .../nuggetmc/tplus/command/commands/BotCommand.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java index a7b78f0..83838d4 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandHandler.java @@ -89,6 +89,7 @@ public class CommandHandler { CommandMethod commandMethod = new CommandMethod(methodName, Sets.newHashSet(cmd.aliases()), cmd.desc(), perm, command, method, autofiller); command.addMethod(methodName, commandMethod); + commandMethod.getAliases().forEach(alias -> command.addAlias(alias, methodName)); } } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java index 0748eb1..14a1886 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/CommandInstance.java @@ -27,6 +27,7 @@ public abstract class CommandInstance extends BukkitCommand { protected final CommandHandler commandHandler; private final Map methods; + private final Map aliasesToNames; private static final String MANAGE_PERMISSION = "terminatorplus.manage"; @@ -35,6 +36,7 @@ public abstract class CommandInstance extends BukkitCommand { this.commandHandler = handler; this.methods = new HashMap<>(); + this.aliasesToNames = new HashMap<>(); } public Map getMethods() { @@ -44,6 +46,10 @@ public abstract class CommandInstance extends BukkitCommand { protected void addMethod(String name, CommandMethod method) { methods.put(name, method); } + + protected void addAlias(String alias, String name) { + aliasesToNames.put(alias, name); + } @Override public boolean execute(@Nonnull CommandSender sender, @Nonnull String label, @Nonnull String[] args) { @@ -61,8 +67,8 @@ public abstract class CommandInstance extends BukkitCommand { if (args.length == 0) { method = methods.get(""); - } else if (methods.containsKey(args[0])) { - method = methods.get(args[0]); + } else if (methods.containsKey(aliasesToNames.getOrDefault(args[0], args[0]))) { + method = methods.get(aliasesToNames.getOrDefault(args[0], args[0])); } else { method = methods.get(""); } diff --git a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java index 4ee7060..1169ff3 100644 --- a/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java +++ b/TerminatorPlus-Plugin/src/main/java/net/nuggetmc/tplus/command/commands/BotCommand.java @@ -526,7 +526,7 @@ public class BotCommand extends CommandInstance { private double parseDoubleOrRelative(String pos, Location loc, int type) { if (loc == null || pos.length() == 0 || pos.charAt(0) != '~') return Double.parseDouble(pos); - double relative = Double.parseDouble(pos.substring(1)); + double relative = pos.length() == 1 ? 0 : Double.parseDouble(pos.substring(1)); switch (type) { case 0: return relative + Math.round(loc.getX() * 1000) / 1000D; From de49d03925b5c1943cee732417947ec1fecaab75 Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Mon, 9 Jan 2023 22:19:51 -0500 Subject: [PATCH 2/2] Fix github actions --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ce722f8..a435c20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ tasks.processResources { } tasks.jar { - from(configurations.compileClasspath.get().map { if (it.isDirectory()) it else zipTree(it) }) + from(configurations.compileClasspath.get().map { if (it.getName().endsWith(".jar")) zipTree(it) else it }) archiveFileName.set(jarName + ".jar") }