Fixed BMCLAPI

HMCL-dev · Mar 6, 2016 · 2eaf32b · 2eaf32b
1 parent 5899c73
commit 2eaf32b
Show file tree

Hide file tree

Showing 16 changed files with 156 additions and 163 deletions.
diff --git a/...ain/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java b/...ain/java/org/jackhuang/hellominecraft/launcher/core/download/BMCLAPIDownloadProvider.java
@@ -57,7 +57,7 @@ public String getIndexesDownloadURL() {
 
     @Override
     public String getVersionsListDownloadURL() {
-        return "http://bmclapi2.bangbang93.com/versions/versions.json";
+        return "http://bmclapi2.bangbang93.com/mc/game/version_manifest.json";
     }
 
     @Override
@@ -66,13 +66,17 @@ public String getAssetsDownloadURL() {
     }
 
     @Override
-    public String getParsedLibraryDownloadURL(String str) {
-        return str == null ? null : str.replace("http://files.minecraftforge.net/maven", "http://bmclapi2.bangbang93.com/maven");
+    public String getParsedDownloadURL(String str) {
+        return str == null ? null
+               : str.replace("https://launchermeta.mojang.com", "http://bmclapi2.bangbang93.com")
+            .replace("https://launcher.mojang.com", "http://bmclapi2.bangbang93.com")
+            .replace("https://libraries.minecraft.net", "http://bmclapi2.bangbang93.com/libraries")
+            .replace("http://files.minecraftforge.net/maven", "http://bmclapi2.bangbang93.com/maven");
     }
 
     @Override
     public boolean isAllowedToUseSelfURL() {
-        return false;
+        return true;
     }
 
 }
diff --git a/.../main/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java b/.../main/java/org/jackhuang/hellominecraft/launcher/core/download/CurseDownloadProvider.java
@@ -24,7 +24,7 @@
 public class CurseDownloadProvider extends MojangDownloadProvider {
 
     @Override
-    public String getParsedLibraryDownloadURL(String str) {
+    public String getParsedDownloadURL(String str) {
         return str == null ? null : str.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven/");
     }
 

diff --git a/.../src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java b/.../src/main/java/org/jackhuang/hellominecraft/launcher/core/download/IDownloadProvider.java
@@ -55,7 +55,15 @@ public InstallerVersionList getInstallerByType(InstallerType type) {
 
     public abstract String getAssetsDownloadURL();
 
-    public abstract String getParsedLibraryDownloadURL(String str);
+    /**
+     * For example, minecraft.json/assetIndex/url or
+     * minecraft.json/downloads/client/url
+     *
+     * @param str baseURL
+     *
+     * @return parsedURL
+     */
+    public abstract String getParsedDownloadURL(String str);
 
     public abstract boolean isAllowedToUseSelfURL();
 }
diff --git a/...in/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java b/...in/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java
@@ -21,6 +21,7 @@
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -31,11 +32,9 @@
 import org.jackhuang.hellominecraft.launcher.core.version.GameDownloadInfo;
 import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.util.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.util.func.Function;
 import org.jackhuang.hellominecraft.util.system.FileUtils;
-import org.jackhuang.hellominecraft.util.tasks.DoingDoneListener;
 import org.jackhuang.hellominecraft.util.tasks.Task;
 import org.jackhuang.hellominecraft.util.tasks.TaskInfo;
 
@@ -60,7 +59,7 @@ public List<DownloadLibraryJob> getDownloadLibraries(MinecraftVersion mv) throws
                 if (l.allow()) {
                     File ff = l.getFilePath(service.baseDirectory());
                     if (!ff.exists()) {
-                        String libURL = service.getDownloadType().getProvider().getParsedLibraryDownloadURL(l.getDownloadInfo().getUrl(service.getDownloadType()));
+                        String libURL = l.getDownloadInfo().getUrl(service.getDownloadType());
                         if (libURL != null)
                             downloadLibraries.add(new DownloadLibraryJob(l, libURL, ff));
                     }
@@ -71,58 +70,31 @@ public List<DownloadLibraryJob> getDownloadLibraries(MinecraftVersion mv) throws
     @Override
     public Task downloadMinecraft(String id) {
         return new TaskInfo("Download Minecraft") {
+            @Override
+            public Collection<Task> getDependTasks() {
+                return Arrays.asList(downloadMinecraftVersionJson(id));
+            }
+
             @Override
             public void executeTask() throws Throwable {
-                List<MinecraftRemoteVersion> versions = MinecraftRemoteVersions.getRemoteVersions(service.getDownloadType()).justDo();
-                MinecraftRemoteVersion currentVersion = null;
-                for (MinecraftRemoteVersion v : versions)
-                    if (id.equals(v.id)) {
-                        currentVersion = v;
-                        break;
-                    }
-                if (currentVersion == null)
-                    throw new RuntimeException("Cannot find version: " + id + " in remote repository.");
-                String jsonURL = currentVersion.getUrl(service.getDownloadType());
                 File vpath = new File(service.baseDirectory(), "versions/" + id);
-                File mvt = new File(vpath, id + ".json");
+                if (!areDependTasksSucceeded) {
+                    FileUtils.deleteDirectory(vpath);
+                    throw new RuntimeException("Cannot continue because of download failing.");
+                }
                 File mvj = new File(vpath, id + ".jar");
-                if (!vpath.exists() && !vpath.mkdirs())
-                    HMCLog.warn("Failed to make directories: " + vpath);
-                if (mvt.exists() && !mvt.delete())
-                    HMCLog.warn("Failed to delete " + mvt);
                 if (mvj.exists() && !mvj.delete())
                     HMCLog.warn("Failed to delete " + mvj);
-
-                Task t = new FileDownloadTask(jsonURL, mvt).setTag(id + ".json");
-                t.addTaskListener(new DoingDoneListener<Task>() {
-                    @Override
-                    public void onDone(Task k, Collection<Task> taskCollection) {
-                        MinecraftVersion mv;
-                        try {
-                            mv = C.GSON.fromJson(FileUtils.readFileToStringQuietly(mvt), MinecraftVersion.class);
-                            if (mv == null)
-                                throw new JsonSyntaxException("incorrect version");
-                        } catch (JsonSyntaxException ex) {
-                            HMCLog.err("Failed to parse minecraft version json.", ex);
-                            onFailed(k);
-                            return;
-                        }
-                        GameDownloadInfo i = mv.getClientDownloadInfo();
-                        taskCollection.add(new FileDownloadTask(i.getUrl(service.getDownloadType()), mvj, i.sha1)
-                            .setFailedCallbackReturnsNewURL(new DownloadTypeSwitcher(id + "/" + id + ".jar")).setTag(id + ".jar"));
-                    }
-
-                    @Override
-                    public void onDoing(Task k, Collection<Task> taskCollection) {
-                    }
-
-                    @Override
-                    public void onFailed(Task k) {
-                        FileUtils.deleteDirectoryQuietly(vpath);
-                    }
-                });
-
-                afters.add(t);
+                try {
+                    MinecraftVersion mv = C.GSON.fromJson(FileUtils.readFileToStringQuietly(new File(vpath, id + ".json")), MinecraftVersion.class);
+                    if (mv == null)
+                        throw new JsonSyntaxException("incorrect version");
+
+                    afters.add(downloadMinecraftJar(mv, mvj));
+                } catch (JsonSyntaxException ex) {
+                    HMCLog.err("Failed to parse minecraft version json.", ex);
+                    FileUtils.deleteDirectory(vpath);
+                }
             }
 
             Collection<Task> afters = new HashSet<>();
@@ -134,34 +106,6 @@ public Collection<Task> getAfterTasks() {
         };
     }
 
-    @Override
-    public boolean downloadMinecraftJar(String id) {
-        String vurl = service.getDownloadType().getProvider().getVersionsDownloadURL() + id + "/";
-        File vpath = new File(service.baseDirectory(), "versions/" + id);
-        File mvv = new File(vpath, id + ".jar"), moved = null;
-        if (mvv.exists()) {
-            moved = new File(vpath, id + "-renamed.jar");
-            if (!mvv.renameTo(moved))
-                HMCLog.warn("Failed to rename " + mvv + " to " + moved);
-        }
-        File mvt = new File(vpath, id + ".jar");
-        if (!vpath.exists() && !vpath.mkdirs())
-            HMCLog.warn("Failed to make version folder " + vpath);
-        if (TaskWindow.factory()
-            .append(new FileDownloadTask(vurl + id + ".jar", mvt).setFailedCallbackReturnsNewURL(new DownloadTypeSwitcher(id + "/" + id + ".jar")).setTag(id + ".jar"))
-            .create()) {
-            if (moved != null && moved.exists() && !moved.delete())
-                HMCLog.warn("Failed to delete " + moved);
-            return true;
-        } else {
-            if (mvt.exists() && !mvt.delete())
-                HMCLog.warn("Failed to delete game jar " + mvt);
-            if (moved != null && moved.exists() && !moved.renameTo(mvt))
-                HMCLog.warn("Failed to rename " + moved + " to " + mvt);
-            return false;
-        }
-    }
-
     private static class DownloadTypeSwitcher implements Function<Integer, String> {
 
         String suffix;
@@ -178,37 +122,43 @@ public String apply(Integer t) {
     }
 
     @Override
-    public Task downloadMinecraftJarTo(MinecraftVersion mv, File mvt) {
-        String jar = mv.jar == null ? mv.id : mv.jar;
+    public Task downloadMinecraftJar(MinecraftVersion mv, File mvj) {
         GameDownloadInfo i = mv.getClientDownloadInfo();
-        return new FileDownloadTask(i.getUrl(service.getDownloadType(), true), mvt, i.sha1).setTag(jar + ".jar");
+        return new FileDownloadTask(i.getUrl(service.getDownloadType()), mvj, i.sha1)
+            .setFailedCallbackReturnsNewURL(new DownloadTypeSwitcher(mv.id + "/" + mv.id + ".jar")).setTag(mv.id + ".jar");
     }
 
     @Override
-    public boolean downloadMinecraftVersionJson(String id) {
-        String vurl = service.getDownloadType().getProvider().getVersionsDownloadURL() + id + "/";
-        File vpath = new File(service.baseDirectory(), "versions/" + id);
-        File mvv = new File(vpath, id + ".json"), moved = null;
-        if (mvv.exists()) {
-            moved = new File(vpath, id + "-renamed.json");
-            if (!mvv.renameTo(moved))
-                HMCLog.warn("Failed to rename " + mvv + " to " + moved);
-        }
-        File mvt = new File(vpath, id + ".json");
-        if (!vpath.exists() && !vpath.mkdirs())
-            HMCLog.warn("Failed to make version folder " + vpath);
-        if (TaskWindow.factory()
-            .append(new FileDownloadTask(vurl + id + ".json", mvt).setTag(id + ".json"))
-            .create()) {
-            if (moved != null && moved.exists() && !moved.delete())
-                HMCLog.warn("Failed to delete " + moved);
-            return true;
-        } else {
-            if (mvt.exists() && !mvt.delete())
-                HMCLog.warn("Failed to delete minecraft version json" + mvt);
-            if (moved != null && moved.exists() && !moved.renameTo(mvt))
-                HMCLog.warn("Failed to rename " + moved + " to " + mvt);
-            return false;
-        }
+    public Task downloadMinecraftVersionJson(String id) {
+        return new TaskInfo("Download Minecraft Json") {
+            @Override
+            public void executeTask() throws Throwable {
+                List<MinecraftRemoteVersion> versions = MinecraftRemoteVersions.getRemoteVersions(service.getDownloadType()).justDo();
+                MinecraftRemoteVersion currentVersion = null;
+                for (MinecraftRemoteVersion v : versions)
+                    if (id.equals(v.id)) {
+                        currentVersion = v;
+                        break;
+                    }
+                if (currentVersion == null)
+                    throw new RuntimeException("Cannot find version: " + id + " in remote repository.");
+                String jsonURL = currentVersion.getUrl(service.getDownloadType());
+                File vpath = new File(service.baseDirectory(), "versions/" + id);
+                File mvt = new File(vpath, id + ".json");
+                if (!vpath.exists() && !vpath.mkdirs())
+                    HMCLog.warn("Failed to make directories: " + vpath);
+                if (mvt.exists() && !mvt.delete())
+                    HMCLog.warn("Failed to delete " + mvt);
+
+                afters.add(new FileDownloadTask(jsonURL, mvt).setTag(id + ".json"));
+            }
+
+            Collection<Task> afters = new HashSet<>();
+
+            @Override
+            public Collection<Task> getAfterTasks() {
+                return afters;
+            }
+        };
     }
 }
diff --git a/...main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java b/...main/java/org/jackhuang/hellominecraft/launcher/core/download/MojangDownloadProvider.java
@@ -73,7 +73,7 @@ public boolean isAllowedToUseSelfURL() {
     }
 
     @Override
-    public String getParsedLibraryDownloadURL(String str) {
+    public String getParsedDownloadURL(String str) {
         if (str == null)
             return null;
         else if (str.contains("scala-swing") || str.contains("scala-xml") || str.contains("scala-parser-combinators"))
@@ -86,5 +86,4 @@ else if (str.contains("typesafe") || str.contains("scala"))
         else
             return str;
     }
-
 }
diff --git a/...n/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java b/...n/java/org/jackhuang/hellominecraft/launcher/core/download/RapidDataDownloadProvider.java
@@ -49,7 +49,7 @@ public String getVersionsListDownloadURL() {
     }
 
     @Override
-    public String getParsedLibraryDownloadURL(String str) {
+    public String getParsedDownloadURL(String str) {
         return str == null ? null : str.replace("http://files.minecraftforge.net/maven", "http://mirrors.rapiddata.org/forge/maven");
     }
 

diff --git a/...in/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java b/...in/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java
@@ -64,7 +64,7 @@ public void executeTask() {
                 File filepath = IOUtils.tryGetCanonicalFile(IOUtils.currentDirWithSeparator() + "forge-installer.jar");
                 if (v.installer != null)
                     TaskWindow.factory()
-                        .append(new FileDownloadTask(service.getDownloadType().getProvider().getParsedLibraryDownloadURL(v.installer), filepath).setTag("forge"))
+                        .append(new FileDownloadTask(service.getDownloadType().getProvider().getParsedDownloadURL(v.installer), filepath).setTag("forge"))
                         .append(new ForgeInstaller(service, filepath))
                         .create();
             }

diff --git a/...a/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java b/...a/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionList.java
@@ -51,7 +51,7 @@ public static MinecraftForgeVersionList getInstance() {
     public void refreshList(String[] needed) throws Exception {
         if (root != null)
             return;
-        String s = NetUtils.get(DownloadType.getSuggestedDownloadType().getProvider().getParsedLibraryDownloadURL(C.URL_FORGE_LIST));
+        String s = NetUtils.get(DownloadType.getSuggestedDownloadType().getProvider().getParsedDownloadURL(C.URL_FORGE_LIST));
 
         root = C.GSON.fromJson(s, MinecraftForgeVersionRoot.class);
 
@@ -70,7 +70,7 @@ public void refreshList(String[] needed) throws Exception {
                     if (!StrUtils.isBlank(v.branch))
                         ver = ver + "-" + v.branch;
                     String filename = root.artifact + "-" + ver + "-" + f[1] + "." + f[0];
-                    String url = DownloadType.getSuggestedDownloadType().getProvider().getParsedLibraryDownloadURL(root.webpath + ver + "/" + filename);
+                    String url = DownloadType.getSuggestedDownloadType().getProvider().getParsedDownloadURL(root.webpath + ver + "/" + filename);
                     switch (f[1]) {
                     case "installer":
                         iv.installer = url;

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/mod/ModpackManager.java
@@ -168,7 +168,7 @@ else if (newFile.isFile())
                     if (mv.jar == null)
                         throw new FileNotFoundException(C.i18n("modpack.incorrect_format.no_jar"));
 
-                    c.add(service.download().downloadMinecraftJarTo(mv, new File(nowFile, id + ".jar")));
+                    c.add(service.download().downloadMinecraftJar(mv, new File(nowFile, id + ".jar")));
                     mv.jar = null;
                     FileUtils.writeStringToFile(json, C.GSON.toJson(mv));
                     if (!json.renameTo(new File(nowFile, id + ".json")))

diff --git a/...in/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java b/...in/java/org/jackhuang/hellominecraft/launcher/core/service/IMinecraftDownloadService.java
@@ -22,9 +22,7 @@
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.download.DownloadLibraryJob;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
-import org.jackhuang.hellominecraft.util.OverridableSwingWorker;
 import org.jackhuang.hellominecraft.util.tasks.Task;
-import org.jackhuang.hellominecraft.launcher.core.download.MinecraftRemoteVersion;
 
 /**
  *
@@ -38,11 +36,9 @@ public IMinecraftDownloadService(IMinecraftService service) {
 
     public abstract Task downloadMinecraft(String id);
 
-    public abstract boolean downloadMinecraftJar(String id);
+    public abstract Task downloadMinecraftJar(MinecraftVersion mv, File f);
 
-    public abstract Task downloadMinecraftJarTo(MinecraftVersion mv, File f);
-
-    public abstract boolean downloadMinecraftVersionJson(String id);
+    public abstract Task downloadMinecraftVersionJson(String id);
 
     /**
      * Get the libraries that need to download.

diff --git a/.../main/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java b/.../main/java/org/jackhuang/hellominecraft/launcher/core/version/AssetIndexDownloadInfo.java
@@ -36,11 +36,8 @@ public AssetIndexDownloadInfo(String id) {
     }
 
     @Override
-    public String getUrl(DownloadType dt, boolean allowSelf) {
-        if (url != null && dt.getProvider().isAllowedToUseSelfURL())
-            return url;
-        else
-            return dt.getProvider().getIndexesDownloadURL() + id + ".json";
+    public String getCustomizedURL(DownloadType dt) {
+        return dt.getProvider().getIndexesDownloadURL() + id + ".json";
     }
 
     public String getId() {

diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java
@@ -55,9 +55,13 @@ public String getUrl(DownloadType dt) {
      */
     public String getUrl(DownloadType dt, boolean allowSelf) {
         if (url != null && allowSelf)
-            return url;
+            return dt.getProvider().getParsedDownloadURL(url);
         else
-            return dt.getProvider().getVersionsDownloadURL() + id + "/" + id + ".jar";
+            return getCustomizedURL(dt);
+    }
+
+    protected String getCustomizedURL(DownloadType dt) {
+        return dt.getProvider().getVersionsDownloadURL() + id + "/" + id + ".jar";
     }
 
     @Override