Fix: Config loading

Author: Skullians

abstraction/src/main/java/com/loohp/multichatdiscordsrvaddon/config/Config.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import me.lucko.helper.internal.LoaderUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -26,8 +27,6 @@ public class Config {
             .build();
 
     private static Config instance;
-    @Setter
-    private static File cachedDataFolder;
 
     public record EmbedDisplay(
             String single,
@@ -750,20 +749,16 @@ public record Debug(
     @Comment("\nDebug configurations (useful for bug diagnosis)")
     Debug debug = new Debug(false, false);
 
-    static {
-        cachedDataFolder = Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("MultiChatDiscordSrvAddon")).getDataFolder();
-    }
-
     public static Config i() {
-        return Objects.requireNonNullElseGet(instance, () -> YamlConfigurations.update(new File(cachedDataFolder, "config.yml").toPath(), Config.class, properties));
+        if (instance != null) return instance;
+        return instance = YamlConfigurations.update(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, properties);
     }
 
     public void saveConfig() {
-        YamlConfigurations.save(new File(cachedDataFolder, "config.yml").toPath(), Config.class, this, properties);
+        YamlConfigurations.save(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, this, properties);
     }
 
-    public void reload(File dataFolder) {
-        cachedDataFolder = dataFolder;
-        instance = YamlConfigurations.load(new File(dataFolder, "config.yml").toPath(), Config.class, properties);
+    public void reload() {
+        instance = YamlConfigurations.load(new File(LoaderUtils.getPlugin().getDataFolder(), "config.yml").toPath(), Config.class, properties);
     }
 }

common/src/main/java/com/loohp/multichatdiscordsrvaddon/MultiChatDiscordSrvAddon.java

@@ -27,8 +27,6 @@
 import com.loohp.multichatdiscordsrvaddon.integration.IntegrationManager;
 import com.loohp.multichatdiscordsrvaddon.objectholders.*;
 import com.loohp.multichatdiscordsrvaddon.registry.MultiChatRegistry;
-import com.loohp.multichatdiscordsrvaddon.utils.MCVersion;
-import com.loohp.multichatdiscordsrvaddon.utils.VersionManager;
 import com.loohp.multichatdiscordsrvaddon.utils.*;
 import me.lucko.helper.plugin.ExtendedJavaPlugin;
 import net.kyori.adventure.text.Component;
@@ -196,8 +194,6 @@ public void enable() {
 
         AssetsDownloader.loadLibraries(getDataFolder());
 
-        Config.setCachedDataFolder(getDataFolder());
-
         long itemDisplayTimeout = Config.i().getSettings().timeout() * 60L * 1000L;
         itemDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
         inventoryDisplay = new ConcurrentCacheHashMap<>(itemDisplayTimeout, 60000);
@@ -317,11 +313,11 @@ private void cachePlayerSkin(OfflinePlayer player) {
     @Override
     public void disable() {
         DiscordInteractionEvents.unregisterAll();
-        modelRenderer.close();
-        mediaReadingService.shutdown();
-        if (resourceManager != null) {
-            resourceManager.close();
-        }
+
+        if (modelRenderer != null) modelRenderer.close();
+        if (mediaReadingService != null) mediaReadingService.shutdown();
+        if (resourceManager != null) resourceManager.close();
+
         ChatUtils.sendMessage("<red>MultiChat DiscordSRV Addon has been disabled.", Bukkit.getConsoleSender());
     }
 

common/src/main/java/com/loohp/multichatdiscordsrvaddon/main/BlockModelRenderer.java

@@ -570,7 +570,6 @@ public void loadResources() {
 
             List<String> resourceOrder;
             int valuePerPack;
-            Config.setCachedDataFolder(Paths.get("MultiChatDiscordSrvAddon").toFile());
             resourceOrder = Config.i().getResources().order();
             Collections.reverse(resourceOrder);
             valuePerPack = (int) ((1.0 / (double) (resourceOrder.size() + 1)) * 10000);

common/src/main/java/com/loohp/multichatdiscordsrvaddon/utils/MultiChatComponentSerializer.java

@@ -251,7 +251,7 @@ private InteractiveChatLegacyHoverEventSerializer() {
                     String nbtAsString = "";
                     if (nbt != null) {
                         nbtAsString = nbt.string();
-                        builder.put("tag", StringBinaryTag.of("{Tag}"));
+                        builder.put("tag", StringBinaryTag.stringBinaryTag("{Tag}"));
                     }
 
                     return Component.text(TagStringIO.get().asString(builder.build()).replace("\"{Tag}\"", nbtAsString));