From 3fb5dbb15fd852786c98a1f79821f0c7318a830d Mon Sep 17 00:00:00 2001 From: qvazzar Date: Thu, 18 Jul 2024 04:24:08 +0300 Subject: [PATCH 1/4] Reload command --- .../java/me/Navoei/customdiscsplugin/CustomDiscs.java | 8 ++++++++ .../java/me/Navoei/customdiscsplugin/language/Lang.java | 3 ++- src/main/resources/lang.yml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java index 5ad7ec8..583a2c6 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java +++ b/src/main/java/me/Navoei/customdiscsplugin/CustomDiscs.java @@ -99,6 +99,14 @@ public void onDisable() { } } + /** + * Perform a reload of the plugin + */ + public void reload() { + onDisable(); + onEnable(); + } + public static CustomDiscs getInstance() { return instance; } diff --git a/src/main/java/me/Navoei/customdiscsplugin/language/Lang.java b/src/main/java/me/Navoei/customdiscsplugin/language/Lang.java index 69512d1..59d70cf 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/language/Lang.java +++ b/src/main/java/me/Navoei/customdiscsplugin/language/Lang.java @@ -19,7 +19,8 @@ public enum Lang { SUCCESSFUL_DOWNLOAD("successful-download", "&aFile successfully downloaded to &7%file_path%&a."), CREATE_DISC("create-disc", "&aCreate a disc by doing &7/cd create filename.extension \"Custom Lore\"&a."), DOWNLOAD_ERROR("download-error", "&rAn error has occurred while downloading."), - NOW_PLAYING("now-playing","&6Now playing: %song_name%"); + NOW_PLAYING("now-playing","&6Now playing: %song_name%"), + RELOAD("reload", "&aReloading complete!"); private final String path; private final String def; diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index e71e1a7..e2d459b 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -14,3 +14,4 @@ successful-download: "&aFile successfully downloaded to &7%file_path%&a." create-disc: "&aCreate a disc by doing &7/cd create %filename% \"Custom Lore\"&a." download-error: "&cAn error has occurred while downloading." now-playing: "&6Now playing: %song_name%" +reload: "&aReloading complete!" \ No newline at end of file From 07425d895f8f1a5d76db00cb56889917780a16b4 Mon Sep 17 00:00:00 2001 From: qvazzar Date: Thu, 18 Jul 2024 04:25:23 +0300 Subject: [PATCH 2/4] Reload command --- .../command/SubCommands/ReloadCommand.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java new file mode 100644 index 0000000..ce138bc --- /dev/null +++ b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java @@ -0,0 +1,45 @@ +package me.Navoei.customdiscsplugin.command.SubCommands; + +import me.Navoei.customdiscsplugin.CustomDiscs; +import me.Navoei.customdiscsplugin.command.SubCommand; +import me.Navoei.customdiscsplugin.language.Lang; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +public class ReloadCommand extends SubCommand { + + CustomDiscs customDiscs = CustomDiscs.getInstance(); + + @Override + public String getName() { + return "reload"; + } + + @Override + public String getDescription() { + return ChatColor.GRAY + "Reloads plugin's configuration."; + } + + @Override + public String getSyntax() { + return "/customdisc reload"; + } + + @Override + public void perform(Player player) { + + if (!player.hasPermission("customdiscs.reload")) { + Component textComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(Lang.PREFIX + Lang.NO_PERMISSION.toString()); + player.sendMessage(textComponent); + return; + } + + customDiscs.reload() + Component textComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(Lang.PREFIX + Lang.RELOAD.toString()); + player.sendMessage(textComponent); + + } +} \ No newline at end of file From 09bef2cbb88dae588e0c455ba1f816f7a86ab3ec Mon Sep 17 00:00:00 2001 From: qvazzar Date: Thu, 18 Jul 2024 05:07:13 +0300 Subject: [PATCH 3/4] Reload command --- .../me/Navoei/customdiscsplugin/command/CommandManager.java | 2 ++ .../command/SubCommands/ReloadCommand.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/CommandManager.java b/src/main/java/me/Navoei/customdiscsplugin/command/CommandManager.java index 25fd962..999c7b0 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/command/CommandManager.java +++ b/src/main/java/me/Navoei/customdiscsplugin/command/CommandManager.java @@ -3,6 +3,7 @@ import me.Navoei.customdiscsplugin.CustomDiscs; import me.Navoei.customdiscsplugin.command.SubCommands.CreateCommand; import me.Navoei.customdiscsplugin.command.SubCommands.DownloadCommand; +import me.Navoei.customdiscsplugin.command.SubCommands.ReloadCommand; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import org.bukkit.ChatColor; @@ -25,6 +26,7 @@ public class CommandManager implements CommandExecutor, TabCompleter { public CommandManager() { subCommands.add(new CreateCommand()); subCommands.add(new DownloadCommand()); + subCommands.add(new ReloadCommand()); } @Override diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java index ce138bc..21a4cbe 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java +++ b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java @@ -20,7 +20,7 @@ public String getName() { @Override public String getDescription() { - return ChatColor.GRAY + "Reloads plugin's configuration."; + return ChatColor.GRAY + "Reloads plugin configuration."; } @Override @@ -29,7 +29,7 @@ public String getSyntax() { } @Override - public void perform(Player player) { + public void perform(Player player, String[] args) { if (!player.hasPermission("customdiscs.reload")) { Component textComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(Lang.PREFIX + Lang.NO_PERMISSION.toString()); @@ -37,7 +37,7 @@ public void perform(Player player) { return; } - customDiscs.reload() + customDiscs.reload(); Component textComponent = LegacyComponentSerializer.legacyAmpersand().deserialize(Lang.PREFIX + Lang.RELOAD.toString()); player.sendMessage(textComponent); From b8f7c1881c43d9067998ac2c07cd0aa7d53a10ee Mon Sep 17 00:00:00 2001 From: qvazzar Date: Thu, 18 Jul 2024 05:09:00 +0300 Subject: [PATCH 4/4] Fix unused imports --- .../customdiscsplugin/command/SubCommands/ReloadCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java index 21a4cbe..a5229e9 100644 --- a/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java +++ b/src/main/java/me/Navoei/customdiscsplugin/command/SubCommands/ReloadCommand.java @@ -5,7 +5,6 @@ import me.Navoei.customdiscsplugin.language.Lang; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player;