Merge branch 'mll' into javafx

# Conflicts: # HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java # data-json/dynamic-remote-resources-raw.json # data-json/dynamic-remote-resources.json
coldshineb · Feb 20, 2024 · cb74df3 · cb74df3
2 parents ee76799 + 94c1ed1
commit cb74df3
Show file tree

Hide file tree

Showing 100 changed files with 2,668 additions and 1,070 deletions.
diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts
@@ -1,6 +1,3 @@
-import com.google.gson.Gson
-import com.google.gson.JsonElement
-import com.google.gson.JsonObject
 import java.net.URI
 import java.nio.file.FileSystems
 import java.nio.file.Files
@@ -10,16 +7,6 @@ import java.security.Signature
 import java.security.spec.PKCS8EncodedKeySpec
 import java.util.zip.ZipFile
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.google.code.gson:gson:2.10.1")
-    }
-}
-
 plugins {
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
@@ -94,59 +81,6 @@ fun attachSignature(jar: File) {
     }
 }
 
-tasks.getByName<JavaCompile>("compileJava") {
-    dependsOn(tasks.create("computeDynamicResources") {
-        this@create.inputs.file(rootProject.rootDir.toPath().resolve("data-json/dynamic-remote-resources-raw.json"))
-        this@create.outputs.file(rootProject.rootDir.toPath().resolve("data-json/dynamic-remote-resources.json"))
-
-        doLast {
-            Gson().also { gsonInstance ->
-                rootProject.rootDir.resolve("data-json/dynamic-remote-resources-raw.json").bufferedReader().use { br ->
-                    (gsonInstance.fromJson(br, JsonElement::class.java) as JsonObject)
-                }.also { data ->
-                    data.asMap().forEach { (namespace, namespaceData) ->
-                        (namespaceData as JsonObject).asMap().forEach { (name, nameData) ->
-                            (nameData as JsonObject).asMap().forEach { (version, versionData) ->
-                                require(versionData is JsonObject)
-                                val localPath =
-                                    (versionData.get("local_path") as com.google.gson.JsonPrimitive).asString
-                                val sha1 = (versionData.get("sha1") as com.google.gson.JsonPrimitive).asString
-
-                                val currentSha1 = digest(
-                                    "SHA-1",
-                                    rootProject.rootDir.resolve(localPath).readBytes()
-                                ).joinToString(separator = "") { "%02x".format(it) }
-
-                                if (!sha1.equals(currentSha1, ignoreCase = true)) {
-                                    throw IllegalStateException("Mismatched SHA-1 in $.${namespace}.${name}.${version} of dynamic remote resources detected. Require ${currentSha1}, but found $sha1")
-                                }
-                            }
-                        }
-                    }
-
-                    rootProject.rootDir.resolve("data-json/dynamic-remote-resources.json").also { zippedPath ->
-                        gsonInstance.toJson(data).also { expectedData ->
-                            if (zippedPath.exists()) {
-                                zippedPath.readText().also { rawData ->
-                                    if (rawData != expectedData) {
-                                        if (System.getenv("GITHUB_SHA") == null) {
-                                            zippedPath.writeText(expectedData)
-                                        } else {
-                                            throw IllegalStateException("Mismatched zipped dynamic-remote-resources json file!")
-                                        }
-                                    }
-                                }
-                            } else {
-                                zippedPath.writeText(expectedData)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    })
-}
-
 val java11 = sourceSets.create("java11") {
     java {
         srcDir("src/main/java11")

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
@@ -33,12 +33,10 @@
 import org.jackhuang.hmcl.task.AsyncTaskExecutor;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.upgrade.hmcl.UpdateChecker;
-import org.jackhuang.hmcl.upgrade.hmcl.UpdateHandler;
-import org.jackhuang.hmcl.upgrade.resource.RemoteResourceManager;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;
 import org.jackhuang.hmcl.util.CrashReporter;
 import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.Architecture;
@@ -123,10 +121,6 @@ public void start(Stage primaryStage) {
 
                 UpdateChecker.init();
 
-                RemoteResourceManager.init();
-
-                RemoteResourceManager.register();
-
                 primaryStage.show();
             });
         } catch (Throwable e) {
@@ -293,10 +287,6 @@ public static void main(String[] args) {
             if (OperatingSystem.CURRENT_OS.isLinuxOrBSD())
                 LOG.info("XDG Session Type: " + System.getenv("XDG_SESSION_TYPE"));
 
-            if (System.getProperty("hmcl.update_source.override") != null) {
-                Logging.LOG.log(Level.WARNING, "'hmcl.update_source.override' is deprecated! Please use 'hmcl.hmcl_update_source.override' instead");
-            }
-
             launch(Launcher.class, args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java
@@ -37,13 +37,11 @@ private Metadata() {}
     public static final String TITLE = NAME + " " + VERSION;
     public static final String FULL_TITLE = FULL_NAME + " " + VERSION;
 
-    // hmcl.update_source.override is deprecated. If it is used, a warning message will be printed in org.jackhuang.hmcl.Launcher.main .
-    public static final String HMCL_UPDATE_URL = System.getProperty("hmcl.hmcl_update_source.override", System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link"));
-    public static final String RESOURCE_UPDATE_URL = System.getProperty("hmcl.resource_update_source.override", "https://hmcl.huangyuhui.net/api/dynamic_remote_resource/update_link");
+    public static final String HMCL_UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
     public static final String CONTACT_URL = "https://docs.hmcl.net/help.html";
     public static final String HELP_URL = "https://docs.hmcl.net";
     public static final String CHANGELOG_URL = "https://docs.hmcl.net/changelog/";
-    public static final String PUBLISH_URL = "https://www.mcbbs.net/thread-142335-1-1.html";
+    public static final String PUBLISH_URL = "https://hmcl.huangyuhui.net";
     public static final String EULA_URL = "https://docs.hmcl.net/eula/hmcl.html";
 
     public static final String BUILD_CHANNEL = JarUtils.getManifestAttribute("Build-Channel", "nightly");

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/countly/Countly.java b/HMCL/src/main/java/org/jackhuang/hmcl/countly/Countly.java
@@ -20,10 +20,9 @@
 import org.jackhuang.hmcl.util.io.HttpRequest;
 
 import java.io.IOException;
+import java.time.ZonedDateTime;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Locale;
-import java.util.TimeZone;
 
 import static org.jackhuang.hmcl.util.Pair.pair;
 
@@ -40,7 +39,7 @@ public void sendMetric(String metrics) throws IOException {
                 pair("metrics", metrics),
                 pair("device_id", deviceId),
                 pair("timestamp", Long.toString(System.currentTimeMillis())),
-                pair("tz", Integer.toString(TimeZone.getDefault().getOffset(new Date().getTime()) / 60000)),
+                pair("tz", Integer.toString(getTimezoneOffset())),
                 pair("hour", Integer.toString(currentHour())),
                 pair("dow", Integer.toString(currentDayOfWeek())),
                 pair("app_key", APP_KEY),
@@ -50,7 +49,7 @@ public void sendMetric(String metrics) throws IOException {
     }
 
     private static int getTimezoneOffset() {
-        return TimeZone.getDefault().getOffset(new Date().getTime()) / 60000;
+        return ZonedDateTime.now().getOffset().getTotalSeconds() / 60;
     }
 
     private static String getLocale() {

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java b/HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java
@@ -7,8 +7,8 @@
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
 import static org.jackhuang.hmcl.util.Lang.mapOf;
@@ -68,7 +68,7 @@ public Map<String, Object> getMetrics(long runningTime) {
     public String getDisplayText() {
         return "---- Hello Minecraft! Crash Report ----\n" +
                 "  Version: " + Metadata.VERSION + "\n" +
-                "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
+                "  Time: " + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()) + "\n" +
                 "  Thread: " + thread + "\n" +
                 "\n  Content: \n    " +
                 stackTrace + "\n\n" +

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java
@@ -25,7 +25,7 @@
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.platform.ManagedProcess;
-import org.jackhuang.hmcl.util.versioning.VersionNumber;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.File;
 import java.io.IOException;
@@ -84,7 +84,7 @@ private void generateOptionsTxt() {
             1.11 ~ 12：zh_cn 时正常，zh_CN 时虽然显示了中文但语言设置会错误地显示选择英文
             1.13+    ：zh_cn 时正常，zh_CN 时自动切换为英文
          */
-        VersionNumber gameVersion = VersionNumber.asVersion(repository.getGameVersion(version).orElse("0.0"));
+        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(repository.getGameVersion(version));
         if (gameVersion.compareTo("1.1") < 0) {
             lang = null;
         } else if (gameVersion.compareTo("1.11") < 0) {

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java
@@ -48,6 +48,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.time.Instant;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -103,7 +104,7 @@ public File getRunDirectory(String id) {
     public Stream<Version> getDisplayVersions() {
         return getVersions().stream()
                 .filter(v -> !v.isHidden())
-                .sorted(Comparator.comparing((Version v) -> v.getReleaseTime() == null ? new Date(0L) : v.getReleaseTime())
+                .sorted(Comparator.comparing((Version v) -> Lang.requireNonNullElse(v.getReleaseTime(), Instant.EPOCH))
                         .thenComparing(v -> VersionNumber.asVersion(v.getId())));
     }
 

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
@@ -45,6 +45,7 @@
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.ResponseCodeException;
 import org.jackhuang.hmcl.util.platform.*;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.io.File;
@@ -332,7 +333,7 @@ public void onStop(boolean success, TaskExecutor executor) {
     }
 
     private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) {
-        VersionNumber gameVersion = VersionNumber.asVersion(profile.getRepository().getGameVersion(version).orElse("Unknown"));
+        GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(profile.getRepository().getGameVersion(version));
 
         if (setting.isNotCheckJVM()) {
             return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version))
@@ -549,14 +550,14 @@ private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting
             // Forge 2760~2773 will crash game with LiteLoader.
             boolean hasForge2760 = forgeVersion != null && (forgeVersion.compareTo("1.12.2-14.23.5.2760") >= 0) && (forgeVersion.compareTo("1.12.2-14.23.5.2773") < 0);
             boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
-            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
+            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo("1.12.2") == 0) {
                 suggestions.add(i18n("launch.advice.forge2760_liteloader"));
             }
 
             // OptiFine 1.14.4 is not compatible with Forge 28.2.2 and later versions.
             boolean hasForge28_2_2 = forgeVersion != null && (forgeVersion.compareTo("1.14.4-28.2.2") >= 0);
             boolean hasOptiFine = version.getLibraries().stream().anyMatch(it -> it.is("optifine", "OptiFine"));
-            if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo(VersionNumber.asVersion("1.14.4")) == 0) {
+            if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo("1.14.4") == 0) {
                 suggestions.add(i18n("launch.advice.forge28_2_2_optifine"));
             }