From a07ad2c47097a5fddd005f3a5f7aa2b09eaa3506 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 14 Mar 2018 16:07:24 +1100 Subject: [PATCH] Use https --- build.gradle | 2 +- core/src/main/java/com/boydti/fawe/config/Settings.java | 4 ++-- core/src/main/java/com/boydti/fawe/util/Updater.java | 6 +++--- .../java/com/sk89q/worldedit/command/ClipboardCommands.java | 2 +- .../java/com/sk89q/worldedit/command/WorldEditCommands.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 8e08b294..d1098e2f 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ subprojects { maven {url "https://repo.destroystokyo.com/repository/maven-public//"} maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" } 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 "http://maven.sk89q.com/repo/"} maven {url "http://repo.maven.apache.org/maven2"} diff --git a/core/src/main/java/com/boydti/fawe/config/Settings.java b/core/src/main/java/com/boydti/fawe/config/Settings.java index 917bec4b..dff4272e 100644 --- a/core/src/main/java/com/boydti/fawe/config/Settings.java +++ b/core/src/main/java/com/boydti/fawe/config/Settings.java @@ -329,13 +329,13 @@ public class Settings extends Config { " - Downloads can be deleted by the user", " - Supports clipboard uploads, downloads and saves", }) - public String URL = "http://empcraft.com/fawe/"; + public String URL = "https://empcraft.com/fawe/"; @Comment({ "The web interface for assets", " - All schematics are organized and public", " - 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 { diff --git a/core/src/main/java/com/boydti/fawe/util/Updater.java b/core/src/main/java/com/boydti/fawe/util/Updater.java index 44467542..4f05cbb1 100644 --- a/core/src/main/java/com/boydti/fawe/util/Updater.java +++ b/core/src/main/java/com/boydti/fawe/util/Updater.java @@ -16,7 +16,7 @@ public class Updater { public String getChanges() { 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(); } catch (IOException e) { e.printStackTrace(); @@ -36,7 +36,7 @@ public class Updater { } try { 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)); try (Scanner reader = new Scanner(url.openStream())) { String versionString = reader.next(); @@ -63,7 +63,7 @@ public class Updater { } outFile.renameTo(finalFile); 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)); } } } diff --git a/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java b/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java index cfd38bb0..935e3612 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/ClipboardCommands.java @@ -315,7 +315,7 @@ public class ClipboardCommands extends MethodCommands { String urlText = url.toString(); if (Settings.IMP.WEB.SHORTEN_URLS) { 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) { e.printStackTrace(); } diff --git a/core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 083b560f..0b2252f6 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -131,7 +131,7 @@ public class WorldEditCommands { Updater updater = Fawe.get().getUpdater(); String changes = updater != null ? updater.getChanges() : 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(); } }