From f801b442a4e324522cfcaa09f33c44616f79971f Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Wed, 29 Nov 2023 22:58:15 -0800
Subject: [PATCH] Refactor base packet class

---
 .../lunarcore/server/packet/BasePacket.java   | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/main/java/emu/lunarcore/server/packet/BasePacket.java b/src/main/java/emu/lunarcore/server/packet/BasePacket.java
index 4554937..585ef9a 100644
--- a/src/main/java/emu/lunarcore/server/packet/BasePacket.java
+++ b/src/main/java/emu/lunarcore/server/packet/BasePacket.java
@@ -3,41 +3,28 @@ package emu.lunarcore.server.packet;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import lombok.Getter;
 import us.hebi.quickbuf.ProtoMessage;
 
+@Getter
 public class BasePacket {
     public static final int HEADER_CONST = 0x9d74c714;
     public static final int TAIL_CONST = 0xd7a152c8;
 
-    private int opcode;
+    private int cmdId;
     private byte[] data;
 
-    // Encryption
-    private boolean useDispatchKey;
-    public boolean shouldEncrypt = true;
-
-    public BasePacket(int opcode) {
-        this.opcode = opcode;
+    public BasePacket(int cmdId) {
+        this.cmdId = cmdId;
     }
-
-    public int getOpcode() {
-        return opcode;
+    
+    public BasePacket(int cmdId, byte[] data) {
+        this.cmdId = cmdId;
+        this.data = data;
     }
-
+    
     public void setOpcode(int opcode) {
-        this.opcode = opcode;
-    }
-
-    public boolean useDispatchKey() {
-        return useDispatchKey;
-    }
-
-    public void setUseDispatchKey(boolean useDispatchKey) {
-        this.useDispatchKey = useDispatchKey;
-    }
-
-    public byte[] getData() {
-        return data;
+        this.cmdId = opcode;
     }
 
     public void setData(byte[] data) {
@@ -56,7 +43,7 @@ public class BasePacket {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(4 + 2 + 4 + getData().length + 4);
 
         this.writeUint32(baos, HEADER_CONST);
-        this.writeUint16(baos, opcode);
+        this.writeUint16(baos, cmdId);
         this.writeUint16(baos, 0); // Empty header
         this.writeUint32(baos, data.length);
         this.writeBytes(baos, data);
@@ -67,13 +54,13 @@ public class BasePacket {
         return packet;
     }
 
-    public void writeUint16(ByteArrayOutputStream baos, int i) {
+    private void writeUint16(ByteArrayOutputStream baos, int i) {
         // Unsigned short
         baos.write((byte) ((i >>> 8) & 0xFF));
         baos.write((byte) (i & 0xFF));
     }
 
-    public void writeUint32(ByteArrayOutputStream baos, int i) {
+    private void writeUint32(ByteArrayOutputStream baos, int i) {
         // Unsigned int (long)
         baos.write((byte) ((i >>> 24) & 0xFF));
         baos.write((byte) ((i >>> 16) & 0xFF));
@@ -81,7 +68,7 @@ public class BasePacket {
         baos.write((byte) (i & 0xFF));
     }
 
-    public void writeBytes(ByteArrayOutputStream baos, byte[] bytes) {
+    private void writeBytes(ByteArrayOutputStream baos, byte[] bytes) {
         try {
             baos.write(bytes);
         } catch (IOException e) {