The reload command can be executed from console now!

WolfyScript · Jun 25, 2022 · 5c63910 · 5c63910
1 parent e3b0e5a
commit 5c63910
Showing 1 changed file with 38 additions and 24 deletions.
diff --git a/src/main/java/me/wolfyscript/customcrafting/commands/cc_subcommands/ReloadSubCommand.java b/src/main/java/me/wolfyscript/customcrafting/commands/cc_subcommands/ReloadSubCommand.java
@@ -30,8 +30,13 @@
 import me.wolfyscript.customcrafting.registry.RegistryRecipes;
 import me.wolfyscript.customcrafting.utils.ChatUtils;
 import me.wolfyscript.customcrafting.utils.NamespacedKeyUtils;
+import me.wolfyscript.lib.net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
+import me.wolfyscript.lib.net.kyori.adventure.text.Component;
+import me.wolfyscript.lib.net.kyori.adventure.text.TextComponent;
+import me.wolfyscript.lib.net.kyori.adventure.text.format.NamedTextColor;
 import me.wolfyscript.utilities.api.WolfyUtilities;
 import me.wolfyscript.utilities.registry.RegistryCustomItem;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -50,34 +55,43 @@ public ReloadSubCommand(CustomCrafting customCrafting) {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull String var3, @NotNull String[] var4) {
         WolfyUtilities api = customCrafting.getApi();
-        if (sender instanceof Player p && ChatUtils.checkPerm(p, "customcrafting.cmd.reload")) {
-            var invAPI = api.getInventoryAPI(CCCache.class);
-            var configHandler = customCrafting.getConfigHandler();
-            var dataHandler = customCrafting.getDataHandler();
-            api.getChat().sendMessage(p, ChatColor.YELLOW + "Unloading Languages...");
-            customCrafting.getApi().getLanguageAPI().unregisterLanguages();
-            api.getChat().sendMessage(p, ChatColor.YELLOW + "Unloading Recipes...");
-            //Unregister recipes
-            RegistryRecipes registryRecipes = customCrafting.getRegistries().getRecipes();
-            registryRecipes.get(NamespacedKeyUtils.NAMESPACE).forEach(customRecipe -> registryRecipes.remove(customRecipe.getNamespacedKey()));
-            api.getChat().sendMessage(p, ChatColor.YELLOW + "Unloading Items...");
-            //Unregister items
-            RegistryCustomItem registryCustomItem = customCrafting.getApi().getRegistries().getCustomItems();
-            registryCustomItem.get(NamespacedKeyUtils.NAMESPACE).forEach(customItem -> registryCustomItem.remove(customItem.getNamespacedKey()));
-            //Load new data
-            api.getChat().sendMessage(p, ChatColor.YELLOW + "Reloading Config...");
-            configHandler.load();
-            api.getChat().sendMessage(p, ChatColor.YELLOW + "Loading Recipe & Items...");
-            dataHandler.load();
-            configHandler.getRecipeBookConfig().index(customCrafting);
-            api.getChat().sendMessage(p, "&eReloading GUIs");
-            ((MenuRecipeBook) invAPI.getGuiWindow(ClusterRecipeBook.RECIPE_BOOK)).reset();
-            invAPI.reset();
-            api.getChat().sendMessage(p, ChatColor.GREEN + "Reload done!");
+        if (sender instanceof Player p && !ChatUtils.checkPerm(p, "customcrafting.cmd.reload")) {
+            return true;
         }
+        var invAPI = api.getInventoryAPI(CCCache.class);
+        var configHandler = customCrafting.getConfigHandler();
+        var dataHandler = customCrafting.getDataHandler();
+        sendMessage(sender, Component.text("Unloading Languages...", NamedTextColor.YELLOW));
+        customCrafting.getApi().getLanguageAPI().unregisterLanguages();
+        sendMessage(sender, Component.text("Unloading Recipes...", NamedTextColor.YELLOW));
+        //Unregister recipes
+        RegistryRecipes registryRecipes = customCrafting.getRegistries().getRecipes();
+        registryRecipes.get(NamespacedKeyUtils.NAMESPACE).forEach(customRecipe -> registryRecipes.remove(customRecipe.getNamespacedKey()));
+        sendMessage(sender, Component.text("Unloading Items...", NamedTextColor.YELLOW));
+        //Unregister items
+        RegistryCustomItem registryCustomItem = customCrafting.getApi().getRegistries().getCustomItems();
+        registryCustomItem.get(NamespacedKeyUtils.NAMESPACE).forEach(customItem -> registryCustomItem.remove(customItem.getNamespacedKey()));
+        //Load new data
+        sendMessage(sender, Component.text("Reloading Config...", NamedTextColor.YELLOW));
+        configHandler.load();
+        sendMessage(sender, Component.text("Loading Recipe & Items...", NamedTextColor.YELLOW));
+        dataHandler.load();
+        configHandler.getRecipeBookConfig().index(customCrafting);
+        sendMessage(sender, Component.text("Reloading GUIs", NamedTextColor.YELLOW));
+        ((MenuRecipeBook) invAPI.getGuiWindow(ClusterRecipeBook.RECIPE_BOOK)).reset();
+        invAPI.reset();
+        sendMessage(sender, Component.text("Reload done!", NamedTextColor.GREEN));
         return true;
     }
 
+    private void sendMessage(CommandSender sender, TextComponent message) {
+        if (sender instanceof Player player) {
+            customCrafting.getApi().getChat().sendMessage(player, message);
+        } else {
+            customCrafting.getLogger().info(message.content());
+        }
+    }
+
     @Override
     protected @Nullable List<String> onTabComplete(@NotNull CommandSender var1, @NotNull String var3, @NotNull String[] var4) {
         return null;