diff --git a/LaunchServer/resources/launchserver/defaults/profile1.16.1.cfg b/LaunchServer/resources/launchserver/defaults/profile1.16.1.cfg deleted file mode 100644 index 8e1d539..0000000 --- a/LaunchServer/resources/launchserver/defaults/profile1.16.1.cfg +++ /dev/null @@ -1,43 +0,0 @@ -version: "1.16.1"; -assetIndex: "1.16.1"; - -# Runtime-dependent params -dir: "XXXXX"; -assetDir: "asset1.16.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", - "mods", "minecraft\\.jar" -]; -updateExclusions: []; - -# Client launcher params -mainClass: "net.fabricmc.loader.launch.knot.KnotClient"; -classPath: [ "minecraft.jar", "libraries" ]; -jvmArgs: [ - # Some options from Mojang's launcher - "-XX:+UseG1GC", - "-XX:+UnlockExperimentalVMOptions", - "-XX:G1NewSizePercent=20", - "-XX:G1ReservePercent=20", - "-XX:MaxGCPauseMillis=50", - "-XX:G1HeapRegionSize=32M", - - # Some options from me - "-XX:+AlwaysPreTouch", - "-XX:-TieredCompilation", - "-XX:+DisableAttachMechanism" -]; -clientArgs: [ -]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.16.2.cfg b/LaunchServer/resources/launchserver/defaults/profile1.16.2.cfg new file mode 100644 index 0000000..f7efa30 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.16.2.cfg @@ -0,0 +1,51 @@ +version: "1.16.2"; +assetIndex: "1.16.2"; + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.16.2"; + +# 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", "forge\\.jar", "minecraft\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "cpw.mods.modlauncher.Launcher"; +classPath: [ "forge.jar", "libraries", "minecraft.jar" ]; +jvmArgs: [ + # Some options from Mojang's launcher + "-XX:+UseG1GC", + "-XX:+UnlockExperimentalVMOptions", + "-XX:G1NewSizePercent=20", + "-XX:G1ReservePercent=20", + "-XX:MaxGCPauseMillis=50", + "-XX:G1HeapRegionSize=32M", + + # Some options from me + "-XX:+AlwaysPreTouch", + "-XX:-TieredCompilation", + "-XX:+DisableAttachMechanism" +]; + +# Костыль, но это работает +# Проще будет обновлять на новую версию +clientArgs: [ + "--launchTarget", "fmlclient", + "--fml.forgeVersion", "33.0.3", + "--fml.mcVersion", "1.16.2", + "--fml.forgeGroup", "net.minecraftforge", + "--fml.mcpVersion", "20200812.004259" +]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.16.cfg b/LaunchServer/resources/launchserver/defaults/profile1.16.cfg deleted file mode 100644 index 9aa2637..0000000 --- a/LaunchServer/resources/launchserver/defaults/profile1.16.cfg +++ /dev/null @@ -1,43 +0,0 @@ -version: "1.16"; -assetIndex: "1.16"; - -# Runtime-dependent params -dir: "XXXXX"; -assetDir: "asset1.16"; - -# 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" -]; -updateExclusions: []; - -# Client launcher params -mainClass: "net.fabricmc.loader.launch.knot.KnotClient"; -classPath: [ "minecraft.jar", "libraries" ]; -jvmArgs: [ - # Some options from Mojang's launcher - "-XX:+UseG1GC", - "-XX:+UnlockExperimentalVMOptions", - "-XX:G1NewSizePercent=20", - "-XX:G1ReservePercent=20", - "-XX:MaxGCPauseMillis=50", - "-XX:G1HeapRegionSize=32M", - - # Some options from me - "-XX:+AlwaysPreTouch", - "-XX:-TieredCompilation", - "-XX:+DisableAttachMechanism" -]; -clientArgs: [ -]; diff --git a/Launcher/source/Launcher.java b/Launcher/source/Launcher.java index a428c5d..ed446ac 100644 --- a/Launcher/source/Launcher.java +++ b/Launcher/source/Launcher.java @@ -59,7 +59,7 @@ { // Version info @LauncherAPI - public static final String VERSION = "1.5.1"; + public static final String VERSION = "1.5.2"; @LauncherAPI public static final String BUILD = readBuildNumber(); @LauncherAPI diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java index 47ed39b..be9d66b 100644 --- a/Launcher/source/client/ClientProfile.java +++ b/Launcher/source/client/ClientProfile.java @@ -217,21 +217,87 @@ @LauncherAPI public enum Version { + // На всякий случай + // https://minecraft.gamepedia.com/Protocol_version + + // 1.4.x MC147("1.4.7", 51), + + // 1.5.x MC152("1.5.2", 61), + + // 1.6.x MC164("1.6.4", 78), + + // 1.7.x + MC17("1.7", 3), + MC171("1.7.1", 3), MC172("1.7.2", 4), + MC173("1.7.3", 4), + MC174("1.7.4", 4), + MC175("1.7.5", 4), + MC176("1.7.6", 5), + MC177("1.7.7", 5), + MC178("1.7.8", 5), + MC179("1.7.9", 5), MC1710("1.7.10", 5), + + // 1.8.x + MC18("1.8", 47), + MC181("1.8.1", 47), + MC182("1.8.2", 47), + MC183("1.8.3", 47), + MC184("1.8.4", 47), + MC185("1.8.5", 47), + MC186("1.8.6", 47), + MC187("1.8.7", 47), + MC188("1.8.8", 47), MC189("1.8.9", 47), + + // 1.9.x + MC19("1.9", 107), + MC191("1.9.1", 108), + MC192("1.9.2", 109), + MC193("1.9.3", 110), MC194("1.9.4", 110), + + // 1.10.x + MC110("1.10", 210), + MC1101("1.10.1", 210), MC1102("1.10.2", 210), + + // 1.11.x + MC111("1.11", 315), + MC1111("1.11.1", 316), MC1112("1.11.2", 316), + + // 1.12.x + MC112("1.12", 335), + MC1121("1.12.1", 338), MC1122("1.12.2", 340), + + // 1.13.x + MC113("1.13", 393), + MC1131("1.13.1", 401), MC1132("1.13.2", 404), + + // 1.14.x + MC114("1.14", 477), + MC1141("1.14.1", 480), + MC1142("1.14.2", 485), + MC1143("1.14.3", 490), MC1144("1.14.4", 498), + + // 1.15.x + MC115("1.15", 573), + MC1151("1.15.1", 575), MC1152("1.15.2", 578), + + // 1.16.x MC1160("1.16", 735), - MC1161("1.16.1", 736); // Столько шума... + MC1161("1.16.1", 736), + MC1162("1.16.2", 751); + private static final Map VERSIONS; static diff --git a/buildnumber b/buildnumber index 9e4c70c..4060989 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -1.5.1, 05.08.2020 \ No newline at end of file +1.5.2, 19.08.2020 \ No newline at end of file