From 7101fd04f3d28f44f0255a6f0143281932336ae7 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Sun, 28 Feb 2021 17:19:52 +0100
Subject: [PATCH] network: rename getCommand methods

---
 .../exceptions/PacketNotImplementedException.java         | 2 +-
 .../de/bixilon/minosoft/protocol/network/Network.java     | 4 ++--
 .../minosoft/protocol/protocol/InPacketBuffer.java        | 2 +-
 .../minosoft/protocol/protocol/OutPacketBuffer.java       | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java b/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java
index fff18def2..481d15504 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/exceptions/PacketNotImplementedException.java
@@ -20,6 +20,6 @@ import de.bixilon.minosoft.protocol.protocol.Packets;
 public class PacketNotImplementedException extends PacketParseException {
 
     public PacketNotImplementedException(InPacketBuffer buffer, Packets.Clientbound packetType, Connection connection) {
-        super(String.format("Packet not implemented yet (id=0x%x, name=%s, length=%d, dataLength=%d, version=%s, state=%s)", buffer.getCommand(), packetType, buffer.getLength(), buffer.getBytesLeft(), connection.getVersion(), connection.getConnectionState()));
+        super(String.format("Packet not implemented yet (id=0x%x, name=%s, length=%d, dataLength=%d, version=%s, state=%s)", buffer.getPacketTypeId(), packetType, buffer.getLength(), buffer.getBytesLeft(), connection.getVersion(), connection.getConnectionState()));
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
index 35aa9a462..20a7fdb0d 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
@@ -65,9 +65,9 @@ public abstract class Network {
         Packets.Clientbound packetType = null;
 
         try {
-            packetType = this.connection.getPacketByCommand(this.connection.getConnectionState(), data.getCommand());
+            packetType = this.connection.getPacketByCommand(this.connection.getConnectionState(), data.getPacketTypeId());
             if (packetType == null) {
-                throw new UnknownPacketException(String.format("Server sent us an unknown packet (id=0x%x, length=%d, data=%s)", data.getCommand(), bytes.length, data.getBase64()));
+                throw new UnknownPacketException(String.format("Server sent us an unknown packet (id=0x%x, length=%d, data=%s)", data.getPacketTypeId(), bytes.length, data.getBase64()));
             }
 
             ClientboundPacket packet;
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/InPacketBuffer.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/InPacketBuffer.java
index dddf09dc6..01651ba7b 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/InPacketBuffer.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/InPacketBuffer.java
@@ -23,7 +23,7 @@ public class InPacketBuffer extends InByteBuffer {
         this.command = readVarInt();
     }
 
-    public int getCommand() {
+    public int getPacketTypeId() {
         return this.command;
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutPacketBuffer.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutPacketBuffer.java
index c3d5f05d4..635e7e5bc 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/OutPacketBuffer.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/OutPacketBuffer.java
@@ -18,19 +18,19 @@ import de.bixilon.minosoft.protocol.network.Connection;
 public class OutPacketBuffer extends OutByteBuffer {
     private final int command;
 
-    public OutPacketBuffer(Connection connection, Packets.Serverbound command) {
+    public OutPacketBuffer(Connection connection, Packets.Serverbound packetType) {
         super(connection);
-        this.command = connection.getPacketCommand(command);
+        this.command = connection.getPacketCommand(packetType);
     }
 
     @Override
     public byte[] toByteArray() {
         OutByteBuffer ret = new OutByteBuffer(this);
-        ret.prefixVarInt(getCommand());
+        ret.prefixVarInt(getPacketTypeId());
         return ret.toByteArray();
     }
 
-    public int getCommand() {
+    public int getPacketTypeId() {
         return this.command;
     }
 }