diff --git a/build.gradle b/build.gradle index 9b61412..b9c4bda 100644 --- 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 index 723f856..f9c9334 100644 --- 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, '.');