diff --git a/build.gradle.kts b/build.gradle.kts index 0a60891..1218b94 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,8 +36,8 @@ tasks { } dependencies { - // Galaxy - compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT") { + // Cosmos + compileOnly("com.alttd.cosmos:cosmos-api:1.21.6-R0.1-SNAPSHOT") { isChanging = true } // Lombok diff --git a/src/main/java/com/alttd/commands/CommandManager.java b/src/main/java/com/alttd/commands/CommandManager.java index 388e299..d7b06c6 100644 --- a/src/main/java/com/alttd/commands/CommandManager.java +++ b/src/main/java/com/alttd/commands/CommandManager.java @@ -6,6 +6,7 @@ import com.alttd.commands.subcommands.CommandHelp; import com.alttd.commands.subcommands.CommandReload; import com.alttd.config.Config; import com.alttd.util.Logger; +import lombok.Getter; import org.bukkit.command.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,6 +16,7 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +@Getter public class CommandManager implements CommandExecutor, TabExecutor { private final List subCommands; @@ -45,7 +47,7 @@ public class CommandManager implements CommandExecutor, TabExecutor { subCommand = getSubCommand(args[0]); if (!commandSender.hasPermission(subCommand.getPermission())) { - commandSender.sendMiniMessage(Config.NO_PERMISSION, null); + commandSender.sendRichMessage(Config.NO_PERMISSION); return true; } @@ -61,7 +63,7 @@ public class CommandManager implements CommandExecutor, TabExecutor { .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) .map(SubCommand::getName) .filter(name -> args.length == 0 || name.startsWith(args[0])) - .collect(Collectors.toList()) + .toList() ); } else { SubCommand subCommand = getSubCommand(args[0]); @@ -71,14 +73,10 @@ public class CommandManager implements CommandExecutor, TabExecutor { return res; } - public List getSubCommands() { - return subCommands; - } - private SubCommand getSubCommand(String cmdName) { return subCommands.stream() .filter(subCommand -> subCommand.getName().equals(cmdName)) .findFirst() .orElse(null); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alttd/commands/subcommands/CommandGUI.java b/src/main/java/com/alttd/commands/subcommands/CommandGUI.java index 8ae6d77..989d1b9 100644 --- a/src/main/java/com/alttd/commands/subcommands/CommandGUI.java +++ b/src/main/java/com/alttd/commands/subcommands/CommandGUI.java @@ -14,7 +14,7 @@ public class CommandGUI extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { if (!(commandSender instanceof Player player)) { - commandSender.sendMiniMessage(Config.NO_CONSOLE, null); + commandSender.sendRichMessage(Config.NO_CONSOLE); return true; } new OpenParticleGUI(player).open(player); diff --git a/src/main/java/com/alttd/commands/subcommands/CommandHelp.java b/src/main/java/com/alttd/commands/subcommands/CommandHelp.java index b44e54f..f169d42 100644 --- a/src/main/java/com/alttd/commands/subcommands/CommandHelp.java +++ b/src/main/java/com/alttd/commands/subcommands/CommandHelp.java @@ -20,11 +20,11 @@ public class CommandHelp extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { - commandSender.sendMiniMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("", commandManager + commandSender.sendRichMessage(Config.HELP_MESSAGE_WRAPPER.replaceAll("", commandManager .getSubCommands().stream() .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) .map(SubCommand::getHelpMessage) - .collect(Collectors.joining("\n"))), null); + .collect(Collectors.joining("\n")))); return true; } diff --git a/src/main/java/com/alttd/commands/subcommands/CommandReload.java b/src/main/java/com/alttd/commands/subcommands/CommandReload.java index 6d2a772..ec52a39 100644 --- a/src/main/java/com/alttd/commands/subcommands/CommandReload.java +++ b/src/main/java/com/alttd/commands/subcommands/CommandReload.java @@ -15,7 +15,7 @@ public class CommandReload extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { AltitudeParticles.getInstance().reload(); - commandSender.sendMiniMessage("Reloaded AltitudeParticles config.", null); + commandSender.sendRichMessage("Reloaded AltitudeParticles config."); return true; }