修复安装新实例时未将 patch 合并到主 manifest 中的问题 (#6718)

Author: Glavo

HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java

@@ -111,7 +111,7 @@ public Task<?> buildAsync() {
                     GameInstanceManifest.Resolved resolved = draft.getBaseSnapshot().resolve(manifest);
                     return new GameDownloadTask(dependencyManager, resolved.launchManifest())
                             .thenApplyAsync(minecraftJar -> {
-                                draft.put(resolved.standaloneManifest());
+                                draft.put(resolved.launchManifest().withPatches(manifest.patches()));
                                 draft.putPrimaryJar(id, minecraftJar);
                                 return draft.commit().getInstance(id);
                             });

HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java

@@ -638,8 +638,7 @@ public <E extends Exception> Task<Void> updateInstanceAsync(
         return Task.supplyAsync(() -> {
                     GameRepositoryDraft draft = openDraft();
                     active.set(draft);
-                    GameInstance publishedInstance = getInstance(instanceId);
-                    return publishedInstance;
+                    return draft.getBaseSnapshot().getInstance(instanceId);
                 })
                 .thenComposeAsync(updater)
                 .thenApplyAsync(manifest -> {

HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepositoryDraft.java

@@ -91,6 +91,7 @@ public DefaultGameRepository getRepository() {
         return repository;
     }
 
+    @Override
     public DefaultGameRepositorySnapshot getBaseSnapshot() {
         return baseSnapshot;
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameRepositoryDraft.java

@@ -63,6 +63,8 @@ enum State {
     /// @return the repository
     GameRepository getRepository();
 
+    GameRepositorySnapshot getBaseSnapshot();
+
     /// Returns this draft's lifecycle state.
     ///
     /// @return the current state