Add uuid-creator dependency

Glavo · Glavo · commit 7c3afafc0db9 · 2026-05-27T18:14:50.000+08:00
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonParseException;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.Metadata;
@@ -38,7 +39,6 @@
 import org.jackhuang.hmcl.setting.VersionIconType;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.FileSaver;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -36,7 +37,6 @@
 import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.theme.ThemeColor;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.gson.*;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
 import org.jetbrains.annotations.Nullable;
@@ -61,6 +61,7 @@ public final class Config extends ObservableSetting {
     public static final Gson CONFIG_GSON = new GsonBuilder()
             .registerTypeAdapter(Path.class, PathTypeAdapter.INSTANCE)
             .registerTypeAdapter(UUID.class, UUIDTypeAdapter.INSTANCE)
+            .registerTypeAdapter(GUID.class, GUIDTypeAdapter.INSTANCE)
             .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
             .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
             .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java
@@ -17,13 +17,13 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonObject;
 import javafx.beans.property.ObjectProperty;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.util.FileSaver;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.FileUtils;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameDirectories.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameDirectories.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
@@ -25,7 +26,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.gson.JsonFileFormat;
 import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -173,7 +173,7 @@ private static JsonArray migrateConfigurationMap(JsonObject configurations) {
         }
 
         try {
-            return GUID.fromUUID(UUIDTypeAdapter.fromString(primitive.getAsString()));
+            return new GUID(UUIDTypeAdapter.fromString(primitive.getAsString()));
         } catch (IllegalArgumentException e) {
             return null;
         }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameSettings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameSettings.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import javafx.collections.FXCollections;
@@ -28,7 +29,6 @@
 import org.jackhuang.hmcl.setting.property.SettingProperty;
 import org.jackhuang.hmcl.setting.property.SimpleInheritableProperty;
 import org.jackhuang.hmcl.setting.property.SimpleSettingProperty;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonSerializable;
@@ -116,7 +116,7 @@ protected Instance createInstance() {
     public static final class Preset extends GameSettings {
         /// Creates a preset with generated identity.
         public Preset() {
-            this(GUID.random());
+            this(GUID.v4());
         }
 
         /// Creates a preset with the given identity.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameSettingsPresets.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/GameSettingsPresets.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
@@ -27,7 +28,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.gson.JsonFileFormat;
 import org.jackhuang.hmcl.util.gson.JsonSerializable;
 import org.jackhuang.hmcl.util.gson.ObservableSetting;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/LegacyGameSettingsMigrator.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/LegacyGameSettingsMigrator.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
@@ -25,7 +26,6 @@
 import org.jackhuang.hmcl.game.ProcessPriority;
 import org.jackhuang.hmcl.game.QuickPlayType;
 import org.jackhuang.hmcl.game.Renderer;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -87,7 +87,7 @@ private LegacyGameSettingsMigrator() {
 
     /// Returns the stable profile ID for a migrated legacy profile.
     public static GUID getLegacyProfileId(String profileName) {
-        return GUID.fromUUID(UUID.nameUUIDFromBytes(
+        return new GUID(UUID.nameUUIDFromBytes(
                 (LEGACY_PROFILE_ID_NAMESPACE + profileName).getBytes(StandardCharsets.UTF_8)));
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
 import javafx.application.Platform;
@@ -35,7 +36,6 @@
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.PortablePath;
 import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.javafx.ObservableHelper;
@@ -61,7 +61,7 @@ public final class Profile implements Observable {
     private final HMCLGameRepository repository;
 
     /// The stable profile ID.
-    private final ObjectProperty<GUID> id = new SimpleObjectProperty<>(this, "id", GUID.random());
+    private final ObjectProperty<GUID> id = new SimpleObjectProperty<>(this, "id", GUID.v4());
 
     /// Returns the stable profile ID property.
     public ObjectProperty<GUID> idProperty() {
@@ -130,7 +130,7 @@ public Profile(String name, Path initialGameDir) {
 
     /// Creates a profile.
     public Profile(String name, PortablePath path) {
-        this(GUID.random(), name, path, null);
+        this(GUID.v4(), name, path, null);
     }
 
     /// Creates a profile with an explicit stable ID.
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Profiles.java
@@ -17,14 +17,14 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import javafx.application.Platform;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.PortablePath;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/game/GameSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/game/GameSettingsPage.java
@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.ui.game;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXComboBox;
 import com.jfoenix.controls.JFXSlider;
@@ -54,7 +55,6 @@
 import org.jackhuang.hmcl.ui.versions.VersionIconDialog;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.ui.versions.Versions;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.Holder;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.ServerAddress;
diff --git a/HMCL/src/test/java/org/jackhuang/hmcl/setting/GameDirectoriesTest.java b/HMCL/src/test/java/org/jackhuang/hmcl/setting/GameDirectoriesTest.java
@@ -17,9 +17,9 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.PortablePath;
 import org.jackhuang.hmcl.util.gson.JsonFileFormat;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -36,7 +36,7 @@ public final class GameDirectoriesTest {
     /// Tests extracting current in-settings profile data into a detached game directory store.
     @Test
     public void extractsProfilesFromConfigJson() {
-        GUID id = GUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+        GUID id = new GUID("123e4567-e89b-12d3-a456-426614174000");
         JsonObject settings = JsonParser.parseString("""
                 {
                   "last": "Dev",
@@ -72,7 +72,7 @@ public void extractsProfilesFromConfigJson() {
     /// Tests that profiles store their directory as a portable path.
     @Test
     public void storesProfilePath() {
-        GUID id = GUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+        GUID id = new GUID("123e4567-e89b-12d3-a456-426614174000");
         Profile profile = new Profile(id, "Dev", PortablePath.of("versions\\Dev"), "1.20.1");
 
         JsonObject serialized = JsonUtils.GSON.toJsonTree(profile, Profile.class).getAsJsonObject();
diff --git a/HMCL/src/test/java/org/jackhuang/hmcl/setting/GameSettingsPresetsTest.java b/HMCL/src/test/java/org/jackhuang/hmcl/setting/GameSettingsPresetsTest.java
@@ -17,9 +17,9 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import com.github.f4b6a3.uuid.alt.GUID;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import org.jackhuang.hmcl.util.GUID;
 import org.jackhuang.hmcl.util.gson.JsonFileFormat;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
 import org.jetbrains.annotations.NotNullByDefault;
@@ -33,7 +33,7 @@ public final class GameSettingsPresetsTest {
     /// Tests that the default preset selection belongs to Config.
     @Test
     public void storesDefaultGameSettingsPresetInConfig() {
-        GUID id = GUID.fromString("123e4567-e89b-12d3-a456-426614174000");
+        GUID id = new GUID("123e4567-e89b-12d3-a456-426614174000");
         Config config = new Config();
 
         config.setDefaultGameSettingsPreset(id);
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/GUID.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/GUID.java
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/GUIDTypeAdapter.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/GUIDTypeAdapter.java
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonUtils.java
diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/GUIDTest.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/GUIDTest.java
diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/gson/GUIDTypeAdapterTest.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/gson/GUIDTypeAdapterTest.java
