diff --git a/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg b/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg old mode 100644 new mode 100755 index ef61ede..0f5b8b1 --- a/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg +++ b/LaunchServer/resources/launchserver/defaults/profile1.6.4.cfg @@ -33,6 +33,9 @@ "-Dfml.ignoreInvalidMinecraftCertificates=true", "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true", + # JVM Attach protection + "-XX:+DisableAttachMechanism", + # Legacy bridge (for 1.6.4 & lower) settings "-Dlauncher.legacy.skinsURL=http://skins.minecraft.net/MinecraftSkins/%username%.png", "-Dlauncher.legacy.cloaksURL=http://skins.minecraft.net/MinecraftCloaks/%username%.png" diff --git a/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg b/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg old mode 100644 new mode 100755 index 1fda1e3..bc1a1a9 --- a/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg +++ b/LaunchServer/resources/launchserver/defaults/profile1.7.10.cfg @@ -31,7 +31,10 @@ jvmArgs: [ "-Dfml.ignorePatchDiscrepancies=true", "-Dfml.ignoreInvalidMinecraftCertificates=true", - "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true" + "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true", + + # Experimental + "-XX:+DisableAttachMechanism" ]; clientArgs: [ "--tweakClass", "cpw.mods.fml.common.launcher.FMLTweaker" diff --git a/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg old mode 100644 new mode 100755 index 6f7e99a..b8241bf --- a/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg +++ b/LaunchServer/resources/launchserver/defaults/profile1.7.2.cfg @@ -31,7 +31,10 @@ jvmArgs: [ "-Dfml.ignorePatchDiscrepancies=true", "-Dfml.ignoreInvalidMinecraftCertificates=true", - "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true" + "-Dorg.lwjgl.opengl.Display.allowSoftwareOpenGL=true", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" ]; clientArgs: [ "--tweakClass", "cpw.mods.fml.common.launcher.FMLTweaker" diff --git a/LaunchServer/resources/launchserver/defaults/profile1.8.8.cfg b/LaunchServer/resources/launchserver/defaults/profile1.8.8.cfg deleted file mode 100644 index 3d918d8..0000000 --- a/LaunchServer/resources/launchserver/defaults/profile1.8.8.cfg +++ /dev/null @@ -1,34 +0,0 @@ -version: "1.8.8"; -assetIndex: "1.8.8"; # 1.7.10+ only - -# Runtime-dependent params -dir: "XXXXX"; -assetDir: "asset1.8.8"; - -# 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" -]; -clientArgs: [ - "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker" -]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg b/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg new file mode 100755 index 0000000..7d8c09f --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.8.9.cfg @@ -0,0 +1,37 @@ +version: "1.8.9"; +assetIndex: "1.8.9"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.8.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/LaunchServer/resources/launchserver/defaults/profile1.9.cfg b/LaunchServer/resources/launchserver/defaults/profile1.9.cfg new file mode 100755 index 0000000..f8a3659 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.9.cfg @@ -0,0 +1,37 @@ +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/source/Launcher.java b/Launcher/source/Launcher.java old mode 100644 new mode 100755 index c921e51..9080c52 --- a/Launcher/source/Launcher.java +++ b/Launcher/source/Launcher.java @@ -70,7 +70,7 @@ private static final AtomicReference CONFIG = new AtomicReference<>(); // Version info - @LauncherAPI public static final String VERSION = "15.1-fix1"; + @LauncherAPI public static final String VERSION = "15.2"; @LauncherAPI public static final String BUILD = readBuildNumber(); @LauncherAPI public static final int PROTOCOL_MAGIC = 0x724724_16; diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java old mode 100644 new mode 100755 index f35f413..6e8fad5 --- 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), MC188("1.8.8", 47); + MC164("1.6.4", 78), MC172("1.7.2", 4), MC1710("1.7.10", 5), MC189("1.8.9", 47), MC19("1.9", 107); private static final Map VERSIONS; public final String name; public final int protocol;