diff --git a/.idea/misc.xml b/.idea/misc.xml index 54495bf..cfbf117 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,6 +15,7 @@ + diff --git a/LaunchServer/resources/launchserver/defaults/profile1.12.cfg b/LaunchServer/resources/launchserver/defaults/profile1.12.cfg new file mode 100644 index 0000000..af7aa50 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.12.cfg @@ -0,0 +1,44 @@ +version: "1.12"; +assetIndex: "1.12"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.12"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +updateFastCheck: true; +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", "mods", + "minecraft\\.jar", "forge\\.jar", "liteloader\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.launchwrapper.Launch"; +classPath: [ "forge.jar", "liteloader.jar", "minecraft.jar", "libraries" ]; +jvmArgs: [ + "-Dfml.ignorePatchDiscrepancies=true", + "-Dfml.ignoreInvalidMinecraftCertificates=true", + + # Some options from Mojang's launcher + "-XX:+UseConcMarkSweepGC", + "-XX:+CMSIncrementalMode", + "-XX:-UseAdaptiveSizePolicy", + "-Xmn128M", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ + "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker", + "--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker" +]; diff --git a/Launcher/source-authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/Launcher/source-authlib/yggdrasil/YggdrasilMinecraftSessionService.java index 281bbe7..3e24a8b 100644 --- a/Launcher/source-authlib/yggdrasil/YggdrasilMinecraftSessionService.java +++ b/Launcher/source-authlib/yggdrasil/YggdrasilMinecraftSessionService.java @@ -178,8 +178,7 @@ JsonObject texturesJSON; try { byte[] decoded = Base64.getDecoder().decode(texturesBase64); - texturesJSON = Json.parse(new String(decoded, IOHelper.UNICODE_CHARSET)).asObject(). - get("textures").asObject(); + texturesJSON = Json.parse(new String(decoded, IOHelper.UNICODE_CHARSET)).asObject().get("textures").asObject(); } catch (Exception ignored) { LogHelper.error("Could not decode textures payload, username: '%s'", username); return; diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java index 3304b44..ad22678 100644 --- a/Launcher/source/client/ClientProfile.java +++ b/Launcher/source/client/ClientProfile.java @@ -205,7 +205,8 @@ MC189("1.8.9", 47), MC194("1.9.4", 110), MC1102("1.10.2", 210), - MC111("1.11.2", 316); + MC1112("1.11.2", 316), + MC112("1.12", 335); private static final Map VERSIONS; public final String name; public final int protocol; diff --git a/build.bat b/build.bat index 378a166..ba58e9d 100644 --- a/build.bat +++ b/build.bat @@ -6,7 +6,7 @@ java -jar build/proguard.jar @Launcher.pro del Launcher.jar ren Launcher-obf.jar Launcher.jar -java -jar build/stringer.jar -configFile Launcher.stringer Launcher.jar Launcher.jar +REM java -jar build/stringer.jar -configFile Launcher.stringer Launcher.jar Launcher.jar pack200 -E9 -Htrue -mlatest -Upass -r Launcher.jar jarsigner -keystore build/sashok724.jks -storepass PSP1004 -sigfile LAUNCHER Launcher.jar sashok724 pack200 Launcher.pack.gz Launcher.jar diff --git a/compat/authlib/authlib-clean.jar b/compat/authlib/authlib-clean.jar index 15708bb..0a934fe 100644 --- a/compat/authlib/authlib-clean.jar +++ b/compat/authlib/authlib-clean.jar Binary files differ