From e690ead1ebd1f5d6006a498cd347acde3500dc1d Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Fri, 17 Feb 2023 13:38:15 +0100 Subject: [PATCH] Small fix and refactoring --- .../forge/FML2ClientConnectionPhase.java | 9 --------- .../forge/ForgeFMLConnectionType.java | 2 -- .../ambassador/forge/ForgeHandshakeUtils.java | 17 ----------------- .../VelocityForgeBackendConnectionPhase.java | 3 +-- .../VelocityForgeClientConnectionPhase.java | 8 +++----- .../velocity/VelocityEventHandler.java | 2 ++ .../VelocityServerChannelInitializer.java | 1 + .../backend/ForgeLoginSessionHandler.java | 3 ++- .../backend/ForgePlaySessionHandler.java | 2 +- .../client}/FML2CRPMResetCompleteDecoder.java | 2 +- .../VelocityForgeHandshakeSessionHandler.java | 5 ++--- .../VelocityHandshakeSessionHandler.java | 2 +- 12 files changed, 14 insertions(+), 42 deletions(-) rename src/main/java/org/adde0109/ambassador/{velocity/backend => forge}/VelocityForgeBackendConnectionPhase.java (95%) rename src/main/java/org/adde0109/ambassador/{velocity => forge}/VelocityForgeClientConnectionPhase.java (95%) rename src/main/java/org/adde0109/ambassador/{forge => velocity/client}/FML2CRPMResetCompleteDecoder.java (96%) rename src/main/java/org/adde0109/ambassador/velocity/{ => client}/VelocityForgeHandshakeSessionHandler.java (86%) rename src/main/java/org/adde0109/ambassador/velocity/{ => client}/VelocityHandshakeSessionHandler.java (97%) diff --git a/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java index 141fa38..ad3eb2e 100644 --- a/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/FML2ClientConnectionPhase.java @@ -1,14 +1,5 @@ package org.adde0109.ambassador.forge; -import com.velocitypowered.api.proxy.server.RegisteredServer; -import com.velocitypowered.proxy.connection.client.ConnectedPlayer; -import net.kyori.adventure.text.Component; -import org.adde0109.ambassador.Ambassador; -import org.adde0109.ambassador.velocity.VelocityForgeClientConnectionPhase; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; - public class FML2ClientConnectionPhase { /* diff --git a/src/main/java/org/adde0109/ambassador/forge/ForgeFMLConnectionType.java b/src/main/java/org/adde0109/ambassador/forge/ForgeFMLConnectionType.java index 072e480..ef1fe82 100644 --- a/src/main/java/org/adde0109/ambassador/forge/ForgeFMLConnectionType.java +++ b/src/main/java/org/adde0109/ambassador/forge/ForgeFMLConnectionType.java @@ -5,8 +5,6 @@ import com.velocitypowered.proxy.config.PlayerInfoForwarding; import com.velocitypowered.proxy.connection.ConnectionType; import com.velocitypowered.proxy.connection.backend.BackendConnectionPhase; import com.velocitypowered.proxy.connection.client.ClientConnectionPhase; -import org.adde0109.ambassador.velocity.VelocityForgeClientConnectionPhase; -import org.adde0109.ambassador.velocity.backend.VelocityForgeBackendConnectionPhase; import java.util.Collections; diff --git a/src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeUtils.java b/src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeUtils.java index 1da533e..a0395ca 100644 --- a/src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeUtils.java +++ b/src/main/java/org/adde0109/ambassador/forge/ForgeHandshakeUtils.java @@ -3,25 +3,8 @@ package org.adde0109.ambassador.forge; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import com.velocitypowered.api.proxy.server.RegisteredServer; -import com.velocitypowered.api.proxy.server.ServerPing; -import com.velocitypowered.api.util.ModInfo; -import java.util.*; - -import com.velocitypowered.api.util.UuidUtils; -import com.velocitypowered.proxy.VelocityServer; -import com.velocitypowered.proxy.config.PlayerInfoForwarding; -import com.velocitypowered.proxy.config.VelocityConfiguration; -import com.velocitypowered.proxy.connection.MinecraftConnection; -import com.velocitypowered.proxy.connection.client.ConnectedPlayer; -import com.velocitypowered.proxy.protocol.StateRegistry; -import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; -import io.netty.buffer.ByteBuf; -import org.adde0109.ambassador.velocity.VelocityForgeHandshakeSessionHandler; -import org.slf4j.Logger; import java.nio.charset.StandardCharsets; -import java.util.concurrent.CompletableFuture; public class ForgeHandshakeUtils { diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/VelocityForgeBackendConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java similarity index 95% rename from src/main/java/org/adde0109/ambassador/velocity/backend/VelocityForgeBackendConnectionPhase.java rename to src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java index da97a49..cc06f9c 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/VelocityForgeBackendConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java @@ -1,11 +1,10 @@ -package org.adde0109.ambassador.velocity.backend; +package org.adde0109.ambassador.forge; import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.connection.backend.BackendConnectionPhase; import com.velocitypowered.proxy.connection.backend.VelocityServerConnection; import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage; -import org.adde0109.ambassador.velocity.VelocityForgeClientConnectionPhase; public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhase { NOT_STARTED() { diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java similarity index 95% rename from src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java rename to src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java index 37a6826..c686b8d 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java @@ -1,4 +1,4 @@ -package org.adde0109.ambassador.velocity; +package org.adde0109.ambassador.forge; import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.proxy.VelocityServer; @@ -13,12 +13,10 @@ import com.velocitypowered.proxy.protocol.packet.PluginMessage; import io.netty.buffer.Unpooled; import net.kyori.adventure.text.Component; import org.adde0109.ambassador.Ambassador; -import org.adde0109.ambassador.forge.FML2CRPMResetCompleteDecoder; -import org.adde0109.ambassador.forge.ForgeConstants; -import org.adde0109.ambassador.forge.ForgeFMLConnectionType; -import org.adde0109.ambassador.forge.ForgeHandshakeUtils; +import org.adde0109.ambassador.velocity.client.FML2CRPMResetCompleteDecoder; import org.adde0109.ambassador.velocity.client.OutboundForgeHandshakeHolder; import org.adde0109.ambassador.velocity.client.OutboundSuccessHolder; +import org.adde0109.ambassador.velocity.client.VelocityForgeHandshakeSessionHandler; import java.util.concurrent.TimeUnit; import java.util.concurrent.ScheduledFuture; diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java index bec6441..254972d 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java @@ -10,6 +10,8 @@ import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.protocol.StateRegistry; import org.adde0109.ambassador.Ambassador; +import org.adde0109.ambassador.forge.VelocityForgeClientConnectionPhase; +import org.adde0109.ambassador.velocity.client.VelocityForgeHandshakeSessionHandler; public class VelocityEventHandler { diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java index 825802a..23095a1 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java +++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java @@ -8,6 +8,7 @@ import com.velocitypowered.proxy.network.ServerChannelInitializer; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; +import org.adde0109.ambassador.velocity.client.VelocityHandshakeSessionHandler; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Method; diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java index 6a8663a..b224536 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java @@ -13,6 +13,7 @@ import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; import net.kyori.adventure.text.Component; import org.adde0109.ambassador.forge.ForgeConstants; import org.adde0109.ambassador.forge.ForgeFMLConnectionType; +import org.adde0109.ambassador.forge.VelocityForgeBackendConnectionPhase; import org.adde0109.ambassador.velocity.client.OutboundSuccessHolder; public class ForgeLoginSessionHandler implements MinecraftSessionHandler { @@ -47,7 +48,7 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler { } ConnectedPlayer player = serverConnection.getPlayer(); - if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType)) { + if (!(serverConnection.getConnection().getType() instanceof ForgeFMLConnectionType) && player.getConnectedServer() != null) { player.getPhase().resetConnectionPhase(player); } else { MinecraftConnection connection = player.getConnection(); diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java index 547bb01..220b702 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java @@ -5,7 +5,7 @@ import com.velocitypowered.proxy.connection.backend.TransitionSessionHandler; import com.velocitypowered.proxy.connection.backend.VelocityServerConnection; import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.packet.JoinGame; -import org.adde0109.ambassador.velocity.VelocityForgeClientConnectionPhase; +import org.adde0109.ambassador.forge.VelocityForgeClientConnectionPhase; public class ForgePlaySessionHandler implements MinecraftSessionHandler { diff --git a/src/main/java/org/adde0109/ambassador/forge/FML2CRPMResetCompleteDecoder.java b/src/main/java/org/adde0109/ambassador/velocity/client/FML2CRPMResetCompleteDecoder.java similarity index 96% rename from src/main/java/org/adde0109/ambassador/forge/FML2CRPMResetCompleteDecoder.java rename to src/main/java/org/adde0109/ambassador/velocity/client/FML2CRPMResetCompleteDecoder.java index 6cee225..d68ef16 100644 --- a/src/main/java/org/adde0109/ambassador/forge/FML2CRPMResetCompleteDecoder.java +++ b/src/main/java/org/adde0109/ambassador/velocity/client/FML2CRPMResetCompleteDecoder.java @@ -1,4 +1,4 @@ -package org.adde0109.ambassador.forge; +package org.adde0109.ambassador.velocity.client; import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.ProtocolUtils; diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java similarity index 86% rename from src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java rename to src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java index c34b0ff..458fb2b 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityForgeHandshakeSessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityForgeHandshakeSessionHandler.java @@ -1,11 +1,10 @@ -package org.adde0109.ambassador.velocity; +package org.adde0109.ambassador.velocity.client; -import com.velocitypowered.proxy.VelocityServer; import com.velocitypowered.proxy.connection.MinecraftSessionHandler; -import com.velocitypowered.proxy.connection.backend.VelocityServerConnection; 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; diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java similarity index 97% rename from src/main/java/org/adde0109/ambassador/velocity/VelocityHandshakeSessionHandler.java rename to src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java index 863bac6..9d0ef1a 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityHandshakeSessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java @@ -1,4 +1,4 @@ -package org.adde0109.ambassador.velocity; +package org.adde0109.ambassador.velocity.client; import com.velocitypowered.proxy.connection.ConnectionTypes; import com.velocitypowered.proxy.connection.MinecraftConnection;