From 21cf4e1aee0cb7cc1deca86877f2b41825251c56 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 10 Sep 2021 20:03:28 +0200 Subject: [PATCH] fixed config issues, fixed sending clickable to console, added reload --- .../alttd/proxydiscordlink/DiscordLink.java | 4 +- .../commands/DiscordCommand.java | 8 +++- .../commands/subcommands/Link.java | 2 +- .../commands/subcommands/Reload.java | 48 +++++++++++++++++++ .../commands/subcommands/Unlink.java | 2 +- .../alttd/proxydiscordlink/config/Config.java | 17 ++++--- 6 files changed, 69 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Reload.java diff --git a/src/main/java/com/alttd/proxydiscordlink/DiscordLink.java b/src/main/java/com/alttd/proxydiscordlink/DiscordLink.java index 6724426..0af3440 100644 --- a/src/main/java/com/alttd/proxydiscordlink/DiscordLink.java +++ b/src/main/java/com/alttd/proxydiscordlink/DiscordLink.java @@ -45,7 +45,7 @@ public class DiscordLink { @Subscribe public void onProxyInitialization(ProxyInitializeEvent event) { ALogger.init(logger); - ReloadConfig(); + reloadConfig(); try { DatabaseConnection.initialize(); } catch (SQLException exception) { @@ -57,7 +57,7 @@ public class DiscordLink { loadCommands(); } - public void ReloadConfig() { + public void reloadConfig() { Config.init(); ALogger.info("Reloaded DiscordLink config."); } diff --git a/src/main/java/com/alttd/proxydiscordlink/commands/DiscordCommand.java b/src/main/java/com/alttd/proxydiscordlink/commands/DiscordCommand.java index e98bd6a..d86425f 100644 --- a/src/main/java/com/alttd/proxydiscordlink/commands/DiscordCommand.java +++ b/src/main/java/com/alttd/proxydiscordlink/commands/DiscordCommand.java @@ -2,11 +2,13 @@ package com.alttd.proxydiscordlink.commands; import com.alttd.proxydiscordlink.commands.subcommands.CheckLinked; import com.alttd.proxydiscordlink.commands.subcommands.Link; +import com.alttd.proxydiscordlink.commands.subcommands.Reload; import com.alttd.proxydiscordlink.commands.subcommands.Unlink; import com.alttd.proxydiscordlink.config.Config; import com.mojang.brigadier.arguments.StringArgumentType; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; +import com.velocitypowered.api.proxy.Player; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.Template; @@ -21,7 +23,7 @@ public class DiscordCommand implements SimpleCommand { private final MiniMessage miniMessage; public DiscordCommand() { - subCommands = Arrays.asList(new CheckLinked(), new Link(), new Unlink()); + subCommands = Arrays.asList(new CheckLinked(), new Link(), new Unlink(), new Reload()); miniMessage = MiniMessage.get(); } @@ -33,8 +35,10 @@ public class DiscordCommand implements SimpleCommand { if (args.length < 1) { if (!source.hasPermission("discordlink.link")) source.sendMessage(miniMessage.parse(Config.NO_PERMISSION)); - else + else if (source instanceof Player) source.sendMessage(miniMessage.parse(Config.DISCORD_LINK)); + else + source.sendMessage(miniMessage.parse(Config.NO_CONSOLE)); return; } diff --git a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Link.java b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Link.java index 641a84d..7838aef 100644 --- a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Link.java +++ b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Link.java @@ -35,7 +35,7 @@ public class Link implements SubCommand { @Override public void execute(String[] args, CommandSource source) { if (!(source instanceof Player player)) { - source.sendMessage(miniMessage.parse(Config.CONSOLE)); + source.sendMessage(miniMessage.parse(Config.NO_CONSOLE)); return; } if (!player.hasPermission(getPermission())) { diff --git a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Reload.java b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Reload.java new file mode 100644 index 0000000..5c17611 --- /dev/null +++ b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Reload.java @@ -0,0 +1,48 @@ +package com.alttd.proxydiscordlink.commands.subcommands; + +import com.alttd.proxydiscordlink.DiscordLink; +import com.alttd.proxydiscordlink.commands.SubCommand; +import com.alttd.proxydiscordlink.config.Config; +import com.velocitypowered.api.command.CommandSource; +import net.kyori.adventure.text.minimessage.MiniMessage; + +import java.util.List; + +public class Reload implements SubCommand { + + private final String name; + private final String permission; + private final MiniMessage miniMessage; + + public Reload() { + name = "reload"; + permission = "discordlink.reload"; + miniMessage = MiniMessage.get(); + } + + @Override + public String getName() { + return name; + } + + @Override + public String getPermission() { + return permission; + } + + @Override + public void execute(String[] args, CommandSource source) { + DiscordLink.getPlugin().reloadConfig(); + source.sendMessage(miniMessage.parse(Config.RELOAD_CONFIG)); + } + + @Override + public List suggest(String[] args) { + return null; + } + + @Override + public String getHelpMessage() { + return Config.HELP_RELOAD; + } +} diff --git a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Unlink.java b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Unlink.java index ef6829a..137e61c 100644 --- a/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Unlink.java +++ b/src/main/java/com/alttd/proxydiscordlink/commands/subcommands/Unlink.java @@ -35,7 +35,7 @@ public class Unlink implements SubCommand { @Override public void execute(String[] args, CommandSource source) { if (!(source instanceof Player player)) { - source.sendMessage(miniMessage.parse(Config.CONSOLE)); + source.sendMessage(miniMessage.parse(Config.NO_CONSOLE)); return; } if (!player.hasPermission(getPermission())) { diff --git a/src/main/java/com/alttd/proxydiscordlink/config/Config.java b/src/main/java/com/alttd/proxydiscordlink/config/Config.java index e66b08c..09228f2 100644 --- a/src/main/java/com/alttd/proxydiscordlink/config/Config.java +++ b/src/main/java/com/alttd/proxydiscordlink/config/Config.java @@ -195,14 +195,17 @@ public final class Config { public static String IS_LINKED = " is ."; public static String INVALID_PLAYER = " is not online or is not a valid player."; public static String NO_PERMISSION = "You do not have permission to do that."; - public static String CONSOLE = "This command can not be executed from console."; + public static String NO_CONSOLE = "This command can not be executed from console."; + public static String RELOAD_CONFIG = "Reloaded DiscordLink config."; public static String HELP_MESSAGE = "DiscordLink commands:\n"; public static String HELP_LINK = "/discord link: Get a code which can be used to link your Minecraft and Discord accounts."; public static String HELP_UNLINK = "/discord unlink: Unlink your Minecraft and Discord accounts."; public static String HELP_CHECK_LINKED = "/discord checklinked : Check if the specified user has their Minecraft and Discord accounts linked."; + public static String HELP_RELOAD = "/discord reload: Reload the config."; private static void loadMessages() { DISCORD_MESSAGE = getList("messages.discord-message", DISCORD_MESSAGE); + DISCORD_LINK = getString("messages.discord-link", DISCORD_LINK); GIVE_CODE = getString("messages.give-code", GIVE_CODE); ALREADY_LINKED_ACCOUNTS = getString("messages.already-linked-accounts", ALREADY_LINKED_ACCOUNTS); ALREADY_GOT_CODE = getString("messages.already-got-code", ALREADY_GOT_CODE); @@ -211,10 +214,12 @@ public final class Config { IS_LINKED = getString("messages.is-linked", IS_LINKED); INVALID_PLAYER = getString("messages.invalid-player", INVALID_PLAYER); NO_PERMISSION = getString("messages.no-permission", NO_PERMISSION); - CONSOLE = getString("messages.console", CONSOLE); - HELP_MESSAGE = getString("message.help-message", HELP_MESSAGE); - HELP_LINK = getString("message.help-link", HELP_LINK); - HELP_UNLINK = getString("message.help-unlink", HELP_UNLINK); - HELP_CHECK_LINKED = getString("message.help-check-linked", HELP_CHECK_LINKED); + NO_CONSOLE = getString("messages.no-console", NO_CONSOLE); + RELOAD_CONFIG = getString("messages.reload-config", RELOAD_CONFIG); + HELP_MESSAGE = getString("messages.help-message", HELP_MESSAGE); + HELP_LINK = getString("messages.help-link", HELP_LINK); + HELP_UNLINK = getString("messages.help-unlink", HELP_UNLINK); + HELP_CHECK_LINKED = getString("messages.help-check-linked", HELP_CHECK_LINKED); + HELP_RELOAD = getString("messages.help-reload", HELP_RELOAD); } }