diff --git a/src/main/java/net/minestom/server/data/type/BooleanData.java b/src/main/java/net/minestom/server/data/type/BooleanData.java index 6c6dcf5cd..440c7456d 100644 --- a/src/main/java/net/minestom/server/data/type/BooleanData.java +++ b/src/main/java/net/minestom/server/data/type/BooleanData.java @@ -6,12 +6,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class BooleanData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Boolean value) { - binaryWriter.writeBoolean(value); + public void encode(BinaryWriter writer, Boolean value) { + writer.writeBoolean(value); } @Override - public Boolean decode(BinaryReader binaryReader) { - return binaryReader.readBoolean(); + public Boolean decode(BinaryReader reader) { + return reader.readBoolean(); } } diff --git a/src/main/java/net/minestom/server/data/type/ByteData.java b/src/main/java/net/minestom/server/data/type/ByteData.java index 60a783ec1..27a176663 100644 --- a/src/main/java/net/minestom/server/data/type/ByteData.java +++ b/src/main/java/net/minestom/server/data/type/ByteData.java @@ -6,12 +6,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ByteData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Byte value) { - binaryWriter.writeByte(value); + public void encode(BinaryWriter writer, Byte value) { + writer.writeByte(value); } @Override - public Byte decode(BinaryReader binaryReader) { - return binaryReader.readByte(); + public Byte decode(BinaryReader reader) { + return reader.readByte(); } } diff --git a/src/main/java/net/minestom/server/data/type/CharacterData.java b/src/main/java/net/minestom/server/data/type/CharacterData.java index b209a73ff..cbeee8d0f 100644 --- a/src/main/java/net/minestom/server/data/type/CharacterData.java +++ b/src/main/java/net/minestom/server/data/type/CharacterData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class CharacterData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Character value) { - binaryWriter.writeChar(value); + public void encode(BinaryWriter writer, Character value) { + writer.writeChar(value); } @Override - public Character decode(BinaryReader binaryReader) { - return binaryReader.readChar(); + public Character decode(BinaryReader reader) { + return reader.readChar(); } } diff --git a/src/main/java/net/minestom/server/data/type/DoubleData.java b/src/main/java/net/minestom/server/data/type/DoubleData.java index 282274813..7c64b860c 100644 --- a/src/main/java/net/minestom/server/data/type/DoubleData.java +++ b/src/main/java/net/minestom/server/data/type/DoubleData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class DoubleData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Double value) { - binaryWriter.writeDouble(value); + public void encode(BinaryWriter writer, Double value) { + writer.writeDouble(value); } @Override - public Double decode(BinaryReader binaryReader) { - return binaryReader.readDouble(); + public Double decode(BinaryReader reader) { + return reader.readDouble(); } } diff --git a/src/main/java/net/minestom/server/data/type/FloatData.java b/src/main/java/net/minestom/server/data/type/FloatData.java index d2eee8b1f..97cb85ce4 100644 --- a/src/main/java/net/minestom/server/data/type/FloatData.java +++ b/src/main/java/net/minestom/server/data/type/FloatData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class FloatData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Float value) { - binaryWriter.writeFloat(value); + public void encode(BinaryWriter writer, Float value) { + writer.writeFloat(value); } @Override - public Float decode(BinaryReader binaryReader) { - return binaryReader.readFloat(); + public Float decode(BinaryReader reader) { + return reader.readFloat(); } } diff --git a/src/main/java/net/minestom/server/data/type/IntegerData.java b/src/main/java/net/minestom/server/data/type/IntegerData.java index 1cc5a7ae6..7465f82a0 100644 --- a/src/main/java/net/minestom/server/data/type/IntegerData.java +++ b/src/main/java/net/minestom/server/data/type/IntegerData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class IntegerData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Integer value) { - binaryWriter.writeVarInt(value); + public void encode(BinaryWriter writer, Integer value) { + writer.writeVarInt(value); } @Override - public Integer decode(BinaryReader binaryReader) { - return binaryReader.readVarInt(); + public Integer decode(BinaryReader reader) { + return reader.readVarInt(); } } \ No newline at end of file diff --git a/src/main/java/net/minestom/server/data/type/InventoryData.java b/src/main/java/net/minestom/server/data/type/InventoryData.java index 3540d36a8..293098b71 100644 --- a/src/main/java/net/minestom/server/data/type/InventoryData.java +++ b/src/main/java/net/minestom/server/data/type/InventoryData.java @@ -9,31 +9,31 @@ import net.minestom.server.utils.binary.BinaryWriter; public class InventoryData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Inventory value) { + public void encode(BinaryWriter writer, Inventory value) { final InventoryType inventoryType = value.getInventoryType(); final int size = inventoryType.getAdditionalSlot(); // Inventory title & type - binaryWriter.writeSizedString(value.getTitle()); - binaryWriter.writeSizedString(inventoryType.name()); + writer.writeSizedString(value.getTitle()); + writer.writeSizedString(inventoryType.name()); // Write all item stacks for (int i = 0; i < size; i++) { - binaryWriter.writeItemStack(value.getItemStack(i)); + writer.writeItemStack(value.getItemStack(i)); } } @Override - public Inventory decode(BinaryReader binaryReader) { - final String title = binaryReader.readSizedString(); - final InventoryType inventoryType = InventoryType.valueOf(binaryReader.readSizedString()); + public Inventory decode(BinaryReader reader) { + final String title = reader.readSizedString(); + final InventoryType inventoryType = InventoryType.valueOf(reader.readSizedString()); final int size = inventoryType.getAdditionalSlot(); Inventory inventory = new Inventory(inventoryType, title); // Read all item stacks for (int i = 0; i < size; i++) { - inventory.setItemStack(i, binaryReader.readSlot()); + inventory.setItemStack(i, reader.readSlot()); } return inventory; diff --git a/src/main/java/net/minestom/server/data/type/ItemStackData.java b/src/main/java/net/minestom/server/data/type/ItemStackData.java index 61ff61c49..8c28e5172 100644 --- a/src/main/java/net/minestom/server/data/type/ItemStackData.java +++ b/src/main/java/net/minestom/server/data/type/ItemStackData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ItemStackData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, ItemStack value) { - binaryWriter.writeItemStack(value); + public void encode(BinaryWriter writer, ItemStack value) { + writer.writeItemStack(value); } @Override - public ItemStack decode(BinaryReader binaryReader) { - return binaryReader.readSlot(); + public ItemStack decode(BinaryReader reader) { + return reader.readSlot(); } } diff --git a/src/main/java/net/minestom/server/data/type/LongData.java b/src/main/java/net/minestom/server/data/type/LongData.java index a28b6a135..83dc0a459 100644 --- a/src/main/java/net/minestom/server/data/type/LongData.java +++ b/src/main/java/net/minestom/server/data/type/LongData.java @@ -6,12 +6,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class LongData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Long value) { - binaryWriter.writeLong(value); + public void encode(BinaryWriter writer, Long value) { + writer.writeLong(value); } @Override - public Long decode(BinaryReader binaryReader) { - return binaryReader.readLong(); + public Long decode(BinaryReader reader) { + return reader.readLong(); } } diff --git a/src/main/java/net/minestom/server/data/type/SerializableDataData.java b/src/main/java/net/minestom/server/data/type/SerializableDataData.java index 4b08e03c0..4b4657542 100644 --- a/src/main/java/net/minestom/server/data/type/SerializableDataData.java +++ b/src/main/java/net/minestom/server/data/type/SerializableDataData.java @@ -10,12 +10,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class SerializableDataData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, SerializableData value) { - binaryWriter.writeBytes(value.getSerializedData()); + public void encode(BinaryWriter writer, SerializableData value) { + writer.writeBytes(value.getSerializedData()); } @Override - public SerializableData decode(BinaryReader binaryReader) { - return DataReader.readData(binaryReader); + public SerializableData decode(BinaryReader reader) { + return DataReader.readData(reader); } } diff --git a/src/main/java/net/minestom/server/data/type/ShortData.java b/src/main/java/net/minestom/server/data/type/ShortData.java index 720549ee9..5800ede45 100644 --- a/src/main/java/net/minestom/server/data/type/ShortData.java +++ b/src/main/java/net/minestom/server/data/type/ShortData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ShortData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, Short value) { - binaryWriter.writeShort(value); + public void encode(BinaryWriter writer, Short value) { + writer.writeShort(value); } @Override - public Short decode(BinaryReader binaryReader) { - return binaryReader.readShort(); + public Short decode(BinaryReader reader) { + return reader.readShort(); } } diff --git a/src/main/java/net/minestom/server/data/type/StringData.java b/src/main/java/net/minestom/server/data/type/StringData.java index 2f3f83bd9..6a604ed50 100644 --- a/src/main/java/net/minestom/server/data/type/StringData.java +++ b/src/main/java/net/minestom/server/data/type/StringData.java @@ -7,12 +7,12 @@ import net.minestom.server.utils.binary.BinaryWriter; public class StringData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, String value) { - binaryWriter.writeSizedString(value); + public void encode(BinaryWriter writer, String value) { + writer.writeSizedString(value); } @Override - public String decode(BinaryReader binaryReader) { - return binaryReader.readSizedString(); + public String decode(BinaryReader reader) { + return reader.readSizedString(); } } diff --git a/src/main/java/net/minestom/server/data/type/UuidType.java b/src/main/java/net/minestom/server/data/type/UuidType.java index e777c5e5a..8df3929f7 100644 --- a/src/main/java/net/minestom/server/data/type/UuidType.java +++ b/src/main/java/net/minestom/server/data/type/UuidType.java @@ -8,12 +8,12 @@ import java.util.UUID; public class UuidType extends DataType { @Override - public void encode(BinaryWriter binaryWriter, UUID value) { - binaryWriter.writeUuid(value); + public void encode(BinaryWriter writer, UUID value) { + writer.writeUuid(value); } @Override - public UUID decode(BinaryReader binaryReader) { - return binaryReader.readUuid(); + public UUID decode(BinaryReader reader) { + return reader.readUuid(); } } diff --git a/src/main/java/net/minestom/server/data/type/array/BooleanArrayData.java b/src/main/java/net/minestom/server/data/type/array/BooleanArrayData.java index 51197188f..b74ac2c81 100644 --- a/src/main/java/net/minestom/server/data/type/array/BooleanArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/BooleanArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class BooleanArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, boolean[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, boolean[] value) { + writer.writeVarInt(value.length); for (boolean val : value) { - binaryWriter.writeBoolean(val); + writer.writeBoolean(val); } } @Override - public boolean[] decode(BinaryReader binaryReader) { - boolean[] array = new boolean[binaryReader.readVarInt()]; + public boolean[] decode(BinaryReader reader) { + boolean[] array = new boolean[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readBoolean(); + array[i] = reader.readBoolean(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/ByteArrayData.java b/src/main/java/net/minestom/server/data/type/array/ByteArrayData.java index b71925361..7ef154681 100644 --- a/src/main/java/net/minestom/server/data/type/array/ByteArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/ByteArrayData.java @@ -6,13 +6,13 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ByteArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, byte[] value) { - encodeByteArray(binaryWriter, value); + public void encode(BinaryWriter writer, byte[] value) { + encodeByteArray(writer, value); } @Override - public byte[] decode(BinaryReader binaryReader) { - return decodeByteArray(binaryReader); + public byte[] decode(BinaryReader reader) { + return decodeByteArray(reader); } public static void encodeByteArray(BinaryWriter binaryWriter, byte[] value) { diff --git a/src/main/java/net/minestom/server/data/type/array/CharacterArrayData.java b/src/main/java/net/minestom/server/data/type/array/CharacterArrayData.java index d58278deb..8e7e36097 100644 --- a/src/main/java/net/minestom/server/data/type/array/CharacterArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/CharacterArrayData.java @@ -6,18 +6,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class CharacterArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, char[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, char[] value) { + writer.writeVarInt(value.length); for (char val : value) { - binaryWriter.writeChar(val); + writer.writeChar(val); } } @Override - public char[] decode(BinaryReader binaryReader) { - char[] array = new char[binaryReader.readVarInt()]; + public char[] decode(BinaryReader reader) { + char[] array = new char[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readChar(); + array[i] = reader.readChar(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/DoubleArrayData.java b/src/main/java/net/minestom/server/data/type/array/DoubleArrayData.java index 33b5a92f2..0182c2c87 100644 --- a/src/main/java/net/minestom/server/data/type/array/DoubleArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/DoubleArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class DoubleArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, double[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, double[] value) { + writer.writeVarInt(value.length); for (double val : value) { - binaryWriter.writeDouble(val); + writer.writeDouble(val); } } @Override - public double[] decode(BinaryReader binaryReader) { - double[] array = new double[binaryReader.readVarInt()]; + public double[] decode(BinaryReader reader) { + double[] array = new double[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readDouble(); + array[i] = reader.readDouble(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/FloatArrayData.java b/src/main/java/net/minestom/server/data/type/array/FloatArrayData.java index 8af81c956..119ab001b 100644 --- a/src/main/java/net/minestom/server/data/type/array/FloatArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/FloatArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class FloatArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, float[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, float[] value) { + writer.writeVarInt(value.length); for (float val : value) { - binaryWriter.writeFloat(val); + writer.writeFloat(val); } } @Override - public float[] decode(BinaryReader binaryReader) { - float[] array = new float[binaryReader.readVarInt()]; + public float[] decode(BinaryReader reader) { + float[] array = new float[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readFloat(); + array[i] = reader.readFloat(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/IntegerArrayData.java b/src/main/java/net/minestom/server/data/type/array/IntegerArrayData.java index d77c57b60..eca283cf7 100644 --- a/src/main/java/net/minestom/server/data/type/array/IntegerArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/IntegerArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class IntegerArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, int[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, int[] value) { + writer.writeVarInt(value.length); for (int val : value) { - binaryWriter.writeInt(val); + writer.writeInt(val); } } @Override - public int[] decode(BinaryReader binaryReader) { - int[] array = new int[binaryReader.readVarInt()]; + public int[] decode(BinaryReader reader) { + int[] array = new int[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readInteger(); + array[i] = reader.readInteger(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/ItemStackArrayData.java b/src/main/java/net/minestom/server/data/type/array/ItemStackArrayData.java index 713e98152..e1baa8157 100644 --- a/src/main/java/net/minestom/server/data/type/array/ItemStackArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/ItemStackArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ItemStackArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, ItemStack[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, ItemStack[] value) { + writer.writeVarInt(value.length); for (ItemStack itemStack : value) { - binaryWriter.writeItemStack(itemStack); + writer.writeItemStack(itemStack); } } @Override - public ItemStack[] decode(BinaryReader binaryReader) { - ItemStack[] items = new ItemStack[binaryReader.readVarInt()]; + public ItemStack[] decode(BinaryReader reader) { + ItemStack[] items = new ItemStack[reader.readVarInt()]; for (int i = 0; i < items.length; i++) { - items[i] = binaryReader.readSlot(); + items[i] = reader.readSlot(); } return items; } diff --git a/src/main/java/net/minestom/server/data/type/array/LongArrayData.java b/src/main/java/net/minestom/server/data/type/array/LongArrayData.java index da6d8beeb..486847dbd 100644 --- a/src/main/java/net/minestom/server/data/type/array/LongArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/LongArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class LongArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, long[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, long[] value) { + writer.writeVarInt(value.length); for (long val : value) { - binaryWriter.writeLong(val); + writer.writeLong(val); } } @Override - public long[] decode(BinaryReader binaryReader) { - long[] array = new long[binaryReader.readVarInt()]; + public long[] decode(BinaryReader reader) { + long[] array = new long[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readLong(); + array[i] = reader.readLong(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/ShortArrayData.java b/src/main/java/net/minestom/server/data/type/array/ShortArrayData.java index dbb683411..51835f463 100644 --- a/src/main/java/net/minestom/server/data/type/array/ShortArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/ShortArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class ShortArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, short[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, short[] value) { + writer.writeVarInt(value.length); for (short val : value) { - binaryWriter.writeShort(val); + writer.writeShort(val); } } @Override - public short[] decode(BinaryReader binaryReader) { - short[] array = new short[binaryReader.readVarInt()]; + public short[] decode(BinaryReader reader) { + short[] array = new short[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readShort(); + array[i] = reader.readShort(); } return array; } diff --git a/src/main/java/net/minestom/server/data/type/array/StringArrayData.java b/src/main/java/net/minestom/server/data/type/array/StringArrayData.java index 5a63571be..d37fc4b19 100644 --- a/src/main/java/net/minestom/server/data/type/array/StringArrayData.java +++ b/src/main/java/net/minestom/server/data/type/array/StringArrayData.java @@ -7,18 +7,18 @@ import net.minestom.server.utils.binary.BinaryWriter; public class StringArrayData extends DataType { @Override - public void encode(BinaryWriter binaryWriter, String[] value) { - binaryWriter.writeVarInt(value.length); + public void encode(BinaryWriter writer, String[] value) { + writer.writeVarInt(value.length); for (String val : value) { - binaryWriter.writeSizedString(val); + writer.writeSizedString(val); } } @Override - public String[] decode(BinaryReader binaryReader) { - String[] array = new String[binaryReader.readVarInt()]; + public String[] decode(BinaryReader reader) { + String[] array = new String[reader.readVarInt()]; for (int i = 0; i < array.length; i++) { - array[i] = binaryReader.readSizedString(); + array[i] = reader.readSizedString(); } return array; } diff --git a/src/main/java/net/minestom/server/network/PacketProcessor.java b/src/main/java/net/minestom/server/network/PacketProcessor.java index 33d25b09f..21a919ab9 100644 --- a/src/main/java/net/minestom/server/network/PacketProcessor.java +++ b/src/main/java/net/minestom/server/network/PacketProcessor.java @@ -22,17 +22,14 @@ import java.util.concurrent.ConcurrentHashMap; public class PacketProcessor { - private Map connectionPlayerConnectionMap = new ConcurrentHashMap<>(); - - private ConnectionManager connectionManager; + private final Map connectionPlayerConnectionMap = new ConcurrentHashMap<>(); // Protocols - private ClientStatusPacketsHandler statusPacketsHandler; - private ClientLoginPacketsHandler loginPacketsHandler; - private ClientPlayPacketsHandler playPacketsHandler; + private final ClientStatusPacketsHandler statusPacketsHandler; + private final ClientLoginPacketsHandler loginPacketsHandler; + private final ClientPlayPacketsHandler playPacketsHandler; public PacketProcessor() { - this.connectionManager = MinecraftServer.getConnectionManager(); this.statusPacketsHandler = new ClientStatusPacketsHandler(); this.loginPacketsHandler = new ClientLoginPacketsHandler(); @@ -62,7 +59,7 @@ public class PacketProcessor { if (packet.packetId == 0) { HandshakePacket handshakePacket = new HandshakePacket(); handshakePacket.read(binaryReader); - handshakePacket.process(playerConnection, connectionManager); + handshakePacket.process(playerConnection); } return; } @@ -77,13 +74,12 @@ public class PacketProcessor { case LOGIN: final ClientPreplayPacket loginPacket = (ClientPreplayPacket) loginPacketsHandler.getPacketInstance(packet.packetId); loginPacket.read(binaryReader); - loginPacket.process(playerConnection, connectionManager); + loginPacket.process(playerConnection); break; case STATUS: final ClientPreplayPacket statusPacket = (ClientPreplayPacket) statusPacketsHandler.getPacketInstance(packet.packetId); statusPacket.read(binaryReader); - - statusPacket.process(playerConnection, connectionManager); + statusPacket.process(playerConnection); break; } } diff --git a/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java b/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java index cfdc505f1..5d6fc3108 100644 --- a/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/ClientPreplayPacket.java @@ -1,11 +1,17 @@ package net.minestom.server.network.packet.client; +import net.minestom.server.MinecraftServer; import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.player.PlayerConnection; public interface ClientPreplayPacket extends ClientPacket { + ConnectionManager CONNECTION_MANAGER = MinecraftServer.getConnectionManager(); - void process(PlayerConnection connection, ConnectionManager connectionManager); - + /** + * Called when this packet is received + * + * @param connection the connection who sent the packet + */ + void process(PlayerConnection connection); } diff --git a/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java index 89c84ec92..b05ebe2b8 100644 --- a/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/handshake/HandshakePacket.java @@ -3,7 +3,6 @@ package net.minestom.server.network.packet.client.handshake; import net.minestom.server.MinecraftServer; import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ColoredText; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.ConnectionState; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.packet.server.login.LoginDisconnect; @@ -26,7 +25,7 @@ public class HandshakePacket implements ClientPreplayPacket { } @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { + public void process(PlayerConnection connection) { switch (nextState) { case 1: connection.setConnectionState(ConnectionState.STATUS); diff --git a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java index 660d6d2a2..b74070fa8 100644 --- a/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/login/EncryptionResponsePacket.java @@ -5,7 +5,6 @@ import com.mojang.authlib.exceptions.AuthenticationUnavailableException; import net.minestom.server.MinecraftServer; import net.minestom.server.data.type.array.ByteArrayData; import net.minestom.server.extras.mojangAuth.MojangCrypt; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.ConnectionState; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.packet.server.login.LoginSuccessPacket; @@ -20,54 +19,54 @@ import java.util.concurrent.atomic.AtomicInteger; public class EncryptionResponsePacket implements ClientPreplayPacket { - private final static String THREAD_NAME = "Mojang Auth Thread"; - private static AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0); - private byte[] sharedSecret; - private byte[] verifyToken; + private final static String THREAD_NAME = "Mojang Auth Thread"; + private static AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0); + private byte[] sharedSecret; + private byte[] verifyToken; - @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { - new Thread(THREAD_NAME + " #" + UNIQUE_THREAD_ID.incrementAndGet()) { + @Override + public void process(PlayerConnection connection) { + new Thread(THREAD_NAME + " #" + UNIQUE_THREAD_ID.incrementAndGet()) { - public void run() { - try { - if (!Arrays.equals(connection.getNonce(), getNonce())) { - System.out.println(connection.getLoginUsername() + " tried to login with an invalid nonce!"); - return; - } - if (!connection.getLoginUsername().isEmpty()) { - String string3 = new BigInteger(MojangCrypt.digestData("", MinecraftServer.getKeyPair().getPublic(), getSecretKey())).toString(16); - GameProfile gameProfile = MinecraftServer.getSessionService().hasJoinedServer(new GameProfile(null, connection.getLoginUsername()), string3); - ((NettyPlayerConnection) connection).setEncryptionKey(getSecretKey()); - final int threshold = MinecraftServer.COMPRESSION_THRESHOLD; + public void run() { + try { + if (!Arrays.equals(connection.getNonce(), getNonce())) { + System.out.println(connection.getLoginUsername() + " tried to login with an invalid nonce!"); + return; + } + if (!connection.getLoginUsername().isEmpty()) { + final String string3 = new BigInteger(MojangCrypt.digestData("", MinecraftServer.getKeyPair().getPublic(), getSecretKey())).toString(16); + final GameProfile gameProfile = MinecraftServer.getSessionService().hasJoinedServer(new GameProfile(null, connection.getLoginUsername()), string3); + ((NettyPlayerConnection) connection).setEncryptionKey(getSecretKey()); + final int threshold = MinecraftServer.COMPRESSION_THRESHOLD; - if (threshold > 0) { - connection.enableCompression(threshold); - } - LoginSuccessPacket loginSuccessPacket = new LoginSuccessPacket(gameProfile.getId(), gameProfile.getName()); - connection.sendPacket(loginSuccessPacket); - MinecraftServer.getLOGGER().info("UUID of player {} is {}", connection.getLoginUsername(), gameProfile.getId()); - connection.setConnectionState(ConnectionState.PLAY); - connectionManager.createPlayer(gameProfile.getId(), gameProfile.getName(), connection); - } - } catch (AuthenticationUnavailableException e) { - e.printStackTrace(); - } - } - }.start(); - } + if (threshold > 0) { + connection.enableCompression(threshold); + } + LoginSuccessPacket loginSuccessPacket = new LoginSuccessPacket(gameProfile.getId(), gameProfile.getName()); + connection.sendPacket(loginSuccessPacket); + MinecraftServer.getLOGGER().info("UUID of player {} is {}", connection.getLoginUsername(), gameProfile.getId()); + connection.setConnectionState(ConnectionState.PLAY); + CONNECTION_MANAGER.createPlayer(gameProfile.getId(), gameProfile.getName(), connection); + } + } catch (AuthenticationUnavailableException e) { + e.printStackTrace(); + } + } + }.start(); + } - @Override - public void read(BinaryReader reader) { - sharedSecret = ByteArrayData.decodeByteArray(reader); - verifyToken = ByteArrayData.decodeByteArray(reader); - } + @Override + public void read(BinaryReader reader) { + sharedSecret = ByteArrayData.decodeByteArray(reader); + verifyToken = ByteArrayData.decodeByteArray(reader); + } - public SecretKey getSecretKey() { - return MojangCrypt.decryptByteToSecretKey(MinecraftServer.getKeyPair().getPrivate(), sharedSecret); - } + public SecretKey getSecretKey() { + return MojangCrypt.decryptByteToSecretKey(MinecraftServer.getKeyPair().getPrivate(), sharedSecret); + } - public byte[] getNonce() { - return MinecraftServer.getKeyPair().getPrivate() == null ? this.verifyToken : MojangCrypt.decryptUsingKey(MinecraftServer.getKeyPair().getPrivate(), this.verifyToken); - } + public byte[] getNonce() { + return MinecraftServer.getKeyPair().getPrivate() == null ? this.verifyToken : MojangCrypt.decryptUsingKey(MinecraftServer.getKeyPair().getPrivate(), this.verifyToken); + } } diff --git a/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java b/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java index 4f8086fa7..6b16c87cf 100644 --- a/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/login/LoginStartPacket.java @@ -4,7 +4,6 @@ import net.minestom.server.MinecraftServer; import net.minestom.server.chat.ChatColor; import net.minestom.server.chat.ColoredText; import net.minestom.server.extras.MojangAuth; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.ConnectionState; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.packet.server.login.EncryptionRequestPacket; @@ -23,9 +22,9 @@ public class LoginStartPacket implements ClientPreplayPacket { public String username; @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { + public void process(PlayerConnection connection) { if (MojangAuth.isUsingMojangAuth()) { - if (connectionManager.getPlayer(username) != null) { + if (CONNECTION_MANAGER.getPlayer(username) != null) { connection.sendPacket(new LoginDisconnect(ALREADY_CONNECTED_JSON)); connection.disconnect(); return; @@ -36,9 +35,9 @@ public class LoginStartPacket implements ClientPreplayPacket { EncryptionRequestPacket encryptionRequestPacket = new EncryptionRequestPacket(connection); connection.sendPacket(encryptionRequestPacket); } else { - UUID playerUuid = connectionManager.getPlayerConnectionUuid(connection, username); + final UUID playerUuid = CONNECTION_MANAGER.getPlayerConnectionUuid(connection, username); - int threshold = MinecraftServer.COMPRESSION_THRESHOLD; + final int threshold = MinecraftServer.COMPRESSION_THRESHOLD; if (threshold > 0) { connection.enableCompression(threshold); @@ -48,7 +47,7 @@ public class LoginStartPacket implements ClientPreplayPacket { connection.sendPacket(successPacket); connection.setConnectionState(ConnectionState.PLAY); - connectionManager.createPlayer(playerUuid, username, connection); + CONNECTION_MANAGER.createPlayer(playerUuid, username, connection); } } diff --git a/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java index 21a20d8bb..7e90184e8 100644 --- a/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/LegacyServerListPingPacket.java @@ -1,6 +1,5 @@ package net.minestom.server.network.packet.client.status; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.utils.binary.BinaryReader; @@ -10,7 +9,7 @@ public class LegacyServerListPingPacket implements ClientPreplayPacket { private byte payload; @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { + public void process(PlayerConnection connection) { } diff --git a/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java index 8771f8a3f..949fef69f 100644 --- a/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/PingPacket.java @@ -1,6 +1,5 @@ package net.minestom.server.network.packet.client.status; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.packet.server.status.PongPacket; import net.minestom.server.network.player.PlayerConnection; @@ -11,7 +10,7 @@ public class PingPacket implements ClientPreplayPacket { private long number; @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { + public void process(PlayerConnection connection) { PongPacket pongPacket = new PongPacket(number); connection.sendPacket(pongPacket); connection.disconnect(); diff --git a/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java index 78cbfc377..8e75de8ce 100644 --- a/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java @@ -1,7 +1,6 @@ package net.minestom.server.network.packet.client.status; import net.minestom.server.MinecraftServer; -import net.minestom.server.network.ConnectionManager; import net.minestom.server.network.packet.client.ClientPreplayPacket; import net.minestom.server.network.packet.server.handshake.ResponsePacket; import net.minestom.server.network.player.PlayerConnection; @@ -12,7 +11,7 @@ import net.minestom.server.utils.binary.BinaryReader; public class StatusRequestPacket implements ClientPreplayPacket { @Override - public void process(PlayerConnection connection, ConnectionManager connectionManager) { + public void process(PlayerConnection connection) { ResponseDataConsumer consumer = MinecraftServer.getResponseDataConsumer(); ResponseData responseData = new ResponseData(); diff --git a/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java index cfe05c655..9f103e5d5 100644 --- a/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/ServerPacket.java @@ -4,8 +4,20 @@ import net.minestom.server.utils.binary.BinaryWriter; public interface ServerPacket { + /** + * Write the packet to a {@link BinaryWriter} + * + * @param writer the writer to write the packet to + */ void write(BinaryWriter writer); + /** + * Get the id of this packet + *

+ * Should be a constant + * + * @return the id of this packet + */ int getId(); }