From bcaa01955198f6d635786f41334c5fe79bfbbb91 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Wed, 6 Feb 2019 15:14:08 +0800 Subject: [PATCH] Only maintain game version json with launchwrapper installed. Forge modlauncher is not supported right now. --- .../java/org/jackhuang/hmcl/download/MaintainTask.java | 10 ++++++++++ .../hmcl/util/gson/ValidationTypeAdapterFactory.java | 1 + 2 files changed, 11 insertions(+) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java index 90f0debe3..156938ff3 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MaintainTask.java @@ -40,6 +40,16 @@ public class MaintainTask extends TaskResult { } public static Version maintain(Version version) { + if (version.getMainClass().contains("launchwrapper")) { + return maintainGameWithLaunchWrapper(version); + } else { + // Vanilla Minecraft does not need maintain + // Forge 1.13.2 support not implemented. + return version; + } + } + + private static Version maintainGameWithLaunchWrapper(Version version) { LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version); VersionLibraryBuilder builder = new VersionLibraryBuilder(version); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ValidationTypeAdapterFactory.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ValidationTypeAdapterFactory.java index 415ec84c5..587bfc362 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ValidationTypeAdapterFactory.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/ValidationTypeAdapterFactory.java @@ -45,6 +45,7 @@ public final class ValidationTypeAdapterFactory implements TypeAdapterFactory { ((Validation) t).validate(); } catch (TolerableValidationException e) { delegate.write(writer, null); + return; } }