diff --git a/VERSION b/VERSION index ee90284..90a27f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.4 +1.0.5 diff --git a/build.gradle b/build.gradle index fe9ef01..b1bae10 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } setGroup("net.elytrium") -setVersion("1.0.4") +setVersion("1.0.5") java { setSourceCompatibility(JavaVersion.VERSION_17) diff --git a/src/main/java/net/elytrium/fastmotd/FastMOTD.java b/src/main/java/net/elytrium/fastmotd/FastMOTD.java index d5e77df..088e038 100644 --- a/src/main/java/net/elytrium/fastmotd/FastMOTD.java +++ b/src/main/java/net/elytrium/fastmotd/FastMOTD.java @@ -33,7 +33,7 @@ import com.velocitypowered.proxy.network.ConnectionManager; import com.velocitypowered.proxy.network.ServerChannelInitializerHolder; import com.velocitypowered.proxy.protocol.StateRegistry; -import com.velocitypowered.proxy.protocol.packet.Disconnect; +import com.velocitypowered.proxy.protocol.packet.DisconnectPacket; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; @@ -198,7 +198,7 @@ public void reload() { Component kickReasonComponent = serializer.deserialize(Settings.IMP.MAINTENANCE.KICK_MESSAGE); this.kickReason = this.preparedPacketFactory .createPreparedPacket(ProtocolVersion.MINIMUM_VERSION, ProtocolVersion.MAXIMUM_VERSION) - .prepare(version -> Disconnect.create(kickReasonComponent, version, true)) + .prepare(version -> DisconnectPacket.create(kickReasonComponent, version, true)) .build(); this.kickWhitelist = Settings.IMP.MAINTENANCE.KICK_WHITELIST.stream().map((String host) -> { diff --git a/src/main/java/net/elytrium/fastmotd/injection/HandshakeSessionHandlerHook.java b/src/main/java/net/elytrium/fastmotd/injection/HandshakeSessionHandlerHook.java index 57f0a23..56223ad 100644 --- a/src/main/java/net/elytrium/fastmotd/injection/HandshakeSessionHandlerHook.java +++ b/src/main/java/net/elytrium/fastmotd/injection/HandshakeSessionHandlerHook.java @@ -24,11 +24,11 @@ import com.velocitypowered.proxy.protocol.MinecraftPacket; import com.velocitypowered.proxy.protocol.StateRegistry; import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder; -import com.velocitypowered.proxy.protocol.packet.Handshake; -import com.velocitypowered.proxy.protocol.packet.LegacyHandshake; -import com.velocitypowered.proxy.protocol.packet.LegacyPing; -import com.velocitypowered.proxy.protocol.packet.StatusPing; -import com.velocitypowered.proxy.protocol.packet.StatusRequest; +import com.velocitypowered.proxy.protocol.packet.HandshakePacket; +import com.velocitypowered.proxy.protocol.packet.LegacyHandshakePacket; +import com.velocitypowered.proxy.protocol.packet.LegacyPingPacket; +import com.velocitypowered.proxy.protocol.packet.StatusPingPacket; +import com.velocitypowered.proxy.protocol.packet.StatusRequestPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; @@ -54,19 +54,19 @@ public HandshakeSessionHandlerHook(FastMOTD plugin, MinecraftConnection connecti } @Override - public boolean handle(LegacyPing packet) { + public boolean handle(LegacyPingPacket packet) { this.connection.close(); return true; } @Override - public boolean handle(LegacyHandshake packet) { + public boolean handle(LegacyHandshakePacket packet) { this.connection.close(); return true; } @Override - public boolean handle(Handshake handshake) { + public boolean handle(HandshakePacket handshake) { if (handshake.getNextStatus() == StateRegistry.STATUS_ID) { this.protocolVersion = handshake.getProtocolVersion(); this.serverAddress = handshake.getServerAddress() + ":" + handshake.getPort(); @@ -91,7 +91,7 @@ public boolean handle(Handshake handshake) { @Override public void handleGeneric(MinecraftPacket packet) { - if (packet instanceof StatusPing) { + if (packet instanceof StatusPingPacket) { if (Settings.IMP.MAINTENANCE.MAINTENANCE_ENABLED) { this.connection.close(); return; @@ -103,7 +103,7 @@ public void handleGeneric(MinecraftPacket packet) { packet.encode(buf, null, null); this.channel.writeAndFlush(buf); this.connection.close(); - } else if (packet instanceof StatusRequest) { + } else if (packet instanceof StatusRequestPacket) { this.channel.writeAndFlush(this.plugin.getNext(this.protocolVersion, this.serverAddress)); } else { this.original.handleGeneric(packet);