From ee542abb5d5bbd79a6d1549d8fffcb63b3db7860 Mon Sep 17 00:00:00 2001
From: cyberpwn <danielmillst@gmail.com>
Date: Wed, 22 Sep 2021 05:21:33 -0400
Subject: [PATCH] Sep palettes for other uses

---
 .../mca => data}/palette/BiomeContainer.java  |  2 +-
 .../{nbt/mca => data}/palette/BitStorage.java | 26 +++++++++----------
 .../palette/ChunkBiomeContainer.java          |  2 +-
 .../mca => data}/palette/CountConsumer.java   |  2 +-
 .../CrudeIncrementalIntIdentityHashBiMap.java |  2 +-
 .../mca => data}/palette/GlobalPalette.java   |  2 +-
 .../mca => data}/palette/HashMapPalette.java  |  2 +-
 .../util/{nbt/mca => data}/palette/IdMap.java |  2 +-
 .../{nbt/mca => data}/palette/IdMapper.java   |  2 +-
 .../mca => data}/palette/LinearPalette.java   |  2 +-
 .../util/{nbt/mca => data}/palette/Mth.java   |  2 +-
 .../{nbt/mca => data}/palette/Palette.java    |  2 +-
 .../mca => data}/palette/PaletteAccess.java   |  2 +-
 .../mca => data}/palette/PaletteResize.java   |  2 +-
 .../palette/PalettedContainer.java            |  2 +-
 .../{nbt/mca => data}/palette/QuartPos.java   |  2 +-
 .../palette/WrappedPalettedContainer.java     |  2 +-
 17 files changed, 29 insertions(+), 29 deletions(-)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/BiomeContainer.java (95%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/BitStorage.java (90%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/ChunkBiomeContainer.java (98%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/CountConsumer.java (94%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/CrudeIncrementalIntIdentityHashBiMap.java (99%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/GlobalPalette.java (97%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/HashMapPalette.java (98%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/IdMap.java (94%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/IdMapper.java (98%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/LinearPalette.java (98%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/Mth.java (99%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/Palette.java (95%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/PaletteAccess.java (95%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/PaletteResize.java (94%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/PalettedContainer.java (99%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/QuartPos.java (96%)
 rename src/main/java/com/volmit/iris/util/{nbt/mca => data}/palette/WrappedPalettedContainer.java (97%)

diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/BiomeContainer.java b/src/main/java/com/volmit/iris/util/data/palette/BiomeContainer.java
similarity index 95%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/BiomeContainer.java
rename to src/main/java/com/volmit/iris/util/data/palette/BiomeContainer.java
index e25ec9b80..c34b667e4 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/BiomeContainer.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/BiomeContainer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 public interface BiomeContainer {
     int[] getData();
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java
similarity index 90%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java
rename to src/main/java/com/volmit/iris/util/data/palette/BitStorage.java
index 5d41fab0c..42bf82def 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/BitStorage.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/BitStorage.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import org.apache.commons.lang3.Validate;
 
@@ -61,25 +61,25 @@ public class BitStorage {
 
     private final int divideShift;
 
-    public BitStorage(int var0, int var1) {
-        this(var0, var1, null);
+    public BitStorage(int bits, int length) {
+        this(bits, length, null);
     }
 
-    public BitStorage(int var0, int var1, long[] var2) {
-        Validate.inclusiveBetween(1L, 32L, var0);
-        this.size = var1;
-        this.bits = var0;
-        this.mask = (1L << var0) - 1L;
-        this.valuesPerLong = (char) (64 / var0);
+    public BitStorage(int bits, int length, long[] data) {
+        Validate.inclusiveBetween(1L, 32L, bits);
+        this.size = length;
+        this.bits = bits;
+        this.mask = (1L << bits) - 1L;
+        this.valuesPerLong = (char) (64 / bits);
         int var3 = 3 * (this.valuesPerLong - 1);
         this.divideMul = MAGIC[var3 + 0];
         this.divideAdd = MAGIC[var3 + 1];
         this.divideShift = MAGIC[var3 + 2];
-        int var4 = (var1 + this.valuesPerLong - 1) / this.valuesPerLong;
-        if (var2 != null) {
-            if (var2.length != var4)
+        int var4 = (length + this.valuesPerLong - 1) / this.valuesPerLong;
+        if (data != null) {
+            if (data.length != var4)
                 throw new RuntimeException("NO!");
-            this.data = var2;
+            this.data = data;
         } else {
             this.data = new long[var4];
         }
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/ChunkBiomeContainer.java b/src/main/java/com/volmit/iris/util/data/palette/ChunkBiomeContainer.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/ChunkBiomeContainer.java
rename to src/main/java/com/volmit/iris/util/data/palette/ChunkBiomeContainer.java
index 12e260016..1a25208b7 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/ChunkBiomeContainer.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/ChunkBiomeContainer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java b/src/main/java/com/volmit/iris/util/data/palette/CountConsumer.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java
rename to src/main/java/com/volmit/iris/util/data/palette/CountConsumer.java
index 9db65650e..35729dbe5 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/CountConsumer.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/CountConsumer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 @FunctionalInterface
 public interface CountConsumer<T> {
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java b/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java
similarity index 99%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java
rename to src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java
index 4886c69d1..492ff4689 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/CrudeIncrementalIntIdentityHashBiMap.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/CrudeIncrementalIntIdentityHashBiMap.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java b/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java
similarity index 97%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java
rename to src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java
index 89c07f3a9..6b835fa54 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/GlobalPalette.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/GlobalPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.ListTag;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java b/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java
rename to src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java
index a55a03f91..66acb24f2 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/HashMapPalette.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/HashMapPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java b/src/main/java/com/volmit/iris/util/data/palette/IdMap.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java
rename to src/main/java/com/volmit/iris/util/data/palette/IdMap.java
index 4a65bfdfd..5945eef13 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMap.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/IdMap.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 public interface IdMap<T> extends Iterable<T> {
     int getId(T paramT);
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java b/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java
rename to src/main/java/com/volmit/iris/util/data/palette/IdMapper.java
index d53bd1a43..a65dc7165 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/IdMapper.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/IdMapper.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterators;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java b/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java
similarity index 98%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java
rename to src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java
index 95f8951de..1d822e8b2 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/LinearPalette.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/LinearPalette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java b/src/main/java/com/volmit/iris/util/data/palette/Mth.java
similarity index 99%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java
rename to src/main/java/com/volmit/iris/util/data/palette/Mth.java
index 6b8dd7603..62c25608c 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/Mth.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/Mth.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import java.util.Random;
 import java.util.UUID;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java b/src/main/java/com/volmit/iris/util/data/palette/Palette.java
similarity index 95%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java
rename to src/main/java/com/volmit/iris/util/data/palette/Palette.java
index 597108104..66703cfab 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/Palette.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/Palette.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.ListTag;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java b/src/main/java/com/volmit/iris/util/data/palette/PaletteAccess.java
similarity index 95%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java
rename to src/main/java/com/volmit/iris/util/data/palette/PaletteAccess.java
index 53ae9b5c7..c213e0619 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteAccess.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/PaletteAccess.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java b/src/main/java/com/volmit/iris/util/data/palette/PaletteResize.java
similarity index 94%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java
rename to src/main/java/com/volmit/iris/util/data/palette/PaletteResize.java
index b4150c2fa..6cefd7d66 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PaletteResize.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/PaletteResize.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 interface PaletteResize<T> {
     int onResize(int paramInt, T paramT);
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java b/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java
similarity index 99%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java
rename to src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java
index 2b1ce16fe..d65089049 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/PalettedContainer.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/PalettedContainer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import com.volmit.iris.util.nbt.tag.ListTag;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/QuartPos.java b/src/main/java/com/volmit/iris/util/data/palette/QuartPos.java
similarity index 96%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/QuartPos.java
rename to src/main/java/com/volmit/iris/util/data/palette/QuartPos.java
index 81fb8ccc7..96e1160d4 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/QuartPos.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/QuartPos.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 public final class QuartPos {
     public static final int BITS = 2;
diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java b/src/main/java/com/volmit/iris/util/data/palette/WrappedPalettedContainer.java
similarity index 97%
rename from src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java
rename to src/main/java/com/volmit/iris/util/data/palette/WrappedPalettedContainer.java
index 9cd06f1cc..be57b3aaf 100644
--- a/src/main/java/com/volmit/iris/util/nbt/mca/palette/WrappedPalettedContainer.java
+++ b/src/main/java/com/volmit/iris/util/data/palette/WrappedPalettedContainer.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.volmit.iris.util.nbt.mca.palette;
+package com.volmit.iris.util.data.palette;
 
 import com.volmit.iris.util.nbt.tag.CompoundTag;
 import lombok.RequiredArgsConstructor;