diff --git a/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg index c95f571..7232a90 100644 --- a/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg +++ b/LaunchServer/resources/launchserver/defaults/profile1.12.2.cfg @@ -1,9 +1,9 @@ version: "1.12.2"; -assetIndex: "1.12"; # 1.7.10+ only +assetIndex: "1.12.2"; # 1.7.10+ only # Runtime-dependent params dir: "XXXXX"; -assetDir: "asset1.12"; +assetDir: "asset1.12.2"; # Client params sortIndex: 0; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.13.1.cfg b/LaunchServer/resources/launchserver/defaults/profile1.13.1.cfg new file mode 100644 index 0000000..d7b2ec5 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.13.1.cfg @@ -0,0 +1,39 @@ +version: "1.13.1"; +assetIndex: "1.13.1"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.13.1"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +updateFastCheck: true; +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", + "minecraft\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.client.main.Main"; +classPath: [ "minecraft.jar", "libraries" ]; +jvmArgs: [ + # Some options from Mojang's launcher + "-XX:+UseConcMarkSweepGC", + "-XX:+CMSIncrementalMode", + "-XX:-UseAdaptiveSizePolicy", + "-Xmn128M", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ +]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.13.cfg b/LaunchServer/resources/launchserver/defaults/profile1.13.cfg new file mode 100644 index 0000000..e632df5 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.13.cfg @@ -0,0 +1,39 @@ +version: "1.13"; +assetIndex: "1.13"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.13"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +updateFastCheck: true; +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", + "minecraft\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.client.main.Main"; +classPath: [ "minecraft.jar", "libraries" ]; +jvmArgs: [ + # Some options from Mojang's launcher + "-XX:+UseConcMarkSweepGC", + "-XX:+CMSIncrementalMode", + "-XX:-UseAdaptiveSizePolicy", + "-Xmn128M", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ +]; diff --git a/compat/LaunchWrapper.patch b/compat/LaunchWrapper.patch index 4bf116b..0b069e2 100644 --- a/compat/LaunchWrapper.patch +++ b/compat/LaunchWrapper.patch @@ -1,14 +1,13 @@ -diff --git a/src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java b/src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java -index f4e83af..d3a6d7f 100644 ---- a/src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java -+++ b/src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java -@@ -58,6 +58,12 @@ public class LaunchClassLoader extends URLClassLoader { +--- src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java (revision a4801b70f8a0148c6e6279ec2e91527e8019e1c8) ++++ src/main/java/net/minecraft/launchwrapper/LaunchClassLoader.java (date 1536688577949) +@@ -54,6 +54,13 @@ addClassLoaderExclusion("org.apache.logging."); addClassLoaderExclusion("net.minecraft.launchwrapper."); - + + // classloader launcher exclusions + addClassLoaderExclusion("launcher."); -+ addClassLoaderExclusion("com.mojang."); ++ addClassLoaderExclusion("com.mojang.authlib."); ++ addClassLoaderExclusion("com.mojang.util."); + addClassLoaderExclusion("com.google.gson."); + addClassLoaderExclusion("org.json."); +