diff --git a/Launcher/source/client/ClientLauncher.java b/Launcher/source/client/ClientLauncher.java index 6b452b1..9f28f5a 100644 --- a/Launcher/source/client/ClientLauncher.java +++ b/Launcher/source/client/ClientLauncher.java @@ -123,7 +123,7 @@ // Add classpath and main class Collections.addAll(args, profile.object.getJvmArgs()); String v = profile.object.getVersion(); - if (Version.compare(v, "1.13.2") >= 0 && JVMHelper.OS_TYPE == OS.MACOSX) + if (Version.compare(v, "1.13") >= 0 && JVMHelper.OS_TYPE == OS.MACOSX) Collections.addAll(args, "-XstartOnFirstThread"); Collections.addAll(args, "-classpath", IOHelper.getCodeSource(ClientLauncher.class).toString(), ClientLauncher.class.getName()); args.add(paramsFile.toString()); // Add params file path to args @@ -253,11 +253,14 @@ Collections.addAll(args, "--uuid", toHash(pp.uuid)); Collections.addAll(args, "--accessToken", params.accessToken); - // Add 1.7.10+ args (user properties, asset index) - if (Version.compare(version, "1.7.10") >= 0) + // Add 1.7.3+ args (user properties, asset index) + if (Version.compare(version, "1.7.3") >= 0) { // Add user properties - Collections.addAll(args, "--userType", "mojang"); + if (Version.compare(version, "1.7.4") >= 0) + { + Collections.addAll(args, "--userType", "mojang"); + } JsonObject properties = Json.object(); if (pp.skin != null) { @@ -285,7 +288,7 @@ Collections.addAll(args, "--gameDir", params.clientDir.toString()); Collections.addAll(args, "--assetsDir", params.assetDir.toString()); Collections.addAll(args, "--resourcePackDir", params.clientDir.resolve(RESOURCEPACKS_DIR).toString()); - if (Version.compare(version, "1.9.4") >= 0) + if (Version.compare(version, "1.9.0") >= 0) { // Just to show it in debug screen Collections.addAll(args, "--versionType", "KJ-Launcher v" + Launcher.VERSION); } @@ -327,7 +330,7 @@ // Add client args Collection args = new LinkedList<>(); - if (Version.compare(profile.getVersion(), "1.6.4") >= 0) + if (Version.compare(profile.getVersion(), "1.6.0") >= 0) { addClientArgs(args, profile, params); } diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java index 1045811..e1e78ae 100644 --- a/Launcher/source/client/ClientProfile.java +++ b/Launcher/source/client/ClientProfile.java @@ -95,7 +95,7 @@ @LauncherAPI public FileNameMatcher getAssetUpdateMatcher() { - return Version.compare(getVersion(), "1.7.10") >= 0 ? ASSET_MATCHER : null; + return Version.compare(getVersion(), "1.7.3") >= 0 ? ASSET_MATCHER : null; } @LauncherAPI diff --git a/Launcher/source/client/ServerPinger.java b/Launcher/source/client/ServerPinger.java index 4a62888..14e2d9b 100644 --- a/Launcher/source/client/ServerPinger.java +++ b/Launcher/source/client/ServerPinger.java @@ -100,7 +100,7 @@ try (HInput input = new HInput(socket.getInputStream()); HOutput output = new HOutput(socket.getOutputStream())) { - return Version.compare(version, "1.7.2") >= 0 ? modernPing(input, output) : legacyPing(input, output, Version.compare(version, "1.6.4") >= 0); + return Version.compare(version, "1.7") >= 0 ? modernPing(input, output) : legacyPing(input, output, Version.compare(version, "1.6") >= 0); } } } diff --git a/buildnumber b/buildnumber index 03116e4..1796522 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -514, 09.02.2021 \ No newline at end of file +515, 09.02.2021 \ No newline at end of file