From 9e24aaab77b1b19a0a506cc2aa28efc4cd0951cb Mon Sep 17 00:00:00 2001 From: TheMode Date: Wed, 1 Dec 2021 20:55:14 +0100 Subject: [PATCH] Cleanup Signed-off-by: TheMode --- .../network/packet/server/play/BlockActionPacket.java | 4 ++-- .../network/packet/server/play/BlockChangePacket.java | 4 ++-- .../network/packet/server/play/ChatMessagePacket.java | 7 ++++--- .../network/packet/server/play/EnterCombatEventPacket.java | 5 +++++ .../network/packet/server/play/EntityAnimationPacket.java | 2 +- .../network/packet/server/play/UpdateLightPacket.java | 6 +++--- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java index f9e980da1..2a5908946 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockActionPacket.java @@ -8,8 +8,8 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -public record BlockActionPacket(Point blockPosition, byte actionId, byte actionParam, - int blockId) implements ServerPacket { +public record BlockActionPacket(@NotNull Point blockPosition, byte actionId, + byte actionParam, int blockId) implements ServerPacket { public BlockActionPacket(Point blockPosition, byte actionId, byte actionParam, Block block) { this(blockPosition, actionId, actionParam, block.id()); } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java index 76dd41809..004592116 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/BlockChangePacket.java @@ -8,8 +8,8 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -public record BlockChangePacket(Point blockPosition, int blockStateId) implements ServerPacket { - public BlockChangePacket(Point blockPosition, Block block) { +public record BlockChangePacket(@NotNull Point blockPosition, int blockStateId) implements ServerPacket { + public BlockChangePacket(@NotNull Point blockPosition, @NotNull Block block) { this(blockPosition, block.stateId()); } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java index 3841858c2..efe6fad4d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ChatMessagePacket.java @@ -17,10 +17,11 @@ import java.util.function.UnaryOperator; /** * Represents an outgoing chat message packet. */ -public record ChatMessagePacket(Component message, ChatPosition position, - UUID uuid) implements ComponentHoldingServerPacket { +public record ChatMessagePacket(@NotNull Component message, @NotNull ChatPosition position, + @NotNull UUID uuid) implements ComponentHoldingServerPacket { public ChatMessagePacket(BinaryReader reader) { - this(reader.readComponent(), ChatPosition.fromPacketID(reader.readByte()), reader.readUuid()); + this(reader.readComponent(), ChatPosition.fromPacketID(reader.readByte()), + reader.readUuid()); } @Override diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java index f70583ba7..3278f976b 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EnterCombatEventPacket.java @@ -2,10 +2,15 @@ package net.minestom.server.network.packet.server.play; import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacketIdentifier; +import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; public record EnterCombatEventPacket() implements ServerPacket { + public EnterCombatEventPacket(BinaryReader reader) { + this(); + } + @Override public void write(@NotNull BinaryWriter writer) { // Empty diff --git a/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java index 17fab19a1..be3b84b87 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/EntityAnimationPacket.java @@ -6,7 +6,7 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -public record EntityAnimationPacket(int entityId, Animation animation) implements ServerPacket { +public record EntityAnimationPacket(int entityId, @NotNull Animation animation) implements ServerPacket { public EntityAnimationPacket(BinaryReader reader) { this(reader.readVarInt(), Animation.values()[reader.readByte()]); } diff --git a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java index b6b6bbaef..ba896ed64 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/UpdateLightPacket.java @@ -7,8 +7,8 @@ import net.minestom.server.utils.binary.BinaryReader; import net.minestom.server.utils.binary.BinaryWriter; import org.jetbrains.annotations.NotNull; -public record UpdateLightPacket(int chunkX, int chunkZ, LightData lightData) - implements ServerPacket { +public record UpdateLightPacket(int chunkX, int chunkZ, + @NotNull LightData lightData) implements ServerPacket { public UpdateLightPacket(BinaryReader reader) { this(reader.readVarInt(), reader.readVarInt(), new LightData(reader)); } @@ -17,7 +17,7 @@ public record UpdateLightPacket(int chunkX, int chunkZ, LightData lightData) public void write(@NotNull BinaryWriter writer) { writer.writeVarInt(chunkX); writer.writeVarInt(chunkZ); - this.lightData.write(writer); + writer.write(lightData); } @Override