mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-01-30 14:39:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #605

Browse Source
This commit is contained in:
huanghongxun 2019-09-12 15:51:20 +08:00
parent cf1a66e858
commit bc96afd0cd
3 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCLCore/src/main/java/org/jackhuang/hmcl/game/DownloadType.java
View File

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

9
HMCLCore/src/main/java/org/jackhuang/hmcl/game/Version.java
View File

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

51
HMCLCore/src/main/java/org/jackhuang/hmcl/util/gson/JsonMap.java Normal file
View File

@ -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);
}
}