diff --git a/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg b/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg new file mode 100755 index 0000000..c93683d --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.9.4.cfg @@ -0,0 +1,37 @@ +version: "1.9.4"; +assetIndex: "1.9.4"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.9.4"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", "mods", + "minecraft\\.jar", "forge\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.launchwrapper.Launch"; +classPath: [ "forge.jar", "minecraft.jar", "libraries" ]; +jvmArgs: [ + "-Dfml.ignorePatchDiscrepancies=true", + "-Dfml.ignoreInvalidMinecraftCertificates=true", + "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ + "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker" +]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.9.cfg b/LaunchServer/resources/launchserver/defaults/profile1.9.cfg deleted file mode 100755 index f8a3659..0000000 --- a/LaunchServer/resources/launchserver/defaults/profile1.9.cfg +++ /dev/null @@ -1,37 +0,0 @@ -version: "1.9"; -assetIndex: "1.9"; # 1.7.10+ only - -# Runtime-dependent params -dir: "XXXXX"; -assetDir: "asset1.9"; - -# Client params -sortIndex: 0; -title: "XXXXX"; -serverAddress: "server.tld"; -serverPort: 25565; - -# Updater and client watch service -update: [ - "servers\\.dat" -]; -updateVerify: [ - "libraries", "natives", "mods", - "minecraft\\.jar", "forge\\.jar" -]; -updateExclusions: []; - -# Client launcher params -mainClass: "net.minecraft.launchwrapper.Launch"; -classPath: [ "forge.jar", "minecraft.jar", "libraries" ]; -jvmArgs: [ - "-Dfml.ignorePatchDiscrepancies=true", - "-Dfml.ignoreInvalidMinecraftCertificates=true", - "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true", - - # JVM Attach protection - "-XX:+DisableAttachMechanism" -]; -clientArgs: [ - "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker" -]; diff --git a/Launcher/runtime/config.js b/Launcher/runtime/config.js index a80f1d7..a7a8f56 100755 --- a/Launcher/runtime/config.js +++ b/Launcher/runtime/config.js @@ -16,9 +16,9 @@ ramDefault: 1024, // Default RAM amount (0 for auto) // Custom JRE config (!!! DON'T CHANGE !!!) - jvmMustdie32Dir: "jre-8u66-win32", jvmMustdie64Dir: "jre-8u66-win64", - jvmLinux32Dir: "jre-8u66-linux32", jvmLinux64Dir: "jre-8u66-linux64", - jvmMacOSXDir: "jre-8u66-macosx", jvmUnknownDir: "jre-8u66-unknown" + jvmMustdie32Dir: "jre-8u92-win32", jvmMustdie64Dir: "jre-8u92-win64", + jvmLinux32Dir: "jre-8u92-linux32", jvmLinux64Dir: "jre-8u92-linux64", + jvmMacOSXDir: "jre-8u92-macosx", jvmUnknownDir: "jre-8u92-unknown" }; // ====== DON'T TOUCH! ====== // diff --git a/Launcher/source-testing/Kek.java b/Launcher/source-testing/Kek.java deleted file mode 100755 index 119cc4a..0000000 --- a/Launcher/source-testing/Kek.java +++ /dev/null @@ -1,24 +0,0 @@ -package launcher; - -import java.util.Arrays; - -public final class Kek { - private Kek() { - } - - public static void main(String... args) throws Throwable { - char[][] sine = new char[21][250]; - for (char[] aSine : sine) { - Arrays.fill(aSine, ' '); - } - - for (int x = 0; x < 250; x++) { - double pi = StrictMath.PI * 2.0D / 250.0D * x; - sine[(int) ((StrictMath.cos(pi) + 1.0D) / 2.0D * 20)][x] = '.'; - } - - for (char[] aSine : sine) { - System.out.println(aSine); - } - } -} diff --git a/Launcher/source/client/ClientLauncher.java b/Launcher/source/client/ClientLauncher.java old mode 100644 new mode 100755 index 4244bc8..2bd9f28 --- a/Launcher/source/client/ClientLauncher.java +++ b/Launcher/source/client/ClientLauncher.java @@ -242,6 +242,9 @@ 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.compareTo(ClientProfile.Version.MC194) >= 0) { // Just to show it in debug screen + Collections.addAll(args, "--versionType", "Launcher v" + Launcher.VERSION); + } // Add server args if (params.autoEnter) { diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java index 6e8fad5..b7b4010 100755 --- a/Launcher/source/client/ClientProfile.java +++ b/Launcher/source/client/ClientProfile.java @@ -189,7 +189,7 @@ @LauncherAPI public enum Version { - MC164("1.6.4", 78), MC172("1.7.2", 4), MC1710("1.7.10", 5), MC189("1.8.9", 47), MC19("1.9", 107); + MC164("1.6.4", 78), MC172("1.7.2", 4), MC1710("1.7.10", 5), MC189("1.8.9", 47), MC194("1.9.4", 110), MC110X("1.10.X", 210); private static final Map VERSIONS; public final String name; public final int protocol; diff --git a/Launcher/source/helper/SecurityHelper.java b/Launcher/source/helper/SecurityHelper.java old mode 100644 new mode 100755 index 7552a42..4308045 --- a/Launcher/source/helper/SecurityHelper.java +++ b/Launcher/source/helper/SecurityHelper.java @@ -47,7 +47,7 @@ @LauncherAPI public static final int CRYPTO_MAX_LENGTH = 2048; // Certificate constants - @LauncherAPI public static final String CERTIFICATE_DIGEST = "6c15e8b9e019d0930b010340850617e8fd959522400f1d5b37896454ae67c123"; + @LauncherAPI public static final String CERTIFICATE_DIGEST = "fca9659209c6b3b510d9d0e328f37ea0e8df11b6f897c70e4fce440501f43075"; @LauncherAPI public static final String HEX = "0123456789abcdef"; // Random generator constants