WM 1.9.4 compatibility

WeaponMechanics · Aug 14, 2022 · 625ed56 · 625ed56
1 parent fd9b913
commit 625ed56
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 48 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 group = "me.cjcrafter"
-version = "1.3.6"
+version = "1.3.7"
 
 plugins {
     `java-library`
@@ -48,8 +48,8 @@ repositories {
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
-    compileOnly("me.deecaad:mechanicscore:1.4.1-BETA")
-    compileOnly("me.deecaad:weaponmechanics:1.9.1-BETA")
+    compileOnly("me.deecaad:mechanicscore:1.4.4")
+    compileOnly("me.deecaad:weaponmechanics:1.9.4")
     implementation("io.lumine:Mythic-Dist:5.0.1-SNAPSHOT")
     implementation("org.bstats:bstats-bukkit:3.0.0")
     implementation("me.cjcrafter:mechanicsautodownload:1.1.2")

diff --git a/src/main/java/me/cjcrafter/armormechanics/ArmorMechanics.java b/src/main/java/me/cjcrafter/armormechanics/ArmorMechanics.java
@@ -3,6 +3,7 @@
 import me.cjcrafter.armormechanics.listeners.*;
 import me.cjcrafter.auto.UpdateChecker;
 import me.cjcrafter.auto.UpdateInfo;
+import me.deecaad.core.events.QueueSerializerEvent;
 import me.deecaad.core.file.SerializeData;
 import me.deecaad.core.file.SerializerException;
 import me.deecaad.core.file.TaskChain;
@@ -58,7 +59,6 @@ public void onLoad() {
     @Override
     public void onEnable() {
 
-        reload();
         registerBStats();
         registerUpdateChecker();
 
@@ -82,51 +82,62 @@ public void onEnable() {
         }
 
         Command.register();
-    }
-
-    public void reload() {
-
-        // Write config from jar to datafolder
-        if (!getDataFolder().exists() || getDataFolder().listFiles() == null || getDataFolder().listFiles().length == 0) {
-            debug.info("Copying files from jar (This process may take up to 30 seconds during the first load!)");
-            FileUtil.copyResourcesTo(getClassLoader().getResource("ArmorMechanics"), getDataFolder().toPath());
-        }
-
-        reloadConfig();
 
-        // Clear old data
-        effects.clear();
-        armors.clear();
-        sets.clear();
-
-        // Serialize armor types
-        File armorFile = new File(getDataFolder(), "Armor.yml");
-        FileConfiguration armorConfig = YamlConfiguration.loadConfiguration(armorFile);
-
-        for (String key : armorConfig.getKeys(false)) {
-            ArmorSerializer serializer = new ArmorSerializer();
-            SerializeData data = new SerializeData(serializer, armorFile, key, armorConfig);
-
-            try {
-                serializer.serialize(data);
-            } catch (SerializerException e) {
-                e.log(debug);
+        new Listener() {
+            @EventHandler
+            public void onQueue(QueueSerializerEvent event) {
+                if ("WeaponMechanics".equals(event.getSourceName()))
+                    reload();
             }
-        }
-
-        File setFile = new File(getDataFolder(), "Set.yml");
-        FileConfiguration setConfig = YamlConfiguration.loadConfiguration(setFile);
-
-        for (String key : setConfig.getKeys(false)) {
-            ArmorSet serializer = new ArmorSet();
-            SerializeData data = new SerializeData(serializer, setFile, key, setConfig);
+        };
+    }
 
-            try {
-                serializer.serialize(data);
-            } catch (SerializerException e) {
-                e.log(debug);
-            }
-        }
+    public TaskChain reload() {
+        return new TaskChain(this)
+                .thenRunAsync(() -> {
+                    // Write config from jar to datafolder
+                    if (!getDataFolder().exists() || getDataFolder().listFiles() == null || getDataFolder().listFiles().length == 0) {
+                        debug.info("Copying files from jar (This process may take up to 30 seconds during the first load!)");
+                        FileUtil.copyResourcesTo(getClassLoader().getResource("ArmorMechanics"), getDataFolder().toPath());
+                    }
+                })
+                .thenRunSync(() -> {
+                    reloadConfig();
+
+                    // Clear old data
+                    effects.clear();
+                    armors.clear();
+                    sets.clear();
+
+                    // Serialize armor types
+                    File armorFile = new File(getDataFolder(), "Armor.yml");
+                    FileConfiguration armorConfig = YamlConfiguration.loadConfiguration(armorFile);
+
+                    for (String key : armorConfig.getKeys(false)) {
+                        ArmorSerializer serializer = new ArmorSerializer();
+                        SerializeData data = new SerializeData(serializer, armorFile, key, armorConfig);
+
+                        try {
+                            serializer.serialize(data);
+                        } catch (SerializerException e) {
+                            e.log(debug);
+                        }
+                    }
+
+                    File setFile = new File(getDataFolder(), "Set.yml");
+                    FileConfiguration setConfig = YamlConfiguration.loadConfiguration(setFile);
+
+                    for (String key : setConfig.getKeys(false)) {
+                        ArmorSet serializer = new ArmorSet();
+                        SerializeData data = new SerializeData(serializer, setFile, key, setConfig);
+
+                        try {
+                            serializer.serialize(data);
+                        } catch (SerializerException e) {
+                            e.log(debug);
+                        }
+                    }
+                });
     }
 
     private void registerBStats() {

diff --git a/src/main/java/me/cjcrafter/armormechanics/Command.java b/src/main/java/me/cjcrafter/armormechanics/Command.java
@@ -95,8 +95,9 @@ public static void register() {
                         .withPermission("armormechanics.commands.reload")
                         .withDescription("Reloads the plugin's configurations")
                         .executes(CommandExecutor.any((sender, args) -> {
-                            ArmorMechanics.INSTANCE.reload();
-                            sender.sendMessage(GREEN + "Reloaded ArmorMechanics");
+                            ArmorMechanics.INSTANCE.reload().thenRunSync(() -> {
+                                sender.sendMessage(GREEN + "Reloaded ArmorMechanics");
+                            });
                         })))
 
                 .withSubcommand(new CommandBuilder("info")