Merge remote-tracking branch 'refs/remotes/official/main' into prs-base

burningtnt · Aug 23, 2024 · e871805 · e871805
2 parents e120091 + 95a1496
commit e871805
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java
@@ -35,7 +35,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.jackhuang.hmcl.util.Lang.tryCast;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 /**
@@ -48,8 +47,11 @@ private GameVersion() {
     private static Optional<String> getVersionFromJson(InputStream versionJson) {
         try {
             Map<?, ?> version = JsonUtils.fromNonNullJsonFully(versionJson, Map.class);
-            return tryCast(version.get("id"), String.class);
-        } catch (IOException | JsonParseException e) {
+            String id = (String) version.get("id");
+            if (id != null && id.contains(" / "))
+                id = id.substring(0, id.indexOf(" / "));
+            return Optional.ofNullable(id);
+        } catch (IOException | JsonParseException | ClassCastException e) {
             LOG.warning("Failed to parse version.json", e);
             return Optional.empty();
         }