Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-22 16:41:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Support custom protocol

Browse source
This commit is contained in:
Gravita 2023-04-21 16:14:33 +07:00
parent 6caa34e255
commit 50b463b439
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java
View file

@ -30,6 +30,7 @@ public final class ServerPinger {
private static final int PACKET_LENGTH = 65535; private static final int PACKET_LENGTH = 65535;
// Instance // Instance
private final InetSocketAddress address; private final InetSocketAddress address;
private final int protocol;
private final ClientProfile.Version version; private final ClientProfile.Version version;
// Cache // Cache
private final Object cacheLock = new Object(); private final Object cacheLock = new Object();
@ -47,6 +48,7 @@ public ServerPinger(ClientProfile.ServerProfile profile, ClientProfile.Version v
} }
this.address = profile.toSocketAddress(); this.address = profile.toSocketAddress();
this.version = Objects.requireNonNull(version, "version"); this.version = Objects.requireNonNull(version, "version");
this.protocol = profile.protocol;
} }
private static String readUTF16String(HInput input) throws IOException { private static String readUTF16String(HInput input) throws IOException {
@ -65,7 +67,7 @@ private Result doPing() throws IOException {
socket.connect(IOHelper.resolve(address), IOHelper.SOCKET_TIMEOUT); socket.connect(IOHelper.resolve(address), IOHelper.SOCKET_TIMEOUT);
try (HInput input = new HInput(socket.getInputStream()); try (HInput input = new HInput(socket.getInputStream());
HOutput output = new HOutput(socket.getOutputStream())) { HOutput output = new HOutput(socket.getOutputStream())) {
return version.compareTo(ClientProfileVersions.MINECRAFT_1_7_2) >= 0 ? modernPing(input, output) : legacyPing(input, output, version.compareTo(ClientProfileVersions.MINECRAFT_1_6_4) >= 0); return version.compareTo(ClientProfileVersions.MINECRAFT_1_7_2) >= 0 ? modernPing(input, output, protocol) : legacyPing(input, output, version.compareTo(ClientProfileVersions.MINECRAFT_1_6_4) >= 0);
} }
} }
} }
@ -121,13 +123,13 @@ private Result legacyPing(HInput input, HOutput output, boolean mc16) throws IOE
return new Result(onlinePlayers, maxPlayers, response); return new Result(onlinePlayers, maxPlayers, response);
} }
private Result modernPing(HInput input, HOutput output) throws IOException { private Result modernPing(HInput input, HOutput output, int protocol) throws IOException {
// Prepare handshake packet // Prepare handshake packet
byte[] handshakePacket; byte[] handshakePacket;
try (ByteArrayOutputStream packetArray = IOHelper.newByteArrayOutput()) { try (ByteArrayOutputStream packetArray = IOHelper.newByteArrayOutput()) {
try (HOutput packetOutput = new HOutput(packetArray)) { try (HOutput packetOutput = new HOutput(packetArray)) {
packetOutput.writeVarInt(0x0); // Handshake packet ID packetOutput.writeVarInt(0x0); // Handshake packet ID
packetOutput.writeVarInt(0x4); // Protocol version packetOutput.writeVarInt(protocol > 0 ? protocol : 0x4); // Protocol version
packetOutput.writeString(address.getHostString(), 0); // Server address packetOutput.writeString(address.getHostString(), 0); // Server address
packetOutput.writeShort((short) address.getPort()); // Server port packetOutput.writeShort((short) address.getPort()); // Server port
packetOutput.writeVarInt(0x1); // Next state - status packetOutput.writeVarInt(0x1); // Next state - status

1
LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java
View file

@ -544,6 +544,7 @@ public static class ServerProfile {
public String serverAddress; public String serverAddress;
public int serverPort; public int serverPort;
public boolean isDefault = true; public boolean isDefault = true;
public int protocol = -1;
public boolean socketPing = true; public boolean socketPing = true;
public ServerProfile() { public ServerProfile() {