20

AdamCalculator · Mar 17, 2024 · db101f0 · db101f0
1 parent 85ce74e
commit db101f0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,6 +34,7 @@ loom {
 
 dependencies {
 	implementation(project(':common'))
+	include(project(':common'))
 
 
 	// https://mvnrepository.com/artifact/org.bouncycastle/bcpg-jdk18on

diff --git a/common/src/main/java/com/adamcalculator/dynamicpack/pack/Pack.java b/common/src/main/java/com/adamcalculator/dynamicpack/pack/Pack.java
@@ -105,7 +105,7 @@ private void sync0(SyncProgress progress, boolean manually) throws Exception {
         } else if (remote instanceof DynamicRepoRemote dynamicRepoRemote) {
             reloadRequired = dynamicRepoSync(dynamicRepoRemote, progress);
         } else {
-            isSyncing = false;
+            throw new RuntimeException("InternalError: unknown remote: " + remote);
         }
         isSyncing = false;
         progress.done(reloadRequired);

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.15.7
 
 
 # Mod Properties
-mod_version=1.0.3
+mod_version=1.0.4
 maven_group=com.adamcalculator
 archives_base_name=dynamicpack
 

diff --git a/src/client/java/com/adamcalculator/dynamicpack/FabricDynamicMod.java b/src/client/java/com/adamcalculator/dynamicpack/FabricDynamicMod.java
@@ -20,22 +20,28 @@ public void startSyncThread() {
         SyncingTask syncingTask = new SyncingTask(false) {
             @Override
             public void syncDone(boolean reloadRequired) {
-                MinecraftClient client = MinecraftClient.getInstance();
-                if (client != null && reloadRequired) {
-                    if (client.world == null) {
-                        client.reloadResources();
-                    } else {
-                        ToastManager toastManager = client.getToastManager();
-                        if (toastManager != null) {
-                            toastManager.add(SystemToast.create(client, SystemToast.Type.PACK_LOAD_FAILURE,
-                                    Text.translatable("dynamicpack.toast.needReload"), Text.translatable("dynamicpack.toast.needReload.desc")));
-                        }
-                    }
+                if (reloadRequired) {
+                    tryToReloadResources();
                 }
             }
         };
         Thread thread = new Thread(syncingTask);
         thread.setName("DynamicPack-SyncTask");
         thread.start();
     }
+
+    private void tryToReloadResources() {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client != null) {
+            if (client.world == null) {
+                client.reloadResources();
+            } else {
+                ToastManager toastManager = client.getToastManager();
+                if (toastManager != null) {
+                    toastManager.add(SystemToast.create(client, SystemToast.Type.PACK_LOAD_FAILURE,
+                            Text.translatable("dynamicpack.toast.needReload"), Text.translatable("dynamicpack.toast.needReload.desc")));
+                }
+            }
+        }
+    }
 }