Merge pull request #1 from SteveNotSet/StarRiverCity

Update ServerLockRegistry.java
SteveNotSet · Mar 29, 2024 · 5fe3885 · 5fe3885
2 parents d338831 + 999ba7a
commit 5fe3885
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/cn/zbx1425/resourcepackupdater/drm/ServerLockRegistry.java b/src/main/java/cn/zbx1425/resourcepackupdater/drm/ServerLockRegistry.java
@@ -50,10 +50,13 @@ public static void updateLocalServerLock(File rpFolder) {
     }
 
     public static boolean shouldRefuseProvidingFile(String resourcePath) {
+        // For Star River City, force enable packs regardless of incompletion or any locks
+        /*
         if (Objects.equals(resourcePath, "pack.mcmeta") || Objects.equals(resourcePath, "pack.png")) return false;
         if (lockAllSyncedPacks) return true;
         if (localServerLock == null) return false;
-        return !Objects.equals(localServerLock, remoteServerLock);
+        return !Objects.equals(localServerLock, remoteServerLock);*/
+        return false;
     }
 
     public static void onLoginInitiated() {
@@ -67,7 +70,7 @@ public static void onSetServerLock(String serverLock) {
     public static void onAfterSetServerLock() {
         if (lockAllSyncedPacks) {
             Minecraft.getInstance().getToasts().addToast(new SystemToast(SystemToast.SystemToastIds.PACK_LOAD_FAILURE,
-                    Text.literal("同步资源包不完整而未被采用"), Text.literal("您可按 F3+T 重试下载。如有错误请联络管理人员。")
+                    Text.literal("同步资源包不完整"), Text.literal("您可按 F3+T 重试下载。如有错误请联络管理人员。")
             ));
         }