From 56977d46e078829a20597aa98cb11c80376305f3 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sat, 14 Jul 2018 13:36:54 +0300 Subject: [PATCH] Proto125: fix implements --- .../mc/core/network/proto_125/NetStream_p125.java | 11 +++++++++++ .../network/proto_125/packets/AnimationPacket.java | 5 +---- .../network/proto_125/packets/ChatMessagePacket.java | 5 +---- .../proto_125/packets/ChunkAllocationPacket.java | 8 ++------ .../network/proto_125/packets/ChunkDataPacket.java | 8 ++------ .../proto_125/packets/DestroyEntityPacket.java | 6 ++---- .../proto_125/packets/EntityLookHeadPacket.java | 8 ++------ .../network/proto_125/packets/EntityLookPacket.java | 8 ++------ .../packets/EntityLookRelativeMovePacket.java | 8 ++------ .../proto_125/packets/EntityRelativeMovePacket.java | 8 ++------ .../proto_125/packets/EntityTeleportPacket.java | 8 ++------ .../network/proto_125/packets/HandshakePacket.java | 5 +---- .../network/proto_125/packets/KeepAlivePacket.java | 5 +---- .../mc/core/network/proto_125/packets/KickPacket.java | 5 +---- .../core/network/proto_125/packets/LoginPacket.java | 7 +------ .../proto_125/packets/PlayerAbilitiesPacket.java | 7 +------ .../network/proto_125/packets/PlayerInfoPacket.java | 8 ++------ .../proto_125/packets/PositionAndLookPacket.java | 9 ++------- .../proto_125/packets/SpawnNamedEntityPacket.java | 10 +++------- .../proto_125/packets/SpawnPositionPacket.java | 8 ++------ .../network/proto_125/packets/TimeUpdatePacket.java | 5 +---- 21 files changed, 44 insertions(+), 108 deletions(-) diff --git a/proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java b/proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java index 548f07a..d2cf90e 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java +++ b/proto125/src/main/java/mc/core/network/proto_125/NetStream_p125.java @@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j; import mc.core.network.NetStream; import java.nio.charset.StandardCharsets; +import java.util.UUID; @Slf4j public abstract class NetStream_p125 extends NetStream { @@ -57,4 +58,14 @@ public abstract class NetStream_p125 extends NetStream { public void writeUnsignedByte(int value) { writeByte(value); //FIXME } + + @Override + public UUID readUUID() { + return UUID.fromString(readString()); + } + + @Override + public void writeUUID(UUID uuid) { + writeString(uuid.toString()); + } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/AnimationPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/AnimationPacket.java index 0daf4f4..05b6910 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/AnimationPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/AnimationPacket.java @@ -8,7 +8,6 @@ import lombok.*; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @AllArgsConstructor @NoArgsConstructor @@ -34,10 +33,8 @@ public class AnimationPacket implements SCPacket, CSPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeByte(animation); - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/ChatMessagePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/ChatMessagePacket.java index 7ae72e8..e87c4f6 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/ChatMessagePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/ChatMessagePacket.java @@ -8,7 +8,6 @@ import lombok.*; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @NoArgsConstructor @AllArgsConstructor @@ -24,9 +23,7 @@ public class ChatMessagePacket implements SCPacket, CSPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeString(message); - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java index daf4ca2..ef243b7 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkAllocationPacket.java @@ -6,8 +6,8 @@ package mc.core.network.proto_125.packets; import lombok.Setter; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Setter @ToString @@ -16,13 +16,9 @@ public class ChunkAllocationPacket implements SCPacket { private boolean initChunk; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(x); netStream.writeInt(z); netStream.writeBoolean(initChunk); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java index 6f088e3..c5ab208 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/ChunkDataPacket.java @@ -6,8 +6,8 @@ package mc.core.network.proto_125.packets; import lombok.Setter; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import mc.core.world.Chunk; import java.nio.ByteBuffer; @@ -116,9 +116,7 @@ public class ChunkDataPacket implements SCPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(x); netStream.writeInt(z); netStream.writeBoolean(needInitChunk); @@ -127,7 +125,5 @@ public class ChunkDataPacket implements SCPacket { netStream.writeInt(compressData.length); netStream.writeInt(0); netStream.writeBytes(compressData); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/DestroyEntityPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/DestroyEntityPacket.java index c2f48b1..7f7288f 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/DestroyEntityPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/DestroyEntityPacket.java @@ -6,8 +6,8 @@ package mc.core.network.proto_125.packets; import lombok.AllArgsConstructor; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @AllArgsConstructor @ToString @@ -15,9 +15,7 @@ public class DestroyEntityPacket implements SCPacket { private final int id; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeInt(id); - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookHeadPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookHeadPacket.java index bcec432..8b5314b 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookHeadPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookHeadPacket.java @@ -8,8 +8,8 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @AllArgsConstructor @NoArgsConstructor @@ -20,12 +20,8 @@ public class EntityLookHeadPacket implements SCPacket { private double yaw; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeByte((byte)(int)((yaw * 256f) / 360f)); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookPacket.java index 448a04d..7f8d476 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookPacket.java @@ -8,8 +8,8 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import mc.core.player.Look; @AllArgsConstructor @@ -21,13 +21,9 @@ public class EntityLookPacket implements SCPacket { private Look look; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeByte((byte)(int)((look.getYaw() * 256f) / 360f)); netStream.writeByte((byte)(int)((look.getPitch() * 256f) / 360f)); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookRelativeMovePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookRelativeMovePacket.java index e0eef27..50f543c 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookRelativeMovePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityLookRelativeMovePacket.java @@ -9,8 +9,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import mc.core.Location; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import mc.core.player.Look; @AllArgsConstructor @@ -23,16 +23,12 @@ public class EntityLookRelativeMovePacket implements SCPacket { private Look look; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeByte((byte) (location.getX() * 32d)); netStream.writeByte((byte) (location.getY() * 32d)); netStream.writeByte((byte) (location.getZ() * 32d)); netStream.writeByte((byte)(int)((look.getYaw() * 256f) / 360f)); netStream.writeByte((byte)(int)((look.getPitch() * 256f) / 360f)); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityRelativeMovePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityRelativeMovePacket.java index 18ab67c..f13eaba 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityRelativeMovePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityRelativeMovePacket.java @@ -9,8 +9,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import mc.core.Location; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @AllArgsConstructor @NoArgsConstructor @@ -21,14 +21,10 @@ public class EntityRelativeMovePacket implements SCPacket { private Location location; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeByte((byte) (location.getX() * 32d)); netStream.writeByte((byte) (location.getY() * 32d)); netStream.writeByte((byte) (location.getZ() * 32d)); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityTeleportPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityTeleportPacket.java index b3034c3..98688e0 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/EntityTeleportPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/EntityTeleportPacket.java @@ -9,8 +9,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import mc.core.Location; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import mc.core.player.Look; @AllArgsConstructor @@ -23,16 +23,12 @@ public class EntityTeleportPacket implements SCPacket { private Look look; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeInt((int) (location.getBlockX() * 32d)); netStream.writeInt((int) (location.getBlockY() * 32d)); netStream.writeInt((int) (location.getBlockZ() * 32d)); netStream.writeByte((byte)(int)((look.getYaw() * 256f) / 360f)); netStream.writeByte((byte)(int)((look.getPitch() * 256f) / 360f)); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java index c9afd57..6958b17 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/HandshakePacket.java @@ -9,7 +9,6 @@ import lombok.ToString; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Getter @ToString @@ -34,9 +33,7 @@ public class HandshakePacket implements CSPacket, SCPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeString("-"); - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java index 3a151eb..2d05d0f 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/KeepAlivePacket.java @@ -7,7 +7,6 @@ package mc.core.network.proto_125.packets; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import java.util.Random; @@ -15,10 +14,8 @@ public class KeepAlivePacket implements SCPacket, CSPacket { private static final Random rand = new Random(); @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeInt(rand.nextInt(Integer.MAX_VALUE)); - return netStream.toByteArray(); } @Override diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java index 10e080e..bc807f1 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/KickPacket.java @@ -12,7 +12,6 @@ import lombok.extern.slf4j.Slf4j; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Slf4j @NoArgsConstructor @@ -36,9 +35,7 @@ public class KickPacket implements SCPacket, CSPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeString(reason); - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java index 2567d73..18d48d6 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/LoginPacket.java @@ -10,7 +10,6 @@ import lombok.ToString; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; import mc.core.player.PlayerMode; @ToString @@ -40,9 +39,7 @@ public class LoginPacket implements CSPacket, SCPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(playerId); netStream.writeString(""); netStream.writeString(levelType); @@ -51,7 +48,5 @@ public class LoginPacket implements CSPacket, SCPacket { netStream.writeByte(difficulty); netStream.writeByte(0); netStream.writeByte(maxPlayers); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java index 9a979ab..9d1b096 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerAbilitiesPacket.java @@ -10,7 +10,6 @@ import lombok.ToString; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Getter @Setter @@ -22,15 +21,11 @@ public class PlayerAbilitiesPacket implements SCPacket, CSPacket { private boolean instantDestroyBlocks = false; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeBoolean(godMode); netStream.writeBoolean(flying); netStream.writeBoolean(canFly); netStream.writeBoolean(instantDestroyBlocks); - - return netStream.toByteArray(); } @Override diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java index a70a84d..a37c8bb 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/PlayerInfoPacket.java @@ -6,8 +6,8 @@ package mc.core.network.proto_125.packets; import lombok.Setter; import lombok.ToString; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Setter @ToString @@ -17,13 +17,9 @@ public class PlayerInfoPacket implements SCPacket { private int ping; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeString(playerName); netStream.writeBoolean(online); netStream.writeShort(ping); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java index 8761e76..4cdbf3a 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/PositionAndLookPacket.java @@ -8,11 +8,10 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; import mc.core.Location; -import mc.core.player.Look; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; +import mc.core.player.Look; @Getter @Setter @@ -38,9 +37,7 @@ public class PositionAndLookPacket implements SCPacket, CSPacket { } @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeDouble(location.getX()); netStream.writeDouble(location.getY()); netStream.writeDouble(stance); @@ -48,7 +45,5 @@ public class PositionAndLookPacket implements SCPacket, CSPacket { netStream.writeFloat(look.getYaw()); netStream.writeFloat(look.getPitch()); netStream.writeBoolean(onGround); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java index 845d05f..f24cf11 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnNamedEntityPacket.java @@ -8,9 +8,9 @@ import lombok.Getter; import lombok.Setter; import lombok.ToString; import mc.core.Location; -import mc.core.player.Look; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; +import mc.core.player.Look; @Getter @Setter @@ -23,9 +23,7 @@ public class SpawnNamedEntityPacket implements SCPacket { private final int currentItem = 0; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt(id); netStream.writeString(entityName); netStream.writeInt((int) (position.getBlockX() * 32d)); @@ -34,7 +32,5 @@ public class SpawnNamedEntityPacket implements SCPacket { netStream.writeByte((byte)(int)((look.getYaw() * 256f) / 360f)); netStream.writeByte((byte)(int)((look.getPitch() * 256f) / 360f)); netStream.writeShort(currentItem); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java index c5e0c0c..4d6f647 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/SpawnPositionPacket.java @@ -7,8 +7,8 @@ package mc.core.network.proto_125.packets; import lombok.Setter; import lombok.ToString; import mc.core.Location; +import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @Setter @ToString @@ -16,13 +16,9 @@ public class SpawnPositionPacket implements SCPacket { private Location location; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); - + public void writeSelf(NetStream netStream) { netStream.writeInt((int) location.getX()); netStream.writeInt((int) location.getY()); netStream.writeInt((int) location.getZ()); - - return netStream.toByteArray(); } } diff --git a/proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java b/proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java index 46bfeee..f1819e3 100644 --- a/proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java +++ b/proto125/src/main/java/mc/core/network/proto_125/packets/TimeUpdatePacket.java @@ -11,7 +11,6 @@ import lombok.ToString; import mc.core.network.CSPacket; import mc.core.network.NetStream; import mc.core.network.SCPacket; -import mc.core.network.proto_125.ByteArrayOutputNetStream; @NoArgsConstructor @AllArgsConstructor @@ -21,10 +20,8 @@ public class TimeUpdatePacket implements SCPacket, CSPacket { private long time; @Override - public byte[] toByteArray() { - ByteArrayOutputNetStream netStream = new ByteArrayOutputNetStream(); + public void writeSelf(NetStream netStream) { netStream.writeLong(time); - return netStream.toByteArray(); } // нахрена вообще клиент шлет нам этот пакет???