From 9dd0702ccb79f59064fae4359a52fa79b303e1ce Mon Sep 17 00:00:00 2001 From: luajscss <70727706+luajscss@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:00:30 +0300 Subject: [PATCH] Update to 1.21.1 --- .gitignore | 3 + build.gradle | 2 +- gradle.properties | 8 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/ru/fiw/proxyserver/TestPing.java | 106 ++++++++++-------- 5 files changed, 71 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 09cd281..9502dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# project files +Minecraft_fabric_1.21.1_source + # gradle .gradle/ diff --git a/build.gradle b/build.gradle index 7b6f882..efdc3d2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index a5458c3..2417fae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.10 +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.17.3 # Mod Properties mod_version=1.3 maven_group=ru.fiw.proxyserver archives_base_name=ProxyServer # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.97.0+1.20.4 \ No newline at end of file +fabric_version=0.102.1+1.21.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/ru/fiw/proxyserver/TestPing.java b/src/main/java/ru/fiw/proxyserver/TestPing.java index b1c2938..cdd61a1 100644 --- a/src/main/java/ru/fiw/proxyserver/TestPing.java +++ b/src/main/java/ru/fiw/proxyserver/TestPing.java @@ -7,12 +7,11 @@ import io.netty.handler.proxy.Socks4ProxyHandler; import io.netty.handler.proxy.Socks5ProxyHandler; import io.netty.handler.timeout.ReadTimeoutHandler; -import net.minecraft.SharedConstants; import net.minecraft.network.ClientConnection; +import net.minecraft.network.DisconnectionInfo; import net.minecraft.network.NetworkSide; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.ConnectionIntent; -import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryPingC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; import net.minecraft.network.packet.s2c.query.PingResultS2CPacket; @@ -42,9 +41,8 @@ public void run(String ip, int port, Proxy proxy) { private void ping(String ip, int port) { state = Text.translatable("ui.proxyserver.ping.pinging", ip).getString(); - ClientConnection clientConnection; try { - clientConnection = createTestClientConnection(InetAddress.getByName(ip), port); + pingDestination = createTestClientConnection(ip, port); } catch (UnknownHostException e) { state = Formatting.RED + Text.translatable("ui.proxyserver.err.cantConnect").getString(); return; @@ -52,9 +50,23 @@ private void ping(String ip, int port) { state = Formatting.RED + Text.translatable("ui.proxyserver.err.cantPing", ip).getString(); return; } - pingDestination = clientConnection; - clientConnection.setPacketListener(new ClientQueryPacketListener() { + ClientConnection clientConnection = pingDestination; + + ClientQueryPacketListener listener = new ClientQueryPacketListener() { private boolean successful; + private boolean sentQuery; + + @Override + public void onResponse(QueryResponseS2CPacket packet) { + if (this.sentQuery) { + clientConnection.disconnect(Text.translatable("multiplayer.status.unrequested")); + return; + } + + this.sentQuery = true; + pingSentAt = Util.getMeasuringTimeMs(); + clientConnection.send(new QueryPingC2SPacket(pingSentAt)); + } @Override public void onPingResult(PingResultS2CPacket packet) { @@ -65,59 +77,65 @@ public void onPingResult(PingResultS2CPacket packet) { clientConnection.disconnect(Text.translatable("multiplayer.status.finished")); } - public void onResponse(QueryResponseS2CPacket packet) { - pingSentAt = Util.getMeasuringTimeMs(); - clientConnection.send(new QueryPingC2SPacket(pingSentAt)); - } - - public void onDisconnected(Text reason) { + @Override + public void onDisconnected(DisconnectionInfo info) { pingDestination = null; if (!this.successful) { - state = Formatting.RED + Text.translatable("ui.proxyserver.err.cantPingReason", ip, reason.getString()).getString(); + state = Formatting.RED + Text.translatable("ui.proxyserver.err.cantPingReason", ip, info.reason().getString()).getString(); } } @Override public boolean isConnectionOpen() { - return true; + return clientConnection.isOpen(); } - - public ClientConnection getConnection() { - return clientConnection; - } - }); + }; try { - clientConnection.send(new HandshakeC2SPacket(SharedConstants.getGameVersion().getProtocolVersion(), ip, port, ConnectionIntent.STATUS)); - clientConnection.send(new QueryRequestC2SPacket()); + clientConnection.connect(ip, port, listener); + clientConnection.send(QueryRequestC2SPacket.INSTANCE); } catch (Throwable throwable) { + pingDestination = null; state = Formatting.RED + Text.translatable("ui.proxyserver.err.cantPing", ip).getString(); + clientConnection.disconnect(Text.translatable("multiplayer.status.cancelled")); } } - private ClientConnection createTestClientConnection(InetAddress address, int port) { - final ClientConnection clientConnection = new ClientConnection(NetworkSide.CLIENTBOUND); - - (new Bootstrap()).group(ClientConnection.CLIENT_IO_GROUP.get()).handler(new ChannelInitializer<>() { - protected void initChannel(Channel channel) { - ClientConnection.setHandlers(channel); - - try { - channel.config().setOption(ChannelOption.TCP_NODELAY, true); - } catch (ChannelException channelexception) { - } - - ChannelPipeline channelpipeline = channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)); - ClientConnection.addHandlers(channelpipeline, NetworkSide.CLIENTBOUND, null); - - if (proxy.type == Proxy.ProxyType.SOCKS5) { - channel.pipeline().addFirst(new Socks5ProxyHandler(new InetSocketAddress(proxy.getIp(), proxy.getPort()), proxy.username.isEmpty() ? null : proxy.username, proxy.password.isEmpty() ? null : proxy.password)); - } else { - channel.pipeline().addFirst(new Socks4ProxyHandler(new InetSocketAddress(proxy.getIp(), proxy.getPort()), proxy.username.isEmpty() ? null : proxy.username)); - } - } - }).channel(NioSocketChannel.class).connect(address, port).syncUninterruptibly(); - return clientConnection; + private ClientConnection createTestClientConnection(String host, int port) throws UnknownHostException { + InetSocketAddress address = new InetSocketAddress(InetAddress.getByName(host), port); + ClientConnection connection = new ClientConnection(NetworkSide.CLIENTBOUND); + + new Bootstrap() + .group((EventLoopGroup) ClientConnection.CLIENT_IO_GROUP.get()) + .handler(new ChannelInitializer<>() { + @Override + protected void initChannel(Channel channel) { + try { + channel.config().setOption(ChannelOption.TCP_NODELAY, true); + } catch (ChannelException ignored) { + } + + ChannelPipeline pipeline = channel.pipeline(); + + if (proxy.type == Proxy.ProxyType.SOCKS5) { + pipeline.addFirst(new Socks5ProxyHandler(new InetSocketAddress(proxy.getIp(), proxy.getPort()), + proxy.username.isEmpty() ? null : proxy.username, + proxy.password.isEmpty() ? null : proxy.password)); + } else { + pipeline.addFirst(new Socks4ProxyHandler(new InetSocketAddress(proxy.getIp(), proxy.getPort()), + proxy.username.isEmpty() ? null : proxy.username)); + } + + pipeline.addLast("timeout", new ReadTimeoutHandler(30)); + ClientConnection.addHandlers(pipeline, NetworkSide.CLIENTBOUND, false, null); + connection.addFlowControlHandler(pipeline); + } + }) + .channel(NioSocketChannel.class) + .connect(address) + .syncUninterruptibly(); + + return connection; } public void pingPendingNetworks() {