diff --git a/Launcher/source/client/ClientProfile.java b/Launcher/source/client/ClientProfile.java index 73194a1..2564eb8 100644 --- a/Launcher/source/client/ClientProfile.java +++ b/Launcher/source/client/ClientProfile.java @@ -223,87 +223,87 @@ // https://launchermeta.mojang.com/mc/game/version_manifest.json // 1.4.x - MC147("1.4.7", 51), + MC147("1.4.7"), // 1.5.x - MC152("1.5.2", 61), + MC152("1.5.2"), // 1.6.x - MC164("1.6.4", 78), + MC164("1.6.4"), // 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), + MC17("1.7"), + MC171("1.7.1"), + MC172("1.7.2"), + MC173("1.7.3"), + MC174("1.7.4"), + MC175("1.7.5"), + MC176("1.7.6"), + MC177("1.7.7"), + MC178("1.7.8"), + MC179("1.7.9"), + MC1710("1.7.10"), // 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), + MC18("1.8"), + MC181("1.8.1"), + MC182("1.8.2"), + MC183("1.8.3"), + MC184("1.8.4"), + MC185("1.8.5"), + MC186("1.8.6"), + MC187("1.8.7"), + MC188("1.8.8"), + MC189("1.8.9"), // 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), + MC19("1.9"), + MC191("1.9.1"), + MC192("1.9.2"), + MC193("1.9.3"), + MC194("1.9.4"), // 1.10.x - MC110("1.10", 210), - MC1101("1.10.1", 210), - MC1102("1.10.2", 210), + MC110("1.10"), + MC1101("1.10.1"), + MC1102("1.10.2"), // 1.11.x - MC111("1.11", 315), - MC1111("1.11.1", 316), - MC1112("1.11.2", 316), + MC111("1.11"), + MC1111("1.11.1"), + MC1112("1.11.2"), // 1.12.x - MC112("1.12", 335), - MC1121("1.12.1", 338), - MC1122("1.12.2", 340), + MC112("1.12"), + MC1121("1.12.1"), + MC1122("1.12.2"), // 1.13.x - MC113("1.13", 393), - MC1131("1.13.1", 401), - MC1132("1.13.2", 404), + MC113("1.13"), + MC1131("1.13.1"), + MC1132("1.13.2"), // 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), + MC114("1.14"), + MC1141("1.14.1"), + MC1142("1.14.2"), + MC1143("1.14.3"), + MC1144("1.14.4"), // 1.15.x - MC115("1.15", 573), - MC1151("1.15.1", 575), - MC1152("1.15.2", 578), + MC115("1.15"), + MC1151("1.15.1"), + MC1152("1.15.2"), // 1.16.x - MC1160("1.16", 735), - MC1161("1.16.1", 736), - MC1162("1.16.2", 751), - MC1163("1.16.3", 753), - MC1164("1.16.4", 754); - // MC1165("1.16.5", 755); // Вангую + MC1160("1.16"), + MC1161("1.16.1"), + MC1162("1.16.2"), + MC1163("1.16.3"), + MC1164("1.16.4"), + MC1165("1.16.5"); - // Попожа тут будет рефактор на json, не дело это добавлять каждый раз... + // Да и json тут к слову нахуй не сдался XD private static final Map VERSIONS; static @@ -317,12 +317,10 @@ } public final String name; - public final int protocol; - Version(String name, int protocol) + Version(String name) { this.name = name; - this.protocol = protocol; } public static Version byName(String name) diff --git a/Launcher/source/client/ServerPinger.java b/Launcher/source/client/ServerPinger.java index 0eb27de..8ba5fc8 100644 --- a/Launcher/source/client/ServerPinger.java +++ b/Launcher/source/client/ServerPinger.java @@ -120,7 +120,7 @@ { try (HOutput packetOutput = new HOutput(packetArray)) { - packetOutput.writeUnsignedByte(version.protocol); // Protocol version + packetOutput.writeUnsignedByte(78); // Protocol version // Для пинга можно указывать любой (здесь с 1.6.4) writeUTF16String(packetOutput, address.getHostString()); // Server address packetOutput.writeInt(address.getPort()); // Server port } @@ -156,7 +156,7 @@ throw new IOException("Magic string mismatch: " + magic); } int protocol = Integer.parseInt(splitted[1]); - if (protocol != version.protocol) + if (protocol != 78) // Смотри строку 123 { throw new IOException("Protocol mismatch: " + protocol); } @@ -183,7 +183,7 @@ try (HOutput packetOutput = new HOutput(packetArray)) { packetOutput.writeVarInt(0x0); // Handshake packet ID - packetOutput.writeVarInt(version.protocol); // Protocol version + packetOutput.writeVarInt(-1); // Protocol version // Опять же для пинга версия протокола не важна packetOutput.writeString(address.getHostString(), 0); // Server address packetOutput.writeShort((short) address.getPort()); // Server port packetOutput.writeVarInt(0x1); // Next state - status diff --git a/build.sh b/build.sh index 62e2e4c..384a714 100644 --- a/build.sh +++ b/build.sh @@ -6,18 +6,18 @@ # Build Launcher.jar echo Building Launcher.jar... -jar -uf Launcher.jar buildnumber -java -jar build/proguard.jar @Launcher.pro +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\jar.exe" -uf Launcher.jar buildnumber +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\java.exe" -jar build/proguard.jar @Launcher.pro rm Launcher.jar mv Launcher-obf.jar Launcher.jar # java -jar build/stringer.jar -configFile Launcher.stringer Launcher.jar Launcher.jar -pack200 -E9 -Htrue -mlatest -Upass -r Launcher.jar -jarsigner -keystore build/keeperjerry.jks -storepass PSP1448 -sigfile LAUNCHER Launcher.jar keeperjerry -pack200 Launcher.pack.gz Launcher.jar +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\pack200.exe" -E9 -Htrue -mlatest -Upass -r Launcher.jar +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\jarsigner.exe" -keystore build/keeperjerry.jks -storepass PSP1448 -sigfile LAUNCHER Launcher.jar keeperjerry +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\pack200.exe" Launcher.pack.gz Launcher.jar # Build LaunchServer.jar echo Building LaunchServer.jar... -jar -uf LaunchServer.jar Launcher.pack.gz buildnumber -pack200 -E9 -Htrue -mlatest -Upass -r LaunchServer.jar -jarsigner -keystore build/keeperjerry.jks -storepass PSP1448 -sigfile LAUNCHER LaunchServer.jar keeperjerry -rm Launcher.pack.gz +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\jar.exe" -uf LaunchServer.jar Launcher.pack.gz buildnumber +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\pack200.exe" -E9 -Htrue -mlatest -Upass -r LaunchServer.jar +"C:\Users\mrcat\.jdks\liberica-1.8.0_282\bin\jarsigner.exe" -keystore build/keeperjerry.jks -storepass PSP1448 -sigfile LAUNCHER LaunchServer.jar keeperjerry +rm Launcher.pack.gz \ No newline at end of file diff --git a/buildnumber b/buildnumber index 2040f28..5a3ee59 100644 --- a/buildnumber +++ b/buildnumber @@ -1 +1 @@ -495, 09.12.2020 \ No newline at end of file +513, 08.02.2021 \ No newline at end of file