ModpackConfiguration

Author: ToobLac

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -755,7 +755,7 @@ public LaunchOptions.Builder getLaunchOptions(String version, JavaRuntime javaVe
             try {
                 String jsonText = Files.readString(json);
                 ModpackConfiguration<?> modpackConfiguration = JsonUtils.GSON.fromJson(jsonText, ModpackConfiguration.class);
-                ModpackProvider provider = ModpackHelper.getProviderByType(modpackConfiguration.getType());
+                ModpackProvider provider = ModpackHelper.getProviderByType(modpackConfiguration.type());
                 if (provider != null) provider.injectLaunchOptions(jsonText, builder);
             } catch (IOException | JsonParseException e) {
                 LOG.warning("Failed to parse modpack configuration file " + json, e);

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackInstallTask.java

@@ -67,7 +67,7 @@ public HMCLModpackInstallTask(HMCLGameRepository repository, Path zipFile, Modpa
             if (Files.exists(json)) {
                 config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(Modpack.class));
 
-                if (!HMCLModpackProvider.INSTANCE.getName().equals(config.getType()))
+                if (!HMCLModpackProvider.INSTANCE.getName().equals(config.type()))
                     throw new IllegalArgumentException("Version " + name + " is not a HMCL modpack. Cannot update this version.");
             }
         } catch (JsonParseException | IOException ignore) {

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -168,7 +168,7 @@ private void launch0() {
                             Task.composeAsync(() -> {
                                 try {
                                     ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
-                                    ModpackProvider provider = ModpackHelper.getProviderByType(configuration.getType());
+                                    ModpackProvider provider = ModpackHelper.getProviderByType(configuration.type());
                                     if (provider == null) return null;
                                     else return provider.createCompletionTask(dependencyManager, selectedVersion);
                                 } catch (IOException e) {

HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java

@@ -236,7 +236,7 @@ else if (modpack.getManifest() instanceof McbbsModpackManifest)
     }
 
     public static Task<Void> getUpdateTask(HMCLGameRepository repository, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
-        switch (configuration.getType()) {
+        switch (configuration.type()) {
             case ServerModpackRemoteInstallTask.MODPACK_TYPE:
                 return new ModpackUpdateTask(repository, name, new ServerModpackRemoteInstallTask(repository.getDependency(), manifest, name))
                         .thenComposeAsync(repository.refreshVersionsAsync())
@@ -248,7 +248,7 @@ public static Task<Void> getUpdateTask(HMCLGameRepository repository, ServerModp
 
     public static Task<?> getUpdateTask(HMCLGameRepository repository, Path zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, ManuallyCreatedModpackException, MismatchedModpackTypeException {
         Modpack modpack = ModpackHelper.readModpackManifest(zipFile, charset);
-        ModpackProvider provider = getProviderByType(configuration.getType());
+        ModpackProvider provider = getProviderByType(configuration.type());
         if (provider == null) {
             throw new UnsupportedModpackException();
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java

@@ -87,7 +87,7 @@ record Result(@Nullable String gameVersion, @Nullable String tag) {
             String modPackVersion = null;
             try {
                 ModpackConfiguration<?> config = repository.readModpackConfiguration(id);
-                modPackVersion = config != null ? config.getVersion() : null;
+                modPackVersion = config != null ? config.version() : null;
             } catch (IOException e) {
                 LOG.warning("Failed to read modpack configuration from " + id, e);
             }

HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/ModpackConfiguration.java

@@ -23,69 +23,34 @@
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Immutable
-public final class ModpackConfiguration<T> implements Validation {
+public record ModpackConfiguration<T>(T manifest, String type, String name, @Nullable String version,
+                                      List<FileInformation> overrides) implements Validation {
 
     @SuppressWarnings("unchecked")
     public static <T> TypeToken<ModpackConfiguration<T>> typeOf(Class<T> clazz) {
         return (TypeToken<ModpackConfiguration<T>>) TypeToken.getParameterized(ModpackConfiguration.class, clazz);
     }
 
-    private final T manifest;
-    private final String type;
-    private final String name;
-    private final String version;
-    private final List<FileInformation> overrides;
-
-    public ModpackConfiguration() {
-        this(null, null, "", null, Collections.emptyList());
-    }
-
-    public ModpackConfiguration(T manifest, String type, String name, String version, List<FileInformation> overrides) {
-        this.manifest = manifest;
-        this.type = type;
-        this.name = name;
-        this.version = version;
-        this.overrides = new ArrayList<>(overrides);
-    }
-
-    public T getManifest() {
-        return manifest;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
+    public ModpackConfiguration {
+        if (name == null) name = "";
+        overrides = overrides == null ? List.of() : List.copyOf(overrides);
     }
 
-    @Nullable
-    public String getVersion() {
-        return version;
-    }
-
-    public ModpackConfiguration<T> setManifest(T manifest) {
+    public ModpackConfiguration<T> withManifest(T manifest) {
         return new ModpackConfiguration<>(manifest, type, name, version, overrides);
     }
 
-    public ModpackConfiguration<T> setOverrides(List<FileInformation> overrides) {
+    public ModpackConfiguration<T> withOverrides(List<FileInformation> overrides) {
         return new ModpackConfiguration<>(manifest, type, name, version, overrides);
     }
 
-    public ModpackConfiguration<T> setVersion(String version) {
+    public ModpackConfiguration<T> withVersion(String version) {
         return new ModpackConfiguration<>(manifest, type, name, version, overrides);
     }
 
-    public List<FileInformation> getOverrides() {
-        return Collections.unmodifiableList(overrides);
-    }
-
     @Override
     public void validate() throws JsonParseException {
         if (manifest == null)
@@ -94,43 +59,16 @@ public void validate() throws JsonParseException {
             throw new JsonParseException("MinecraftInstanceConfiguration missing `type`");
     }
 
+    /**
+     * @param path the relative path to Minecraft run directory.
+     */
     @Immutable
-    public static class FileInformation implements Validation {
-        private final String path; // relative
-        private final String hash;
-        private final String downloadURL;
-
-        public FileInformation() {
-            this(null, null);
-        }
+    public record FileInformation(String path, String hash, @Nullable String downloadURL) implements Validation {
 
         public FileInformation(String path, String hash) {
             this(path, hash, null);
         }
 
-        public FileInformation(String path, String hash, String downloadURL) {
-            this.path = path;
-            this.hash = hash;
-            this.downloadURL = downloadURL;
-        }
-
-        /**
-         * The relative path to Minecraft run directory
-         *
-         * @return the relative path to Minecraft run directory.
-         */
-        public String getPath() {
-            return path;
-        }
-
-        public String getDownloadURL() {
-            return downloadURL;
-        }
-
-        public String getHash() {
-            return hash;
-        }
-
         @Override
         public void validate() throws JsonParseException {
             if (path == null)

HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/ModpackInstallTask.java

@@ -54,7 +54,7 @@ public ModpackInstallTask(Path modpackFile, Path dest, Charset charset, List<Str
         if (oldConfiguration == null)
             overrides = Collections.emptyList();
         else
-            overrides = oldConfiguration.getOverrides();
+            overrides = oldConfiguration.overrides();
     }
 
     @Override
@@ -64,7 +64,7 @@ public void execute() throws Exception {
 
         HashMap<String, ModpackConfiguration.FileInformation> files = new HashMap<>();
         for (ModpackConfiguration.FileInformation file : overrides)
-            files.put(file.getPath(), file);
+            files.put(file.path(), file);
 
 
         for (String subDirectory : subDirectories) {
@@ -88,16 +88,16 @@ public void execute() throws Exception {
                             // If both old and new modpacks have this entry, and user has modified this file,
                             // we will not replace it since this modified file is what user expects.
                             String fileHash = DigestUtils.digestToString("SHA-1", destFile);
-                            String oldHash = files.get(relativePath).getHash();
+                            String oldHash = files.get(relativePath).hash();
                             return Objects.equals(oldHash, fileHash);
                         }
                     }).unzip();
         }
 
         // If old modpack have this entry, and new modpack deleted it. Delete this file.
         for (ModpackConfiguration.FileInformation file : overrides) {
-            Path original = dest.resolve(file.getPath());
-            if (Files.exists(original) && !entries.contains(file.getPath()))
+            Path original = dest.resolve(file.path());
+            if (Files.exists(original) && !entries.contains(file.path()))
                 Files.deleteIfExists(original);
         }
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/curse/CurseInstallTask.java

@@ -107,7 +107,7 @@ public CurseInstallTask(DefaultDependencyManager dependencyManager, Path zipFile
             if (Files.exists(json)) {
                 config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(CurseManifest.class));
 
-                if (!CurseModpackProvider.INSTANCE.getName().equals(config.getType()))
+                if (!CurseModpackProvider.INSTANCE.getName().equals(config.type()))
                     throw new IllegalArgumentException("Version " + name + " is not a Curse modpack. Cannot update this version.");
             }
         } catch (JsonParseException | IOException ignore) {
@@ -172,7 +172,7 @@ public void execute() throws Exception {
             // resolves those file names and writes the enriched manifest to
             // manifest.json, so read from there when available.
             Path oldManifestFile = repository.getVersionRoot(name).resolve("manifest.json");
-            List<CurseManifestFile> oldFiles = config.getManifest().files();
+            List<CurseManifestFile> oldFiles = config.manifest().files();
             if (Files.exists(oldManifestFile)) {
                 try {
                     CurseManifest oldManifest = JsonUtils.fromJsonFile(oldManifestFile, CurseManifest.class);

HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackCompletionTask.java

@@ -89,7 +89,7 @@ public CompletableFuture<Void> getFuture(TaskCompletableFuture executor) {
                     throw new IOException("Malformed modpack configuration");
                 }
             }
-            manifest = configuration.getManifest();
+            manifest = configuration.manifest();
             if (manifest == null) throw new CustomException();
         })).thenComposeAsync(unused -> {
             // we first download latest manifest
@@ -173,7 +173,7 @@ public CompletableFuture<Void> getFuture(TaskCompletableFuture executor) {
             })).thenAcceptAsync(wrapConsumer(unused1 -> {
                 Path manifestFile = repository.getModpackConfiguration(version);
                 JsonUtils.writeToJsonFile(manifestFile,
-                        new ModpackConfiguration<>(manifest, this.configuration.getType(), this.manifest.getName(), this.manifest.getVersion(),
+                        new ModpackConfiguration<>(manifest, this.configuration.type(), this.manifest.getName(), this.manifest.getVersion(),
                                 this.manifest.getFiles().stream()
                                         .flatMap(file -> file instanceof McbbsModpackManifest.AddonFile
                                                 ? Stream.of((McbbsModpackManifest.AddonFile) file)
@@ -237,7 +237,7 @@ public CompletableFuture<Void> getFuture(TaskCompletableFuture executor) {
                                         .collect(Collectors.toList()));
 
                         manifest = newManifest;
-                        configuration = configuration.setManifest(newManifest);
+                        configuration = configuration.withManifest(newManifest);
                         JsonUtils.writeToJsonFile(configurationFile, configuration);
 
                         for (McbbsModpackManifest.File file : newManifest.getFiles())

HMCLCore/src/main/java/org/jackhuang/hmcl/modpack/mcbbs/McbbsModpackLocalInstallTask.java

@@ -81,7 +81,7 @@ public McbbsModpackLocalInstallTask(DefaultDependencyManager dependencyManager,
             if (Files.exists(json)) {
                 config = JsonUtils.fromJsonFile(json, ModpackConfiguration.typeOf(McbbsModpackManifest.class));
 
-                if (!McbbsModpackProvider.INSTANCE.getName().equals(config.getType()))
+                if (!McbbsModpackProvider.INSTANCE.getName().equals(config.type()))
                     throw new IllegalArgumentException("Version " + name + " is not a Mcbbs modpack. Cannot update this version.");
             }
         } catch (JsonParseException | IOException ignore) {