Fix NPE

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

@@ -63,7 +63,7 @@ public class DefaultCacheRepository extends CacheRepository {
         lock.writeLock().lock();
         try {
             if (Files.isRegularFile(indexFile))
-                index = JsonUtils.GSON.fromJson(FileUtils.readText(indexFile.toFile()), Index.class);
+                index = JsonUtils.fromNonNullJson(FileUtils.readText(indexFile.toFile()), Index.class);
             else
                 index = new Index();
         } catch (IOException | JsonParseException e) {
@@ -240,13 +240,13 @@ public class DefaultCacheRepository extends CacheRepository {
         }
     }
 
-    private class LibraryIndex {
+    private class LibraryIndex implements Validation {
         private final String name;
         private final String hash;
         private final String type;
 
         public LibraryIndex() {
-            this(null, null, null);
+            this("", "", "");
         }
 
         public LibraryIndex(String name, String hash, String type) {
@@ -255,18 +255,27 @@ public class DefaultCacheRepository extends CacheRepository {
             this.type = type;
         }
 
+        @NotNull
         public String getName() {
             return name;
         }
 
+        @NotNull
         public String getHash() {
             return hash;
         }
 
+        @NotNull
         public String getType() {
             return type;
         }
 
+        @Override
+        public void validate() throws JsonParseException, TolerableValidationException {
+            if (name == null || hash == null || type == null)
+                throw new JsonParseException("Index.LibraryIndex.* cannot be null");
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;

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

@@ -23,11 +23,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -99,7 +95,7 @@ public final class Arguments {
     }
 
     public static List<String> parseStringArguments(List<String> arguments, Map<String, String> keys) {
-        return arguments.stream().flatMap(str -> new StringArgument(str).toString(keys, Collections.emptyMap()).stream()).collect(Collectors.toList());
+        return arguments.stream().filter(Objects::nonNull).flatMap(str -> new StringArgument(str).toString(keys, Collections.emptyMap()).stream()).collect(Collectors.toList());
     }
 
     public static List<String> parseArguments(List<Argument> arguments, Map<String, String> keys) {
@@ -107,7 +103,7 @@ public final class Arguments {
     }
 
     public static List<String> parseArguments(List<Argument> arguments, Map<String, String> keys, Map<String, Boolean> features) {
-        return arguments.stream().flatMap(arg -> arg.toString(keys, features).stream()).collect(Collectors.toList());
+        return arguments.stream().filter(Objects::nonNull).flatMap(arg -> arg.toString(keys, features).stream()).collect(Collectors.toList());
     }
 
     public static final List<Argument> DEFAULT_JVM_ARGUMENTS;

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

@@ -24,5 +24,7 @@ package org.jackhuang.hmcl.game;
 public enum DownloadType {
     CLIENT,
     SERVER,
-    WINDOWS_SERVER
+    WINDOWS_SERVER,
+    CLIENT_MAPPINGS,
+    SERVER_MAPPINGS
 }

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

@@ -23,10 +23,7 @@ import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.util.Immutable;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +66,7 @@ public class RuledArgument implements Argument {
     public List<String> toString(Map<String, String> keys, Map<String, Boolean> features) {
         if (CompatibilityRule.appliesToCurrentEnvironment(rules, features) && value != null)
             return value.stream()
+                    .filter(Objects::nonNull)
                     .map(StringArgument::new)
                     .map(str -> str.toString(keys, features).get(0))
                     .collect(Collectors.toList());

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

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.ToStringBuilder;
+import org.jackhuang.hmcl.util.gson.JsonMap;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jetbrains.annotations.Nullable;
 
@@ -60,8 +61,8 @@ public class Version implements Comparable<Version>, Validation {
     private final String assets;
     private final List<Library> libraries;
     private final List<CompatibilityRule> compatibilityRules;
-    private final Map<DownloadType, DownloadInfo> downloads;
-    private final Map<DownloadType, LoggingInfo> logging;
+    private final JsonMap<DownloadType, DownloadInfo> downloads;
+    private final JsonMap<DownloadType, LoggingInfo> logging;
     private final ReleaseType type;
     private final Date time;
     private final Date releaseTime;
@@ -103,8 +104,8 @@ public class Version implements Comparable<Version>, Validation {
         this.assets = assets;
         this.libraries = Lang.copyList(libraries);
         this.compatibilityRules = Lang.copyList(compatibilityRules);
-        this.downloads = downloads == null ? null : new HashMap<>(downloads);
-        this.logging = logging == null ? null : new HashMap<>(logging);
+        this.downloads = downloads == null ? null : new JsonMap<>(downloads);
+        this.logging = logging == null ? null : new JsonMap<>(logging);
         this.type = type;
         this.time = time == null ? null : (Date) time.clone();
         this.releaseTime = releaseTime == null ? null : (Date) releaseTime.clone();

HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonMap.java

@@ -0,0 +1,51 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.util.gson;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * To resolve JsonParseException: duplicate key: null
+ * By skipping inserting data with key null
+ * @param <K>
+ * @param <V>
+ */
+public class JsonMap<K, V> extends HashMap<K, V> {
+    public JsonMap(int initialCapacity, float loadFactor) {
+        super(initialCapacity, loadFactor);
+    }
+
+    public JsonMap(int initialCapacity) {
+        super(initialCapacity);
+    }
+
+    public JsonMap() {
+        super();
+    }
+
+    public JsonMap(Map<? extends K, ? extends V> m) {
+        super(m);
+    }
+
+    @Override
+    public V put(K key, V value) {
+        if (key == null) return null;
+        return super.put(key, value);
+    }
+}