From bba82f5e246ad771ac9e1c9f62b756296ac52924 Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Mon, 29 Jun 2015 18:17:27 +0800
Subject: [PATCH] Mojang Download Source: https -> http

---
 HMCL/proguard.pro                                         | 2 +-
 .../launcher/utils/download/MojangDownloadProvider.java   | 6 +++---
 .../utils/installers/forge/bmcl/ForgeBMCLVersionList.java | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HMCL/proguard.pro b/HMCL/proguard.pro
index f51d49365..a972927cc 100644
--- a/HMCL/proguard.pro
+++ b/HMCL/proguard.pro
@@ -72,7 +72,7 @@
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersion { public <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.launcher.utils.installers.liteloader.LiteLoaderVersionsMeta { public <fields>; }
 
--keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { public <fields>; }
+-keepclassmembers class org.jackhuang.hellominecraft.utils.JdkVersion { private <fields>; }
 
 -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteLatestVersion { public <fields>; }
 -keepclassmembers class org.jackhuang.hellominecraft.version.MinecraftRemoteVersion { public <fields>; }
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java
index 111597a54..9ec14947f 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/download/MojangDownloadProvider.java
@@ -54,17 +54,17 @@ public class MojangDownloadProvider implements IDownloadProvider {
 
     @Override
     public String getVersionsDownloadURL() {
-        return "https://s3.amazonaws.com/Minecraft.Download/versions/";
+        return "http://s3.amazonaws.com/Minecraft.Download/versions/";
     }
 
     @Override
     public String getIndexesDownloadURL() {
-        return "https://s3.amazonaws.com/Minecraft.Download/indexes/";
+        return "http://s3.amazonaws.com/Minecraft.Download/indexes/";
     }
 
     @Override
     public String getVersionsListDownloadURL() {
-        return "https://s3.amazonaws.com/Minecraft.Download/versions/versions.json";
+        return "http://s3.amazonaws.com/Minecraft.Download/versions/versions.json";
     }
 
     @Override
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/bmcl/ForgeBMCLVersionList.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/bmcl/ForgeBMCLVersionList.java
index 9d59dd5f8..e86517009 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/bmcl/ForgeBMCLVersionList.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/installers/forge/bmcl/ForgeBMCLVersionList.java
@@ -50,8 +50,8 @@ public class ForgeBMCLVersionList extends InstallerVersionList {
     @Override
     public void refreshList(String[] neededVersions) throws Exception {
         if(versionMap == null) {
-            versionMap = new HashMap<String, List<InstallerVersion>>();
-            versions = new ArrayList<InstallerVersion>();
+            versionMap = new HashMap<>();
+            versions = new ArrayList<>();
         }
         
         for (String x : neededVersions) {
@@ -69,13 +69,13 @@ public class ForgeBMCLVersionList extends InstallerVersionList {
 
                     List<InstallerVersion> al = ArrayUtils.tryGetMapWithList(versionMap, StrUtils.formatVersion(v.minecraft));
                     iv.changelog = v.downloads.changelog;
-                    iv.installer = "http://bmclapi.bangbang93.com/forge/getforge/" + iv.mcVersion + "/" + iv.selfVersion;
+                    iv.installer = ArrayUtils.getEnd(v.downloads.installer);
                     iv.universal = ArrayUtils.getEnd(v.downloads.universal);
                     al.add(iv);
                     versions.add(iv);
                 }
             } catch(JsonSyntaxException e) {
-                HMCLog.warn("Failed to parse BMCLAPI response.", e);
+                HMCLog.warn("Failed to parse BMCLAPI2 response.", e);
             }
         }
         Collections.sort(versions, new InstallerVersionComparator());