Add some sanitizers for companion app version comparison

Minecraft-TA · May 20, 2023 · c452a8f · c452a8f
1 parent 62ee510
commit c452a8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -235,7 +235,7 @@ if (enableModernJavaSyntax.toBoolean()) {
         if (it.name in ["compileMcLauncherJava", "compilePatchedMcJava"]) {
             return
         }
-        sourceCompatibility = 17 // for the IDE support
+        sourceCompatibility = 8 // for the IDE support
         options.release.set(8)
 
         javaCompiler.set(javaToolchains.compilerFor {

diff --git a/src/main/java/com/github/minecraft_ta/totaldebug/companionApp/CompanionApp.java b/src/main/java/com/github/minecraft_ta/totaldebug/companionApp/CompanionApp.java
@@ -350,7 +350,7 @@ private void downloadCompanionApp(String version) {
 
             TotalDebug.LOGGER.info("Successfully downloaded companion app version {}", version);
         } catch (IOException e) {
-            TotalDebug.LOGGER.error("Unable to download and unzip file", e);
+            TotalDebug.LOGGER.error("Unable to reach github. Does this release exist? " + version, e);
         }
     }
 
@@ -534,6 +534,11 @@ private void loadNewestCompanionAppVersion() {
         }
 
         private static boolean areVersionsCompatible(String totalDebugVersion, String companionAppVersion) {
+            if (totalDebugVersion.contains("-")) // Dev environment
+                totalDebugVersion = totalDebugVersion.substring(0, totalDebugVersion.indexOf("-"));
+            if (companionAppVersion.startsWith("v")) // Migration
+                companionAppVersion = companionAppVersion.substring(1);
+
             String[] totalDebugVersionSplit = StringUtils.split(totalDebugVersion, '.');
             String[] companionAppVersionSplit = StringUtils.split(companionAppVersion, '.');