From 4e4b0aad40d9846e9282594f64093f95cf20da95 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Tue, 11 Aug 2020 17:56:41 +0100
Subject: [PATCH] Refactor the HuffmanCodec class

Signed-off-by: Graham <gpe@openrs2.dev>
---
 share/deob/map/client.yaml | 140 ++++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml
index 5d66e839..88f9cbd1 100644
--- a/share/deob/map/client.yaml
+++ b/share/deob/map/client.yaml
@@ -176,7 +176,7 @@ classes:
   client!og: "Class4_Sub1_Sub21"
   client!oh: "Class127"
   client!oi: "Class128"
-  client!oj: "Class129"
+  client!oj: "HuffmanCodec"
   client!ok: "BrokenOutputStream"
   client!ol: "Class4_Sub20"
   client!om: "Class130"
@@ -7200,11 +7200,11 @@ fields:
     owner: "Static5"
     name: "anInt3884"
   client!oj.c [I:
-    owner: "Class129"
-    name: "anIntArray416"
+    owner: "HuffmanCodec"
+    name: "codewords"
   client!oj.f [B:
-    owner: "Class129"
-    name: "aByteArray50"
+    owner: "HuffmanCodec"
+    name: "bits"
   client!oj.g Z:
     owner: "Static5"
     name: "aBoolean276"
@@ -7212,8 +7212,8 @@ fields:
     owner: "Static5"
     name: "anInt3890"
   client!oj.l [I:
-    owner: "Class129"
-    name: "anIntArray417"
+    owner: "HuffmanCodec"
+    name: "symbolTree"
   client!ok.d Lclient!ol;:
     owner: "Static5"
     name: "aClass4_Sub20_1"
@@ -33428,28 +33428,28 @@ methods:
       0: "arg0"
     locals: {}
   client!oj.<init> ([B)V:
-    owner: "Class129"
+    owner: "HuffmanCodec"
     name: "<init>"
     arguments:
-      0: "arg0"
+      0: "bits"
     locals:
-      6: "local6"
-      15: "local15"
-      18: "local18"
-      24: "local24"
-      31: "local31"
-      39: "local39"
-      43: "local43"
-      59: "local59"
-      65: "local65"
-      72: "local72"
-      85: "local85"
-      123: "local123"
-      147: "local147"
-      149: "local149"
-      156: "local156"
-      197: "local197"
-      199: "local199"
+      6: "symbols"
+      15: "nextNode"
+      18: "nextCodewords"
+      24: "symbol"
+      31: "codewordBits"
+      39: "bit"
+      43: "codeword"
+      59: "nextCodeword"
+      65: "i"
+      72: "nextCodeword2"
+      85: "bit2"
+      123: "i"
+      147: "node"
+      149: "i"
+      156: "bit2"
+      197: "newSymbolTree"
+      199: "j"
   client!oj.a (IIIIIIFIZ)[[I:
     owner: "Static27"
     name: "method3234"
@@ -33460,32 +33460,32 @@ methods:
       21: "local21"
       48: "local48"
   client!oj.a (III[B[BI)I:
-    owner: "Class129"
-    name: "method3232"
+    owner: "HuffmanCodec"
+    name: "encode"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      3: "arg2"
-      4: "arg3"
-      5: "arg4"
-    locals:
-      19: "local19"
-      23: "local23"
-      32: "local32"
-      37: "local37"
-      42: "local42"
-      64: "local64"
-      68: "local68"
-      79: "local79"
-      89: "local89"
-      109: "local109"
-      110: "local110"
-      129: "local129"
-      130: "local130"
-      149: "local149"
-      150: "local150"
-      169: "local169"
-      170: "local170"
+      4: "src"
+      1: "srcOff"
+      3: "dest"
+      0: "destOff"
+      5: "len"
+    locals:
+      19: "prevCodeword"
+      23: "pos"
+      32: "symbol"
+      37: "codeword"
+      42: "codewordBits"
+      64: "bytePos"
+      68: "bitPos"
+      79: "maskedPrevCodeword"
+      89: "endBytePos"
+      109: "bytePos2"
+      110: "bitPos2"
+      129: "bytePos3"
+      130: "bitPos3"
+      149: "bytePos4"
+      150: "bitPos4"
+      169: "bitPos5"
+      170: "bytePos5"
   client!oj.a (IIZLjava/lang/String;)Z:
     owner: "Static27"
     name: "method3229"
@@ -33519,26 +33519,26 @@ methods:
     locals:
       5: "local5"
   client!oj.b (III[B[BI)I:
-    owner: "Class129"
-    name: "method3233"
+    owner: "HuffmanCodec"
+    name: "decode"
     arguments:
-      0: "arg0"
-      1: "arg1"
-      3: "arg2"
-      4: "arg3"
-      5: "arg4"
-    locals:
-      23: "local23"
-      25: "local25"
-      29: "local29"
-      36: "local36"
-      46: "local46"
-      76: "local76"
-      121: "local121"
-      156: "local156"
-      199: "local199"
-      235: "local235"
-      270: "local270"
+      3: "src"
+      1: "srcOff"
+      4: "dest"
+      0: "destOff"
+      5: "len"
+    locals:
+      23: "node"
+      25: "srcPos"
+      29: "b"
+      36: "node2"
+      46: "node3"
+      76: "node4"
+      121: "node5"
+      156: "node6"
+      199: "node7"
+      235: "node8"
+      270: "node9"
   client!ok.a (BI)I:
     owner: "Static27"
     name: "method3235"