diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java index a1f3e5d..ad15bac 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeBackendConnectionPhase.java @@ -7,9 +7,9 @@ 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.LoginPluginMessage; -import com.velocitypowered.proxy.protocol.packet.PluginMessage; +import com.velocitypowered.proxy.protocol.packet.AvailableCommandsPacket; +import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; +import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket; import io.netty.buffer.ByteBuf; import org.adde0109.ambassador.forge.pipeline.CommandDecoderErrorCatcher; import org.adde0109.ambassador.forge.pipeline.ForgeLoginWrapperDecoder; @@ -59,7 +59,7 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas VelocityForgeBackendConnectionPhase() { } - public void handle(VelocityServerConnection server, ConnectedPlayer player, LoginPluginMessage message) { + public void handle(VelocityServerConnection server, ConnectedPlayer player, LoginPluginMessagePacket message) { VelocityForgeBackendConnectionPhase newPhase = getNewPhase(server,message); @@ -97,7 +97,7 @@ public enum VelocityForgeBackendConnectionPhase implements BackendConnectionPhas } private VelocityForgeBackendConnectionPhase getNewPhase(VelocityServerConnection serverConnection, - LoginPluginMessage packet) { + LoginPluginMessagePacket packet) { VelocityForgeBackendConnectionPhase phaseToTransitionTo = nextPhase(); if (phaseToTransitionTo != this) { phaseToTransitionTo.onTransitionToNewPhase(serverConnection); @@ -106,9 +106,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 63e801c..c346d78 100644 --- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java +++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java @@ -10,8 +10,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.LoginPluginMessage; -import com.velocitypowered.proxy.protocol.packet.PluginMessage; +import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; +import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.kyori.adventure.text.Component; @@ -62,10 +62,10 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase //player.getConnectionInFlight().getConnection().getChannel().config().setAutoRead(false); 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 LoginPluginMessage(98,"fml:loginwrapper", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generateResetPacket()))); + connection.write(new LoginPluginMessagePacket(98,"fml:loginwrapper", Unpooled.wrappedBuffer(ForgeHandshakeUtils.generateResetPacket()))); } //Prepare to receive reset ACK @@ -135,7 +135,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)); } else { player.disconnect(Ambassador.getInstance().config.getDisconnectResetMessage()); } @@ -170,7 +170,7 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase } public void sendVanillaModlist(ConnectedPlayer player) { - player.getConnection().write(new LoginPluginMessage(0, "fml:loginwrapper", + player.getConnection().write(new LoginPluginMessagePacket(0, "fml:loginwrapper", Unpooled.wrappedBuffer(player.getConnection().getType() == ForgeConstants.ForgeFML3 ? ForgeHandshakeUtils.emptyModlistFML3 : ForgeHandshakeUtils.emptyModlistFML2))); diff --git a/src/main/java/org/adde0109/ambassador/forge/packet/GenericForgeLoginWrapperPacket.java b/src/main/java/org/adde0109/ambassador/forge/packet/GenericForgeLoginWrapperPacket.java index 61b5319..479b2b6 100644 --- a/src/main/java/org/adde0109/ambassador/forge/packet/GenericForgeLoginWrapperPacket.java +++ b/src/main/java/org/adde0109/ambassador/forge/packet/GenericForgeLoginWrapperPacket.java @@ -1,6 +1,6 @@ package org.adde0109.ambassador.forge.packet; -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; @@ -15,8 +15,8 @@ public class GenericForgeLoginWrapperPacket extends DeferredByteBufHolder implem } @Override - public LoginPluginResponse encode() { - return new LoginPluginResponse(id, true, content()); + public LoginPluginResponsePacket encode() { + return new LoginPluginResponsePacket(id, true, content()); } @Override diff --git a/src/main/java/org/adde0109/ambassador/forge/packet/IForgeLoginWrapperPacket.java b/src/main/java/org/adde0109/ambassador/forge/packet/IForgeLoginWrapperPacket.java index 4326477..562c725 100644 --- a/src/main/java/org/adde0109/ambassador/forge/packet/IForgeLoginWrapperPacket.java +++ b/src/main/java/org/adde0109/ambassador/forge/packet/IForgeLoginWrapperPacket.java @@ -1,9 +1,9 @@ package org.adde0109.ambassador.forge.packet; -import com.velocitypowered.proxy.protocol.packet.LoginPluginResponse; +import com.velocitypowered.proxy.protocol.packet.LoginPluginResponsePacket; public interface IForgeLoginWrapperPacket { - public LoginPluginResponse encode(); + public LoginPluginResponsePacket encode(); public int getId(); public boolean getSuccess(); 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 7f94105..9e0e19d 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,7 @@ 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 com.velocitypowered.proxy.protocol.packet.LoginPluginResponsePacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -31,7 +31,7 @@ public class ModListReplyPacket implements IForgeLoginWrapperPacket { this.success = success; } - public static ModListReplyPacket read(LoginPluginResponse msg) { + public static ModListReplyPacket read(LoginPluginResponsePacket msg) { ByteBuf input = msg.content(); List mods = new ArrayList<>(); @@ -54,7 +54,7 @@ public class ModListReplyPacket implements IForgeLoginWrapperPacket { } @Override - public LoginPluginResponse encode() { + public LoginPluginResponsePacket encode() { ByteBuf buf = Unpooled.buffer(); ProtocolUtils.writeVarInt(buf, 2); @@ -79,7 +79,7 @@ public class ModListReplyPacket implements IForgeLoginWrapperPacket { ProtocolUtils.writeVarInt(output, buf.readableBytes()); output.writeBytes(buf); - return new LoginPluginResponse(id, true, output); + return new LoginPluginResponsePacket(id, true, output); } @Override 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/ForgeLoginWrapperDecoder.java b/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperDecoder.java index e382b10..b3b4e73 100644 --- a/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperDecoder.java +++ b/src/main/java/org/adde0109/ambassador/forge/pipeline/ForgeLoginWrapperDecoder.java @@ -1,7 +1,7 @@ package org.adde0109.ambassador.forge.pipeline; import com.velocitypowered.proxy.protocol.ProtocolUtils; -import com.velocitypowered.proxy.protocol.packet.LoginPluginResponse; +import com.velocitypowered.proxy.protocol.packet.LoginPluginResponsePacket; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; @@ -11,12 +11,12 @@ import org.adde0109.ambassador.forge.packet.ModListReplyPacket; import java.util.ArrayList; import java.util.List; -public class ForgeLoginWrapperDecoder extends MessageToMessageDecoder { +public class ForgeLoginWrapperDecoder extends MessageToMessageDecoder { private final List loginWrapperIDs = new ArrayList<>(); @Override - protected void decode(ChannelHandlerContext ctx, LoginPluginResponse msg, List out) throws Exception { + protected void decode(ChannelHandlerContext ctx, LoginPluginResponsePacket msg, List out) throws Exception { ByteBuf buf = msg.content(); if (!loginWrapperIDs.remove((Integer) msg.getId())) { out.add(msg.retain()); diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java index 939cb68..6919bdd 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java +++ b/src/main/java/org/adde0109/ambassador/velocity/backend/FMLMarkerAdder.java @@ -6,7 +6,7 @@ import com.velocitypowered.proxy.connection.ConnectionTypes; import com.velocitypowered.proxy.connection.MinecraftConnection; import com.velocitypowered.proxy.connection.backend.VelocityServerConnection; import com.velocitypowered.proxy.network.Connections; -import com.velocitypowered.proxy.protocol.packet.Handshake; +import com.velocitypowered.proxy.protocol.packet.HandshakePacket; import io.netty.channel.*; import io.netty.handler.codec.MessageToMessageEncoder; import org.adde0109.ambassador.forge.ForgeConstants; @@ -16,17 +16,17 @@ import java.util.List; import static com.velocitypowered.proxy.connection.forge.legacy.LegacyForgeConstants.HANDSHAKE_HOSTNAME_TOKEN; -public class FMLMarkerAdder extends MessageToMessageEncoder { +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 ed4ee72..a0290ed 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.LoginPluginMessage; -import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess; +import com.velocitypowered.proxy.protocol.packet.DisconnectPacket; +import com.velocitypowered.proxy.protocol.packet.LoginPluginMessagePacket; +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(LoginPluginMessage packet) { + public boolean handle(LoginPluginMessagePacket packet) { if (packet.getChannel().equals("fml:loginwrapper")) { if (serverConnection.getPhase() == BackendConnectionPhases.UNKNOWN) { VelocityForgeBackendConnectionPhase.NOT_STARTED.handle(serverConnection,serverConnection.getPlayer(),packet); @@ -39,7 +39,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()); } @@ -65,7 +65,7 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler { @Override - public boolean handle(Disconnect packet) { + public boolean handle(DisconnectPacket packet) { if (!serverConnection.getPlayer().getPhase().consideredComplete()) { serverConnection.getPlayer().handleConnectionException(serverConnection.getServer(), packet, false); return true; 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 565d4b7..914f95f 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java +++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgePlaySessionHandler.java @@ -4,7 +4,7 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler; 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 com.velocitypowered.proxy.protocol.packet.JoinGamePacket; import org.adde0109.ambassador.forge.VelocityForgeClientConnectionPhase; public class ForgePlaySessionHandler implements MinecraftSessionHandler { @@ -18,7 +18,7 @@ public class ForgePlaySessionHandler implements MinecraftSessionHandler { } @Override - public boolean handle(JoinGame packet) { + public boolean handle(JoinGamePacket packet) { if (serverConnection.getPlayer().getPhase() instanceof VelocityForgeClientConnectionPhase clientPhase) { serverConnection.getPlayer().setPhase(VelocityForgeClientConnectionPhase.RESETTABLE); } 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 1d8fc3f..22fecfb 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");