update to MC 1.21.4 (#101)

Author: Elecast2

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'me.creepermaxcz.mc-bots'
-version '1.2.13'
+version '1.2.14'
 
 sourceCompatibility = 1.17
 targetCompatibility = 1.17
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.geysermc.mcprotocollib:protocol:1.21.2-SNAPSHOT'
+    implementation 'org.geysermc.mcprotocollib:protocol:1.21.4-SNAPSHOT'
     implementation 'net.kyori:adventure-text-serializer-gson:4.16.0'
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'com.diogonunes:JColor:5.2.0'

src/main/java/me/creepermaxcz/mcbots/Bot.java

@@ -2,12 +2,14 @@
 
 import org.geysermc.mcprotocollib.auth.GameProfile;
 import org.geysermc.mcprotocollib.auth.SessionService;
+import org.geysermc.mcprotocollib.network.ClientSession;
 import org.geysermc.mcprotocollib.network.ProxyInfo;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
+import org.geysermc.mcprotocollib.network.factory.ClientNetworkSessionFactory;
 import org.geysermc.mcprotocollib.network.packet.Packet;
-import org.geysermc.mcprotocollib.network.tcp.TcpClientSession;
+import org.geysermc.mcprotocollib.network.session.ClientNetworkSession;
 import org.geysermc.mcprotocollib.protocol.MinecraftConstants;
 import org.geysermc.mcprotocollib.protocol.MinecraftProtocol;
 import org.geysermc.mcprotocollib.protocol.data.UnexpectedEncryptionException;
@@ -34,7 +36,7 @@ public class Bot extends Thread {
     private String nickname;
     private ProxyInfo proxy;
     private InetSocketAddress address;
-    private Session client;
+    private ClientSession client;
     private boolean hasMainListener;
 
     private double lastX, lastY, lastZ = -1;
@@ -50,7 +52,11 @@ public Bot(String nickname, InetSocketAddress address, ProxyInfo proxy) {
 
         Log.info("Creating bot", nickname);
         protocol = new MinecraftProtocol(nickname);
-        client = new TcpClientSession(address.getHostString(), address.getPort(), protocol, proxy);
+        client = ClientNetworkSessionFactory.factory()
+                .setAddress(address.getHostString(), address.getPort())
+                .setProtocol(protocol)
+                .setProxy(proxy)
+                .create();
     }
 
     public Bot(MinecraftProtocol protocol, InetSocketAddress address, ProxyInfo proxy) {
@@ -60,7 +66,11 @@ public Bot(MinecraftProtocol protocol, InetSocketAddress address, ProxyInfo prox
 
         Log.info("Creating bot", nickname);
 
-        client = new TcpClientSession(address.getHostString(), address.getPort(), protocol, proxy);
+        client = ClientNetworkSessionFactory.factory()
+                .setAddress(address.getHostString(), address.getPort())
+                .setProtocol(protocol)
+                .setProxy(proxy)
+                .create();
 
         SessionService sessionService = new SessionService();
         client.setFlag(MinecraftConstants.SESSION_SERVICE_KEY, sessionService);

src/main/java/me/creepermaxcz/mcbots/ServerInfo.java

@@ -1,10 +1,11 @@
 package me.creepermaxcz.mcbots;
 
 
+import org.geysermc.mcprotocollib.network.ClientSession;
 import org.geysermc.mcprotocollib.network.Session;
 import org.geysermc.mcprotocollib.network.event.session.DisconnectedEvent;
 import org.geysermc.mcprotocollib.network.event.session.SessionAdapter;
-import org.geysermc.mcprotocollib.network.tcp.TcpClientSession;
+import org.geysermc.mcprotocollib.network.factory.ClientNetworkSessionFactory;
 import org.geysermc.mcprotocollib.protocol.MinecraftConstants;
 import org.geysermc.mcprotocollib.protocol.MinecraftProtocol;
 import org.geysermc.mcprotocollib.protocol.data.status.ServerStatusInfo;
@@ -16,15 +17,19 @@
 
 public class ServerInfo {
 
-    private final Session client;
+    private final ClientSession client;
     private ServerStatusInfo serverStatusInfo;
     private long ping;
     private boolean done;
 
     public ServerInfo(InetSocketAddress address) {
 
         MinecraftProtocol protocol = new MinecraftProtocol();
-        client = new TcpClientSession(address.getHostString(), address.getPort(), protocol, null);
+
+        client = ClientNetworkSessionFactory.factory()
+                .setAddress(address.getHostString(), address.getPort())
+                .setProtocol(protocol)
+                .create();
 
         client.setFlag(MinecraftConstants.SERVER_INFO_HANDLER_KEY, (ServerInfoHandler) (session, info) -> {
             this.serverStatusInfo = info;