Update AssetMover API

Author: ACGaming

build.gradle

@@ -66,7 +66,7 @@ repositories {
 dependencies {
     deobfCompile 'zone.rong:mixinbooter:7.0'
     deobfCompile 'curse.maven:had-enough-items-557549:4109510'
-    deobfCompile 'com.cleanroommc:assetmover:2.1'
+    deobfCompile 'com.cleanroommc:assetmover:2.4'
 }
 
 mixin {

src/main/java/mod/acgaming/extrasounds/ExtraSounds.java

@@ -4,6 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLConstructionEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -30,13 +31,7 @@ public class ExtraSounds
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event)
     {
-        if (Loader.isModLoaded("assetmover")) assetmover = true;
-        else LOGGER.warn("AssetMover not detected, some sounds will be missing...");
-        if (event.getSide() == Side.CLIENT)
-        {
-            ESSoundEventsClient.preInit();
-            ESSoundManagerClient.preInit();
-        }
+        if (event.getSide() == Side.CLIENT) ESSoundManagerClient.preInit();
         ESSoundEvents.preInit();
         LOGGER.info("Extra Sounds pre-initialized");
     }
@@ -64,4 +59,20 @@ public void postInit(FMLPostInitializationEvent event)
         }
         LOGGER.info("Extra Sounds post-initialized");
     }
+
+    @Mod.EventHandler
+    public void fmlConstruct(FMLConstructionEvent event)
+    {
+        try
+        {
+            Class.forName("com.cleanroommc.assetmover.AssetMoverAPI");
+            assetmover = true;
+            LOGGER.info("AssetMover detected, enabling compatibility...");
+        }
+        catch (ClassNotFoundException ignored)
+        {
+            LOGGER.warn("AssetMover not detected, some sounds will be missing...");
+        }
+        if (event.getSide() == Side.CLIENT) ESSoundEventsClient.getBackportedSounds();
+    }
 }

src/main/java/mod/acgaming/extrasounds/sound/client/ESSoundEventsClient.java

@@ -8,11 +8,6 @@
 
 public class ESSoundEventsClient
 {
-    public static void preInit()
-    {
-        if (ExtraSounds.assetmover) getBackportedSounds();
-    }
-
     public static void getBackportedSounds()
     {
         Map<String, String> backportMap = new Object2ObjectOpenHashMap<>();
@@ -94,8 +89,8 @@ public static void getBackportedSounds()
         backportMap.put("assets/minecraft/sounds/item/bonemeal/bonemeal4.ogg", "assets/extrasounds/sounds/item/bonemeal/bonemeal4.ogg");
         backportMap.put("assets/minecraft/sounds/item/bonemeal/bonemeal5.ogg", "assets/extrasounds/sounds/item/bonemeal/bonemeal5.ogg");
 
-        ExtraSounds.LOGGER.info("Downloading Minecraft 1.19.2 sounds, this could take a while...");
-        AssetMoverAPI.fromMinecraft("1.19.2", backportMap);
+        ExtraSounds.LOGGER.info("Downloading Minecraft 1.19.3 sounds, this could take a while...");
+        AssetMoverAPI.fromMinecraft("1.19.3", backportMap);
         ExtraSounds.LOGGER.info("Downloading finished!");
     }
 }