Merge pull request #46 from Blue-Millennium/functions-test

Function Update
Blue-Millennium · Feb 12, 2025 · 0708a2e · 0708a2e
2 parents 62a08f1 + 790e010
commit 0708a2e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/fun/blue_millennium/commands/CommandManager.java b/src/main/java/fun/blue_millennium/commands/CommandManager.java
@@ -1,7 +1,5 @@
 package fun.blue_millennium.commands;
 
-import fun.blue_millennium.commands.execute.othercommands.sub.report.Report;
-import fun.blue_millennium.commands.execute.othercommands.sub.report.ReportQuery;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class CommandManager {
@@ -35,9 +33,9 @@ public static void registerCommand(JavaPlugin plugin) {
         plugin.getCommand("link").setExecutor(new fun.blue_millennium.commands.execute.othercommands.sub.data.Bind());
         plugin.getCommand("link").setTabCompleter(new fun.blue_millennium.commands.tab.othercommands.sub.Link());
 
-        plugin.getCommand("query-report").setExecutor(new ReportQuery());
+        plugin.getCommand("query-report").setExecutor(new fun.blue_millennium.commands.execute.othercommands.sub.report.ReportQuery());
 
-        plugin.getCommand("report").setExecutor(new Report());
+        plugin.getCommand("report").setExecutor(new fun.blue_millennium.commands.execute.othercommands.sub.report.Report());
         plugin.getCommand("report").setTabCompleter(new fun.blue_millennium.commands.tab.othercommands.sub.Report());
 
         plugin.getCommand("rcon").setExecutor(new fun.blue_millennium.commands.execute.othercommands.sub.Rcon());

diff --git a/src/main/java/fun/blue_millennium/commands/execute/othercommands/sub/Rcon.java b/src/main/java/fun/blue_millennium/commands/execute/othercommands/sub/Rcon.java
@@ -5,7 +5,7 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import static fun.blue_millennium.rcon.RconCommandExecute.executeRconCommand;
+import static fun.blue_millennium.util.RconCommandExecute.executeRconCommand;
 
 public class Rcon implements CommandExecutor {
     @Override

diff --git a/src/main/java/fun/blue_millennium/commands/execute/vanilla/Kill.java b/src/main/java/fun/blue_millennium/commands/execute/vanilla/Kill.java
@@ -35,7 +35,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 return Bukkit.dispatchCommand(sender, "minecraft:kill @e[type=item]");
             }
             default -> {
-                return Bukkit.dispatchCommand(sender, "minecraft:kill " + String.join(" ", args));
+                return Bukkit.dispatchCommand(sender, "minecraft:kill " + String.join("", args));
             }
         }
     }

diff --git a/src/main/java/fun/blue_millennium/module/impl/RconPreCheck.java b/src/main/java/fun/blue_millennium/module/impl/RconPreCheck.java
@@ -21,7 +21,7 @@
 import static fun.blue_millennium.Main.BASE_DIR;
 import static fun.blue_millennium.Main.LOGGER;
 import static fun.blue_millennium.data.Report.ReportCharmProcess.reportCharmProcess;
-import static fun.blue_millennium.rcon.RconCommandExecute.executeRconCommand;
+import static fun.blue_millennium.util.RconCommandExecute.executeRconCommand;
 
 /**
  * @author Suisuroru

diff --git a/src/main/java/fun/blue_millennium/module/impl/SyncChat.java b/src/main/java/fun/blue_millennium/module/impl/SyncChat.java
@@ -17,9 +17,8 @@
 import java.util.List;
 
 import static fun.blue_millennium.Main.LOGGER;
-import static fun.blue_millennium.message.ImageProcess.processImageUrl;
 import static fun.blue_millennium.message.ImageProcess.sendImageUrl;
-import static fun.blue_millennium.rcon.RconCommandExecute.executeRconCommand;
+import static fun.blue_millennium.util.RconCommandExecute.executeRconCommand;
 
 public class SyncChat extends Module implements Listener {
     private Group syncGroup = null;

diff --git a/...e_millennium/rcon/RconCommandExecute.java → ...e_millennium/util/RconCommandExecute.java b/...e_millennium/rcon/RconCommandExecute.java → ...e_millennium/util/RconCommandExecute.java
@@ -1,4 +1,4 @@
-package fun.blue_millennium.rcon;
+package fun.blue_millennium.util;
 
 import org.bukkit.Bukkit;
 import org.glavo.rcon.AuthenticationException;