Merge remote-tracking branch 'origin/master'

BlueTree242 · Dec 24, 2021 · 4a418d7 · 4a418d7
2 parents b972c7e + 7692b33
commit 4a418d7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/Bungee/src/main/java/tk/bluetree242/advancedplhide/bungee/AdvancedPlHideBungee.java b/Bungee/src/main/java/tk/bluetree242/advancedplhide/bungee/AdvancedPlHideBungee.java
@@ -102,8 +102,10 @@ public void loadGroups() {
     public void performStartUpdateCheck() {
         ProxyServer.getInstance().getScheduler().runAsync(this, () -> {
             UpdateCheckResult result = Impl.get().updateCheck();
-            if (result == null) getLogger().severe("Could not check for updates");
-            String msg = result.getVersionsBehind() == 0 ?
+            if (result == null) {
+                getLogger().severe("Could not check for updates");
+                return;
+            }            String msg = result.getVersionsBehind() == 0 ?
                     ChatColor.translateAlternateColorCodes('&', Constants.DEFAULT_UP_TO_DATE) :
                     ChatColor.translateAlternateColorCodes('&', Constants.DEFAULT_BEHIND.replace("{versions}", result.getVersionsBehind() + "")
                             .replace("{download}", result.getUpdateUrl()));

diff --git a/Spigot/src/main/java/tk/bluetree242/advancedplhide/spigot/AdvancedPlHideSpigot.java b/Spigot/src/main/java/tk/bluetree242/advancedplhide/spigot/AdvancedPlHideSpigot.java
@@ -102,8 +102,10 @@ public boolean isLegacy() {
     public void performStartUpdateCheck() {
         Bukkit.getScheduler().runTaskAsynchronously(this, () -> {
             UpdateCheckResult result = Impl.get().updateCheck();
-            if (result == null) getLogger().severe("Could not check for updates");
-            String msg = result.getVersionsBehind() == 0 ?
+            if (result == null) {
+                getLogger().severe("Could not check for updates");
+                return;
+            }            String msg = result.getVersionsBehind() == 0 ?
                     ChatColor.translateAlternateColorCodes('&', Constants.DEFAULT_UP_TO_DATE) :
                     ChatColor.translateAlternateColorCodes('&', Constants.DEFAULT_BEHIND.replace("{versions}", result.getVersionsBehind() + "")
                             .replace("{download}", result.getUpdateUrl()));

diff --git a/Velocity/src/main/java/tk/bluetree242/advancedplhide/velocity/AdvancedPlHideVelocity.java b/Velocity/src/main/java/tk/bluetree242/advancedplhide/velocity/AdvancedPlHideVelocity.java
@@ -159,7 +159,10 @@ public Config getConfig() {
 
     public void performStartUpdateCheck() {
         UpdateCheckResult result = updateCheck();
-        if (result == null) getLogger().error("Could not check for updates");
+        if (result == null) {
+            getLogger().error("Could not check for updates");
+            return;
+        }
         String msg = result.getVersionsBehind() == 0 ?
                 LegacyComponentSerializer.legacy('&').deserialize(Constants.DEFAULT_UP_TO_DATE).content() :
                 LegacyComponentSerializer.legacy('&').deserialize(Constants.DEFAULT_BEHIND.replace("{versions}", result.getVersionsBehind() + "")

diff --git a/build.gradle b/build.gradle
@@ -45,6 +45,7 @@ subprojects {
             filter ReplaceTokens, tokens: [version  : version,
                                            build    : buildNumber,
                                            commit   : commit,
+                                           description: description,
                                            buildDate: System.currentTimeMillis() + ""
             ]
         }

diff --git a/core/build.gradle b/core/build.gradle
@@ -34,6 +34,8 @@ rootProject.allprojects {
         relocate 'space.arim.dazzleconf', "tk.bluetree242.advancedplhide.dependencies.dazzleconf"
         relocate 'org.yaml.snakeyaml', "tk.bluetree242.advancedplhide.dependencies.yaml"
         relocate 'org.json', "tk.bluetree242.advancedplhide.dependencies.json"
+        relocate 'okio', "tk.bluetree242.advancedplhide.dependencies.okio"
+        relocate 'okhttp3', "tk.bluetree242.advancedplhide.dependencies.okhttp"
     }
 }
 
@@ -50,6 +52,8 @@ dependencies {
     implementation 'space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.0-M2'
     compileOnly 'com.mojang:brigadier:1.0.18'
     implementation group: 'org.json', name: 'json', version: '20210307'
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.0"))
+    implementation("com.squareup.okhttp3:okhttp")
 }
 
 

diff --git a/core/src/main/java/tk/bluetree242/advancedplhide/Platform.java b/core/src/main/java/tk/bluetree242/advancedplhide/Platform.java
@@ -22,11 +22,14 @@
 
 package tk.bluetree242.advancedplhide;
 
+import okhttp3.MediaType;
+import okhttp3.MultipartBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import org.json.JSONObject;
 import tk.bluetree242.advancedplhide.config.Config;
 import tk.bluetree242.advancedplhide.exceptions.ConfigurationLoadException;
 import tk.bluetree242.advancedplhide.impl.version.UpdateCheckResult;
-import tk.bluetree242.advancedplhide.utils.HttpPostMultipart;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -92,16 +95,18 @@ public String getBuildDate() {
 
     public UpdateCheckResult updateCheck() {
         try {
+            OkHttpClient client = new OkHttpClient();
             Map<String, String> headers = new HashMap<>();
             headers.put("User-Agent", "APH/Java");
-            HttpPostMultipart req = new HttpPostMultipart("https://advancedplhide.ml/updatecheck", "utf-8", headers);
-            req.addFormField("version", getCurrentVersion());
-            req.addFormField("buildNumber", getCurrentBuild());
-            req.addFormField("buildDate", getBuildDate());
-            req.addFormField("devUpdatechecker", getConfig().dev_updatechecker() + "");
-            String response = req.finish();
+            MultipartBody form = new MultipartBody.Builder().setType(MediaType.get("multipart/form-data"))
+                    .addFormDataPart("version", getCurrentVersion())
+                    .addFormDataPart("buildNumber", getCurrentBuild())
+                    .addFormDataPart("buildDate", getCurrentBuild())
+                    .addFormDataPart("devUpdatechecker", getConfig().dev_updatechecker() + "").build();
+            Request req = new Request.Builder().url("https://advancedplhide.ml/updatecheck").post(form).build();
+            String response = client.newCall(req).execute().body().string();
             JSONObject json = new JSONObject(response);
-            return new UpdateCheckResult(json.getInt("versions_behind"), json.isNull("versions_behind") ? null : json.getString("message"), json.isNull("type") ? "INFO" : json.getString("type"), json.getString("downloadUrl"));
+            return new UpdateCheckResult(json.getInt("versions_behind"), json.isNull("versions_behind") ? null : json.isNull("message") ? null : json.getString("message"), json.isNull("type") ? "INFO" : json.getString("type"), json.getString("downloadUrl"));
         } catch (Exception e) {
             return null;
         }