lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #297 from andylizi/switch-to-https

Browse Source 
Switch to Https for most links.
This commit is contained in:
huanghongxun
2018-03-05 20:57:30 +08:00
committed by GitHub
parent eb1a109afc 57d3275856
commit ce83f3c5e1
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
HMCL/src/main/java/org/jackhuang/hmcl/Main.java
View File

@@ -36,4 +36,5 @@ public final class Main {
} else } else
Launcher.main(args); Launcher.main(args);
} }
} }

4
HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java
View File

@@ -71,7 +71,7 @@ public final class UpdateChecker {
return; return;
if (value == null) { if (value == null) {
versionString = NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update.php?version=" + Launcher.VERSION)); versionString = NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/update.php?version=" + Launcher.VERSION));
value = VersionNumber.asVersion(versionString); value = VersionNumber.asVersion(versionString);
} }
@@ -115,7 +115,7 @@ public final class UpdateChecker {
public void execute() { public void execute() {
if (download_link == null) if (download_link == null)
try { try {
download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update_link.php")), Map.class); download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/update_link.php")), Map.class);
} catch (JsonSyntaxException | IOException e) { } catch (JsonSyntaxException | IOException e) {
Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e); Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e);
} }

2
HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java
View File

@@ -113,7 +113,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
map.put("version", Launcher.VERSION); map.put("version", Launcher.VERSION);
map.put("log", Logging.getLogs()); map.put("log", Logging.getLogs());
try { try {
String response = NetworkUtils.doPost(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/crash.php"), map); String response = NetworkUtils.doPost(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/crash.php"), map);
if (StringUtils.isNotBlank(response)) if (StringUtils.isNotBlank(response))
Logging.LOG.log(Level.SEVERE, "Crash server response: " + response); Logging.LOG.log(Level.SEVERE, "Crash server response: " + response);
} catch (IOException ex) { } catch (IOException ex) {

12
HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java
View File

@@ -35,27 +35,27 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
@Override @Override
public String getLibraryBaseURL() { public String getLibraryBaseURL() {
return "http://bmclapi2.bangbang93.com/libraries/"; return "https://bmclapi2.bangbang93.com/libraries/";
} }
@Override @Override
public String getVersionListURL() { public String getVersionListURL() {
return "http://bmclapi2.bangbang93.com/mc/game/version_manifest.json"; return "https://bmclapi2.bangbang93.com/mc/game/version_manifest.json";
} }
@Override @Override
public String getVersionBaseURL() { public String getVersionBaseURL() {
return "http://bmclapi2.bangbang93.com/versions/"; return "https://bmclapi2.bangbang93.com/versions/";
} }
@Override @Override
public String getAssetIndexBaseURL() { public String getAssetIndexBaseURL() {
return "http://bmclapi2.bangbang93.com/indexes/"; return "https://bmclapi2.bangbang93.com/indexes/";
} }
@Override @Override
public String getAssetBaseURL() { public String getAssetBaseURL() {
return "http://bmclapi2.bangbang93.com/assets/"; return "https://bmclapi2.bangbang93.com/assets/";
} }
@Override @Override
@@ -80,7 +80,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
.replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com") .replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
.replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com") .replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com")
.replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries") .replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries")
.replace("http://files.minecraftforge.net/maven", "https://bmclapi2.bangbang93.com/maven") .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven")
.replace("http://dl.liteloader.com/versions/versions.json", "https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json") .replace("http://dl.liteloader.com/versions/versions.json", "https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json")
.replace("http://dl.liteloader.com/versions", "https://bmclapi2.bangbang93.com/maven"); .replace("http://dl.liteloader.com/versions", "https://bmclapi2.bangbang93.com/maven");
} }

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/CurseCDNDownloadProvider.java
View File

@@ -26,6 +26,6 @@ public class CurseCDNDownloadProvider extends MojangDownloadProvider {
@Override @Override
public String injectURL(String baseURL) { public String injectURL(String baseURL) {
return baseURL == null ? null : baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven"); return baseURL == null ? null : baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://ftb.cursecdn.com/FTB2/maven");
} }
} }

12
HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java
View File

@@ -46,17 +46,17 @@ public class MojangDownloadProvider implements DownloadProvider {
@Override @Override
public String getVersionBaseURL() { public String getVersionBaseURL() {
return "http://s3.amazonaws.com/Minecraft.Download/versions/"; return "https://s3.amazonaws.com/Minecraft.Download/versions/";
} }
@Override @Override
public String getAssetIndexBaseURL() { public String getAssetIndexBaseURL() {
return "http://s3.amazonaws.com/Minecraft.Download/indexes/"; return "https://s3.amazonaws.com/Minecraft.Download/indexes/";
} }
@Override @Override
public String getAssetBaseURL() { public String getAssetBaseURL() {
return "http://resources.download.minecraft.net/"; return "https://resources.download.minecraft.net/";
} }
@Override @Override
@@ -80,12 +80,12 @@ public class MojangDownloadProvider implements DownloadProvider {
if (baseURL == null) if (baseURL == null)
return null; return null;
//else if (baseURL.contains("scala-swing") || baseURL.contains("scala-xml") || baseURL.contains("scala-parser-combinators")) //else if (baseURL.contains("scala-swing") || baseURL.contains("scala-xml") || baseURL.contains("scala-parser-combinators"))
// return baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven"); // return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://bmclapi2.bangbang93.com/maven");
/*else if (baseURL.contains("typesafe") || baseURL.contains("scala")) /*else if (baseURL.contains("typesafe") || baseURL.contains("scala"))
if (isChina) if (isChina)
return baseURL.replace("http://files.minecraftforge.net/maven", "http://maven.aliyun.com/nexus/content/groups/public"); return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "http://maven.aliyun.com/nexus/content/groups/public");
else else
return baseURL.replace("http://files.minecraftforge.net/maven", "http://repo1.maven.org/maven2"); return baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://repo1.maven.org/maven2");
*/else */else
return baseURL; return baseURL;
} }

2
HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeVersionList.java
View File

@@ -92,5 +92,5 @@ public final class ForgeVersionList extends VersionList<Void> {
}; };
} }
public static final String FORGE_LIST = "http://files.minecraftforge.net/maven/net/minecraftforge/forge/json"; public static final String FORGE_LIST = "https://files.minecraftforge.net/maven/net/minecraftforge/forge/json";
} }

4
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineBMCLVersionList.java
View File

@@ -42,7 +42,7 @@ public final class OptiFineBMCLVersionList extends VersionList<Void> {
@Override @Override
public Task refreshAsync(DownloadProvider downloadProvider) { public Task refreshAsync(DownloadProvider downloadProvider) {
GetTask task = new GetTask(NetworkUtils.toURL("http://bmclapi.bangbang93.com/optifine/versionlist")); GetTask task = new GetTask(NetworkUtils.toURL("https://bmclapi.bangbang93.com/optifine/versionlist"));
return new Task() { return new Task() {
@Override @Override
public Collection<Task> getDependents() { public Collection<Task> getDependents() {
@@ -59,7 +59,7 @@ public final class OptiFineBMCLVersionList extends VersionList<Void> {
String version = element.getType(); String version = element.getType();
if (version == null) if (version == null)
continue; continue;
String mirror = "http://bmclapi2.bangbang93.com/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch(); String mirror = "https://bmclapi2.bangbang93.com/optifine/" + element.getGameVersion() + "/" + element.getType() + "/" + element.getPatch();
if (!duplicates.add(mirror)) if (!duplicates.add(mirror))
continue; continue;

4
HMCLCore/src/main/java/org/jackhuang/hmcl/download/optifine/OptiFineVersionList.java
View File

@@ -52,7 +52,7 @@ public final class OptiFineVersionList extends VersionList<Void> {
@Override @Override
public Task refreshAsync(DownloadProvider downloadProvider) { public Task refreshAsync(DownloadProvider downloadProvider) {
GetTask task = new GetTask(NetworkUtils.toURL("http://optifine.net/downloads")); GetTask task = new GetTask(NetworkUtils.toURL("https://optifine.net/downloads"));
return new Task() { return new Task() {
@Override @Override
public Collection<Task> getDependents() { public Collection<Task> getDependents() {
@@ -116,6 +116,6 @@ public final class OptiFineVersionList extends VersionList<Void> {
result = m.group(1); result = m.group(1);
if (result == null) if (result == null)
throw new IllegalStateException("Cannot find version in " + content); throw new IllegalStateException("Cannot find version in " + content);
return "http://optifine.net/downloadx?f=OptiFine" + result; return "https://optifine.net/downloadx?f=OptiFine" + result;
} }
} }

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/Constants.java
View File

@@ -48,8 +48,8 @@ public final class Constants {
public static final Charset SYSTEM_CHARSET = Charset.forName(OperatingSystem.ENCODING); public static final Charset SYSTEM_CHARSET = Charset.forName(OperatingSystem.ENCODING);
public static final String DEFAULT_LIBRARY_URL = "https://libraries.minecraft.net/"; public static final String DEFAULT_LIBRARY_URL = "https://libraries.minecraft.net/";
public static final String DEFAULT_VERSION_DOWNLOAD_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/"; public static final String DEFAULT_VERSION_DOWNLOAD_URL = "https://s3.amazonaws.com/Minecraft.Download/versions/";
public static final String DEFAULT_INDEX_URL = "http://s3.amazonaws.com/Minecraft.Download/indexes/"; public static final String DEFAULT_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/";
public static Consumer<Runnable> UI_THREAD_SCHEDULER = s -> Schedulers.computation().schedule(s::run); public static Consumer<Runnable> UI_THREAD_SCHEDULER = s -> Schedulers.computation().schedule(s::run);