Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use https

This commit is contained in:
Jesse Boyd 2018-03-14 16:07:24 +11:00
parent 3d8fdb021a
commit a07ad2c470
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -100,7 +100,7 @@ subprojects {
maven {url "https://repo.destroystokyo.com/repository/maven-public//"} maven {url "https://repo.destroystokyo.com/repository/maven-public//"}
maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" }
maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"} maven {url "http://ci.athion.net/job/PlotSquared/ws/mvn/"}
maven {url "http://empcraft.com/maven2"} maven {url "https://empcraft.com/maven2"}
maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"} maven {url "https://hub.spigotmc.org/nexus/content/groups/public/"}
maven {url "http://maven.sk89q.com/repo/"} maven {url "http://maven.sk89q.com/repo/"}
maven {url "http://repo.maven.apache.org/maven2"} maven {url "http://repo.maven.apache.org/maven2"}

4
core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -329,13 +329,13 @@ public class Settings extends Config {
" - Downloads can be deleted by the user", " - Downloads can be deleted by the user",
" - Supports clipboard uploads, downloads and saves", " - Supports clipboard uploads, downloads and saves",
}) })
public String URL = "http://empcraft.com/fawe/"; public String URL = "https://empcraft.com/fawe/";
@Comment({ @Comment({
"The web interface for assets", "The web interface for assets",
" - All schematics are organized and public", " - All schematics are organized and public",
" - Assets can be searched, selected and downloaded", " - Assets can be searched, selected and downloaded",
}) })
public String ASSETS = "http://empcraft.com/assetpack/"; public String ASSETS = "https://empcraft.com/assetpack/";
} }
public static class EXTENT { public static class EXTENT {

6
core/src/main/java/com/boydti/fawe/util/Updater.java
View File

@ -16,7 +16,7 @@ public class Updater {
public String getChanges() { public String getChanges() {
if (changes == null) { if (changes == null) {
try (Scanner scanner = new Scanner(new URL("http://empcraft.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8")) { try (Scanner scanner = new Scanner(new URL("https://empcraft.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8")) {
changes = scanner.useDelimiter("\\A").next(); changes = scanner.useDelimiter("\\A").next();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@ -36,7 +36,7 @@ public class Updater {
} }
try { try {
String downloadUrl = "https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/target/FastAsyncWorldEdit-%platform%-%version%.jar"; String downloadUrl = "https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/target/FastAsyncWorldEdit-%platform%-%version%.jar";
String versionUrl = "http://empcraft.com/fawe/version.php?%platform%"; String versionUrl = "https://empcraft.com/fawe/version.php?%platform%";
URL url = new URL(versionUrl.replace("%platform%", platform)); URL url = new URL(versionUrl.replace("%platform%", platform));
try (Scanner reader = new Scanner(url.openStream())) { try (Scanner reader = new Scanner(url.openStream())) {
String versionString = reader.next(); String versionString = reader.next();
@ -63,7 +63,7 @@ public class Updater {
} }
outFile.renameTo(finalFile); outFile.renameTo(finalFile);
Fawe.debug("Updated FAWE to " + versionString); Fawe.debug("Updated FAWE to " + versionString);
MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "http://empcraft.com/fawe/cl?" + Integer.toHexString(currentVersion.hash)); MainUtil.sendAdmin("&7Restart to update FAWE with these changes: &c/fawe changelog &7or&c " + "https://empcraft.com/fawe/cl?" + Integer.toHexString(currentVersion.hash));
} }
} }
} }

2
core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java
View File

@ -315,7 +315,7 @@ public class ClipboardCommands extends MethodCommands {
String urlText = url.toString(); String urlText = url.toString();
if (Settings.IMP.WEB.SHORTEN_URLS) { if (Settings.IMP.WEB.SHORTEN_URLS) {
try { try {
urlText = MainUtil.getText("http://empcraft.com/s/?" + URLEncoder.encode(url.toString(), "UTF-8")); urlText = MainUtil.getText("https://empcraft.com/s/?" + URLEncoder.encode(url.toString(), "UTF-8"));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }

2
core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java
View File

@ -131,7 +131,7 @@ public class WorldEditCommands {
Updater updater = Fawe.get().getUpdater(); Updater updater = Fawe.get().getUpdater();
String changes = updater != null ? updater.getChanges() : null; String changes = updater != null ? updater.getChanges() : null;
if (changes == null) { if (changes == null) {
try (Scanner scanner = new Scanner(new URL("http://empcraft.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8")) { try (Scanner scanner = new Scanner(new URL("https://empcraft.com/fawe/cl?" + Integer.toHexString(Fawe.get().getVersion().hash)).openStream(), "UTF-8")) {
changes = scanner.useDelimiter("\\A").next(); changes = scanner.useDelimiter("\\A").next();
} }
} }