From 2553ce82ec7c147fca839c01f3472d054de752ea Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Thu, 9 Feb 2017 13:10:30 +0800 Subject: [PATCH] Fixed #82 --- .../launcher/core/download/MojangDownloadProvider.java | 2 +- .../launcher/core/version/MinecraftLibrary.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java index 815bbe4c9..7fca77d8e 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java @@ -80,7 +80,7 @@ public class MojangDownloadProvider extends IDownloadProvider { return str.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven/"); else if (str.contains("typesafe") || str.contains("scala")) if (SupportedLocales.NOW_LOCALE.self == Locale.CHINA) - return str.replace("http://files.minecraftforge.net/maven", "http://maven.oschina.net/content/groups/public"); + return str.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven/"); else return str.replace("http://files.minecraftforge.net/maven", "http://repo1.maven.org/maven2"); else diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index b041570ca..b523b27d9 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -70,6 +70,8 @@ public class MinecraftLibrary extends IMinecraftLibrary { } private String getNative() { + if (natives == null) + return ""; switch (OS.os()) { case WINDOWS: return formatArch(natives.windows); @@ -86,6 +88,8 @@ public class MinecraftLibrary extends IMinecraftLibrary { } public String formatName() { + if (name == null) + return null; String[] s = name.split(":"); if (s.length < 3) return null; @@ -110,6 +114,8 @@ public class MinecraftLibrary extends IMinecraftLibrary { @Override public LibraryDownloadInfo getDownloadInfo() { + if (name == null) + return null; if (downloads == null) downloads = new LibrariesDownloadInfo(); LibraryDownloadInfo info; @@ -120,7 +126,8 @@ public class MinecraftLibrary extends IMinecraftLibrary { downloads.classifiers.put(getNative(), info = new LibraryDownloadInfo()); else { info = downloads.classifiers.get(getNative()); - if (info == null) info = new LibraryDownloadInfo(); + if (info == null) + info = new LibraryDownloadInfo(); } } else { if (downloads.artifact == null)