diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java index 245d490..3b275e4 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java @@ -7,8 +7,8 @@ import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.network.Connections; import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.StateRegistry; -import com.velocitypowered.proxy.protocol.packet.AvailableCommands; -import com.velocitypowered.proxy.protocol.packet.PluginMessage; +import com.velocitypowered.proxy.protocol.packet.AvailableCommandsPacket; +import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.text.Component; import org.adde0109.ambassador.Ambassador; @@ -169,9 +169,9 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas } @Override - public boolean handle(VelocityServerConnection server, ConnectedPlayer player, PluginMessage message) { + public boolean handle(VelocityServerConnection server, ConnectedPlayer player, PluginMessagePacket message) { if (message.getChannel().equals("ambassador:commands")) { - AvailableCommands packet = new AvailableCommands(); + AvailableCommandsPacket packet = new AvailableCommandsPacket(); packet.decode(message.content(), ProtocolUtils.Direction.CLIENTBOUND,server.getConnection().getProtocolVersion()); server.getConnection().getActiveSessionHandler().handle(packet); return true; diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java index ae3beb4..eae3d42 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java @@ -11,7 +11,7 @@ import com.velocitypowered.proxy.network.Connections; import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; -import com.velocitypowered.proxy.protocol.packet.PluginMessage; +import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.kyori.adventure.text.Component; @@ -208,7 +208,7 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase } if (connection.getState() == StateRegistry.PLAY || connection.getState() == StateRegistry.CONFIG) { - connection.write(new PluginMessage("fml:handshake", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generatePluginResetPacket()))); + connection.write(new PluginMessagePacket("fml:handshake", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generatePluginResetPacket()))); connection.setState(StateRegistry.LOGIN); } else { connection.write(new LoginPluginMessagePacket(98,"fml:loginwrapper", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generateResetPacket()))); @@ -230,7 +230,7 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase ProtocolUtils.writeVarInt(buf, 0); buf.writeBytes((player.getVirtualHost().get().getHostName() + ":" + player.getVirtualHost().get().getPort()).getBytes(StandardCharsets.UTF_8)); - player.getConnection().write(new PluginMessage("srvredirect:red", buf)); + player.getConnection().write(new PluginMessagePacket("srvredirect:red", buf)); } }; diff --git a/src/main/java/org/adde0109/ambassador/forge/packet/ModListReplyPacket.java b/src/main/java/org/adde0109/ambassador/forge/packet/ModListReplyPacket.java index 8257ea5..8a85548 100644 --- a/src/main/java/org/adde0109/ambassador/forge/packet/ModListReplyPacket.java +++ b/src/main/java/org/adde0109/ambassador/forge/packet/ModListReplyPacket.java @@ -3,7 +3,6 @@ package org.adde0109.ambassador.forge.packet; import com.velocitypowered.api.proxy.messages.ChannelIdentifier; import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import com.velocitypowered.proxy.protocol.packet.LoginPluginResponse; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/main/java/org/adde0109/ambassador/forge/pipeline/CommandDecoderErrorCatcher.java b/src/main/java/org/adde0109/ambassador/forge/pipeline/CommandDecoderErrorCatcher.java index 9738964..d1b2fc8 100644 --- a/src/main/java/org/adde0109/ambassador/forge/pipeline/CommandDecoderErrorCatcher.java +++ b/src/main/java/org/adde0109/ambassador/forge/pipeline/CommandDecoderErrorCatcher.java @@ -8,7 +8,7 @@ import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder; -import com.velocitypowered.proxy.protocol.packet.AvailableCommands; +import com.velocitypowered.proxy.protocol.packet.AvailableCommandsPacket; import com.velocitypowered.proxy.util.except.QuietRuntimeException; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -43,7 +43,7 @@ public class CommandDecoderErrorCatcher extends ChannelInboundHandlerAdapter { int packetId = ProtocolUtils.readVarInt(buf); MinecraftPacket packet = registry.createPacket(packetId); buf.readerIndex(originalReaderIndex); - if (packet instanceof AvailableCommands) { + if (packet instanceof AvailableCommandsPacket) { try { ((MinecraftDecoder) ctx.pipeline().get(Connections.MINECRAFT_DECODER)).channelRead(ctx, msg); } catch (QuietRuntimeException | CorruptedFrameException e) { diff --git a/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperCodec.java b/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperCodec.java index 761ac0b..dd8eeb4 100644 --- a/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperCodec.java +++ b/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperCodec.java @@ -2,7 +2,7 @@ package org.adde0109.ambassador.forge.pipeline; import com.velocitypowered.proxy.protocol.ProtocolUtils; import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; -import com.velocitypowered.proxy.protocol.packet.LoginPluginResponse; +import com.velocitypowered.proxy.protocol.packet.LoginPluginResponsePacket; import com.velocitypowered.proxy.protocol.util.DeferredByteBufHolder; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -31,7 +31,7 @@ public class ForgeLoginWrapperCodec extends MessageToMessageCodec { +public class FMLMarkerAdder extends MessageToMessageEncoder { final VelocityServer server; public FMLMarkerAdder(VelocityServer server) { - super(Handshake.class); + super(HandshakePacket.class); this.server = server; } @Override - protected void encode(ChannelHandlerContext ctx, Handshake msg, List out) { + protected void encode(ChannelHandlerContext ctx, HandshakePacket msg, List out) { MinecraftConnection connection = (MinecraftConnection) ctx.pipeline().get(Connections.HANDLER); VelocityServerConnection serverConnection = (VelocityServerConnection) connection.getAssociation(); PlayerInfoForwarding forwardingMode = server.getConfiguration().getPlayerInfoForwardingMode(); 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 658800c..f4640a8 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java @@ -6,9 +6,9 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler; import com.velocitypowered.proxy.connection.backend.*; import com.velocitypowered.proxy.connection.client.ConnectedPlayer; import com.velocitypowered.proxy.protocol.MinecraftPacket; -import com.velocitypowered.proxy.protocol.packet.Disconnect; +import com.velocitypowered.proxy.protocol.packet.DisconnectPacket; import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; -import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; +import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccessPacket; import com.velocitypowered.proxy.util.except.QuietRuntimeException; import io.netty.buffer.Unpooled; import org.adde0109.ambassador.forge.*; @@ -26,7 +26,7 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler { } @Override - public boolean handle(ServerLoginSuccess packet) { + public boolean handle(ServerLoginSuccessPacket packet) { if ((serverConnection.getPhase() instanceof VelocityForgeBackendConnectionPhase phase)) { phase.onLoginSuccess(serverConnection,serverConnection.getPlayer()); } @@ -46,7 +46,7 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler { @Override - public boolean handle(Disconnect packet) { + public boolean handle(DisconnectPacket packet) { return original.handle(packet); } diff --git a/src/main/java/org/adde0109/ambassador/velocity/client/OutboundSuccessHolder.java b/src/main/java/org/adde0109/ambassador/velocity/client/OutboundSuccessHolder.java index 05d61c7..d37e01e 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/client/OutboundSuccessHolder.java +++ b/src/main/java/org/adde0109/ambassador/velocity/client/OutboundSuccessHolder.java @@ -1,13 +1,13 @@ package org.adde0109.ambassador.velocity.client; -import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; +import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccessPacket; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; public class OutboundSuccessHolder extends ChannelOutboundHandlerAdapter { - private ServerLoginSuccess packet; + private ServerLoginSuccessPacket packet; private ChannelHandlerContext ctx; @Override @@ -17,7 +17,7 @@ public class OutboundSuccessHolder extends ChannelOutboundHandlerAdapter { @Override public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - if ((msg instanceof ServerLoginSuccess packet)) { + if ((msg instanceof ServerLoginSuccessPacket packet)) { this.packet = packet; } else { ctx.write(msg, promise); diff --git a/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java index b22f15f..4d8aa64 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/client/VelocityHandshakeSessionHandler.java @@ -7,7 +7,7 @@ import com.velocitypowered.proxy.connection.client.HandshakeSessionHandler; import com.velocitypowered.proxy.network.Connections; import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.StateRegistry; -import com.velocitypowered.proxy.protocol.packet.Handshake; +import com.velocitypowered.proxy.protocol.packet.HandshakePacket; import io.netty.buffer.ByteBuf; import org.adde0109.ambassador.forge.ForgeConstants; @@ -22,7 +22,7 @@ public class VelocityHandshakeSessionHandler extends HandshakeSessionHandler { } @Override - public boolean handle(Handshake handshake) { + public boolean handle(HandshakePacket handshake) { handshake.handle(original); if (connection.getType() == ConnectionTypes.VANILLA) { final String[] markerSplit = handshake.getServerAddress().split("\0");