From 7894acd9f1fb47e950954c2cf560ae7e4bea629e Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Sun, 26 Mar 2023 19:56:49 +0200 Subject: [PATCH] Cleanup --- Velocity | 2 +- .../forge/FML2ClientConnectionPhase.java | 49 ------------------- .../VelocityForgeClientConnectionPhase.java | 13 ----- .../velocity/VelocityEventHandler.java | 10 ---- .../VelocityForgeHandshakeSessionHandler.java | 41 ---------------- 5 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java delete mode 100644 src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java diff --git a/Velocity b/Velocity index c7ba525..f744b37 160000 --- a/Velocity +++ b/Velocity @@ -1 +1 @@ -Subproject commit c7ba5255e3b0170a0e7183f3a38927931de34a03 +Subproject commit f744b37ad5c7b6f00ca01681f26b75cad2584b7e diff --git a/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java deleted file mode 100644 index ad3eb2e..0000000 --- a/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.adde0109.ambassador.forge; - -public class FML2ClientConnectionPhase { - -/* - @Override - public RegisteredServer chooseServer(ConnectedPlayer player) { - forced = Ambassador.getTemporaryForced().remove(player.getUsername()); - return forced; - } - - @Override - public CompletableFuture reset(RegisteredServer server, ConnectedPlayer player) { - FML2CRPMClientConnectionPhase newPhase = new FML2CRPMClientConnectionPhase(clientPhase,getPayloadManager()); - player.setPhase(newPhase); - CompletableFuture future = newPhase.reset(server,player); - future.thenAccept(success -> { - if (!success) { - Ambassador.getTemporaryForced().put(player.getUsername(),server, Ambassador.getInstance().config.getServerSwitchCancellationTime(), TimeUnit.SECONDS); - player.disconnect(Component.text(Ambassador.getInstance().config.getDisconnectResetMessage())); - } - }); - return future; - } - - - -/* - public void handleForward(VelocityServerConnection serverConnection, LoginPluginMessage payload) { - final ByteBuf buf = payload.content().duplicate(); - ProtocolUtils.readString(buf); //Channel - ProtocolUtils.readVarInt(buf); //Length - if (ProtocolUtils.readVarInt(buf) == 1) { - getPayloadManager().listenFor(payload.getId()).thenAccept(rawResponse -> { - final ByteBuf response = rawResponse.duplicate(); - ProtocolUtils.readString(response); //Channel - ProtocolUtils.readVarInt(response); //Length - if (ProtocolUtils.readVarInt(response) == 2) { - String[] mods = ProtocolUtils.readStringArray(response); - if (Arrays.stream(mods).anyMatch(s -> s.equals("clientresetpacket"))) { - serverConnection.getPlayer().setPhase(new FML2CRPMClientConnectionPhase(clientPhase,getPayloadManager())); - } - } - }); - } - - } - */ -} diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java index 9f80fa6..6025c3a 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java @@ -1,6 +1,5 @@ package org.adde0109.ambassador.forge; -import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.proxy.VelocityServer; @@ -52,7 +51,6 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase connection.getChannel().pipeline().addBefore(Connections.MINECRAFT_DECODER, ForgeConstants.RESET_LISTENER,new FML2CRPMResetCompleteDecoder()); connection.getChannel().pipeline().addAfter(Connections.MINECRAFT_ENCODER, ForgeConstants.FORGE_HANDSHAKE_HOLDER,new OutboundForgeHandshakeHolder()); - //player.getConnection().setSessionHandler(new VelocityForgeHandshakeSessionHandler(player.getConnection().getSessionHandler(),player)); connection.write(new PluginMessage("fml:handshake", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generatePluginResetPacket()))); @@ -136,15 +134,4 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase } - -/* - public void handleKick(KickedFromServerEvent event) { - //If kicked before the client has entered PLAY and has been reset. - if (lastKnownWorking != null && !(event.getResult() instanceof KickedFromServerEvent.RedirectPlayer)) { - net.kyori.adventure.text.Component reason = event.getServerKickReason().orElse(null); - event.setResult(KickedFromServerEvent.RedirectPlayer.create(lastKnownWorking,reason)); - lastKnownWorking = null; - } - } - */ } diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java index 4b59e4b..c132001 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java @@ -42,16 +42,6 @@ public class VelocityEventHandler { continuation.resume(); } - @Subscribe - public void onPostLoginEvent(PostLoginEvent event, Continuation continuation) { - ConnectedPlayer player = (ConnectedPlayer) event.getPlayer(); - if (player.getPhase() instanceof VelocityForgeClientConnectionPhase phase) { - //VelocityForgeHandshakeSessionHandler sessionHandler = new VelocityForgeHandshakeSessionHandler(player.getConnection().getSessionHandler(), player); - //player.getConnection().eventLoop().submit(() -> player.getConnection().setSessionHandler(sessionHandler)); - } - continuation.resume(); - } - @Subscribe(order = PostOrder.LAST) public void onPlayerChooseInitialServerEvent(PlayerChooseInitialServerEvent event, Continuation continuation) { ConnectedPlayer player = (ConnectedPlayer) event.getPlayer(); diff --git a/src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java deleted file mode 100644 index 4b5b2d8..0000000 --- a/src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.adde0109.ambassador.velocity.client; - -import com.velocitypowered.proxy.connection.MinecraftSessionHandler; -import com.velocitypowered.proxy.connection.client.ConnectedPlayer; -import com.velocitypowered.proxy.protocol.packet.LoginPluginResponse; -import io.netty.buffer.ByteBuf; -import org.adde0109.ambassador.forge.VelocityForgeClientConnectionPhase; - -public class VelocityForgeHandshakeSessionHandler implements MinecraftSessionHandler { - /*private final MinecraftSessionHandler original; - private final ConnectedPlayer player; - - public VelocityForgeHandshakeSessionHandler(MinecraftSessionHandler original, ConnectedPlayer player) { - this.original = original; - this.player = player; - } - - @Override - public boolean handle(LoginPluginResponse packet) { - if (player.getPhase() instanceof VelocityForgeClientConnectionPhase phase) { - if (phase.handle(player,packet,player.getConnectionInFlight())) { - return true; - } - } - return original.handle(packet); - } - @Override - public void handleUnknown(ByteBuf buf) { - original.handleUnknown(buf); - } - - @Override - public void disconnected() { - original.disconnected(); - } - - public MinecraftSessionHandler getOriginal() { - return this.original; - } - */ -} \ No newline at end of file