From 66840f94d7740cfd4219a70442c6ab519e84dcbf Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Sun, 9 Aug 2020 23:11:48 -0700
Subject: [PATCH] Refactored _writeUnsigned with _writeRaw with unsigned bit
 limits

---
 core/src/com/riiablo/io/BitOutput.java | 41 ++------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/core/src/com/riiablo/io/BitOutput.java b/core/src/com/riiablo/io/BitOutput.java
index bf005e5f..00aeef54 100644
--- a/core/src/com/riiablo/io/BitOutput.java
+++ b/core/src/com/riiablo/io/BitOutput.java
@@ -66,45 +66,7 @@ public class BitOutput {
     assert bits > 0 : "bits(" + bits + ") <= " + 0;
     assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
     assert (value & ~MASKS[bits]) == 0 : "value(" + value + ") is larger than bits(" + bits + ")";
-    incrementBitsWritten(bits);
-    cache |= (value << bitsCached);
-    bitsCached += bits;
-    if (bitsCached > Long.SIZE) {
-      writeCacheSafe(value, bits);
-    } else {
-      writeCacheUnsafe(bits);
-    }
-  }
-
-  private void writeCacheSafe(long value, int bits) {
-    assert bits > 0 : "bits(" + bits + ") < " + 1;
-    assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
-    assert bitsCached > Long.SIZE : "bitsCached(" + bitsCached + ") <= " + Long.SIZE;
-    assert bitsCached - bits < Byte.SIZE : "bitsCached(" + bitsCached + ") - bits(" + bits + ") > " + (Byte.SIZE - 1);
-
-    final int overflowBits = bitsCached - Long.SIZE;
-    final int overflowShift = Long.SIZE - overflowBits;
-
-    for (; bitsCached >= Byte.SIZE; bitsCached -= Byte.SIZE) {
-      final long octet = cache & 0xFF;
-      byteOutput._write8(octet);
-      cache >>>= Byte.SIZE;
-    }
-
-    assert overflowBits > 0 : "overflowBits(" + overflowBits + ") < " + 1;
-    cache = (value >>> overflowShift) & MASKS[overflowBits];
-  }
-
-  private void writeCacheUnsafe(int bits) {
-    assert bits > 0 : "bits(" + bits + ") < " + 1;
-    assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
-    assert bitsCached >= bits : "bitsCached(" + bitsCached + ") < bits(" + bits + ")";
-    assert bitsCached <= Long.SIZE : "bitsCached(" + bitsCached + ") > " + Long.SIZE;
-    for (; bitsCached >= Byte.SIZE; bitsCached -= Byte.SIZE) {
-      final long octet = cache & 0xFF;
-      byteOutput._write8(octet);
-      cache >>>= Byte.SIZE;
-    }
+    _writeRaw(value, bits);
   }
 
   void writeSigned(long value, int bits) {
@@ -125,6 +87,7 @@ public class BitOutput {
 
     final int overflowBits = bitsCached - Long.SIZE;
     _writeCache(bits);
+    assert bitsCached < Byte.SIZE : "bitsCached(" + bitsCached + ") > " + (Byte.SIZE - 1);
     if (overflowBits > 0) {
       final int overflowShift = Long.SIZE - overflowBits;
       cache = (value >>> overflowShift) & MASKS[overflowBits];