refactor: move palette and bitarray to datastruct package

AllayMC · Dec 6, 2024 · d843dbf · d843dbf
1 parent f06e7aa
commit d843dbf
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/...laymc/server/world/bitarray/BitArray.java → .../server/datastruct/bitarray/BitArray.java b/...laymc/server/world/bitarray/BitArray.java → .../server/datastruct/bitarray/BitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 /**
  * @author JukeboxMC | daoge_cmd

diff --git a/...erver/world/bitarray/BitArrayVersion.java → .../datastruct/bitarray/BitArrayVersion.java b/...erver/world/bitarray/BitArrayVersion.java → .../datastruct/bitarray/BitArrayVersion.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Preconditions;
 import org.cloudburstmc.math.GenericMath;

diff --git a/...server/world/bitarray/PaddedBitArray.java → ...r/datastruct/bitarray/PaddedBitArray.java b/...server/world/bitarray/PaddedBitArray.java → ...r/datastruct/bitarray/PaddedBitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Objects;
 import org.cloudburstmc.math.GenericMath;

diff --git a/...c/server/world/bitarray/Pow2BitArray.java → ...ver/datastruct/bitarray/Pow2BitArray.java b/...c/server/world/bitarray/Pow2BitArray.java → ...ver/datastruct/bitarray/Pow2BitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 import com.google.common.base.Objects;
 import org.cloudburstmc.math.GenericMath;

diff --git a/...ver/world/bitarray/SingletonBitArray.java → ...atastruct/bitarray/SingletonBitArray.java b/...ver/world/bitarray/SingletonBitArray.java → ...atastruct/bitarray/SingletonBitArray.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.bitarray;
+package org.allaymc.server.datastruct.bitarray;
 
 /**
  * @author JukeboxMC | daoge_cmd

diff --git a/...allaymc/server/world/palette/Palette.java → ...mc/server/datastruct/palette/Palette.java b/...allaymc/server/world/palette/Palette.java → ...mc/server/datastruct/palette/Palette.java
@@ -1,13 +1,13 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
 import lombok.extern.slf4j.Slf4j;
 import org.allaymc.api.world.chunk.Chunk;
-import org.allaymc.server.world.bitarray.BitArray;
-import org.allaymc.server.world.bitarray.BitArrayVersion;
+import org.allaymc.server.datastruct.bitarray.BitArray;
+import org.allaymc.server.datastruct.bitarray.BitArrayVersion;
 import org.cloudburstmc.nbt.NbtUtils;
 import org.cloudburstmc.protocol.common.util.VarInts;
 

diff --git a/...erver/world/palette/PaletteException.java → .../datastruct/palette/PaletteException.java b/...erver/world/palette/PaletteException.java → .../datastruct/palette/PaletteException.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import lombok.experimental.StandardException;
 

diff --git a/...mc/server/world/palette/PaletteUtils.java → ...rver/datastruct/palette/PaletteUtils.java b/...mc/server/world/palette/PaletteUtils.java → ...rver/datastruct/palette/PaletteUtils.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import io.netty.buffer.ByteBuf;
 import lombok.SneakyThrows;

diff --git a/...d/palette/PersistentDataDeserializer.java → ...t/palette/PersistentDataDeserializer.java b/...d/palette/PersistentDataDeserializer.java → ...t/palette/PersistentDataDeserializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import io.netty.buffer.ByteBuf;
 

diff --git a/...rld/palette/PersistentDataSerializer.java → ...uct/palette/PersistentDataSerializer.java b/...rld/palette/PersistentDataSerializer.java → ...uct/palette/PersistentDataSerializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 import org.cloudburstmc.nbt.NbtMap;
 

diff --git a/...orld/palette/RuntimeDataDeserializer.java → ...ruct/palette/RuntimeDataDeserializer.java b/...orld/palette/RuntimeDataDeserializer.java → ...ruct/palette/RuntimeDataDeserializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 /**
  * @author JukeboxMC | daoge_cmd

diff --git a/.../world/palette/RuntimeDataSerializer.java → ...struct/palette/RuntimeDataSerializer.java b/.../world/palette/RuntimeDataSerializer.java → ...struct/palette/RuntimeDataSerializer.java
@@ -1,4 +1,4 @@
-package org.allaymc.server.world.palette;
+package org.allaymc.server.datastruct.palette;
 
 /**
  * @author JukeboxMC | daoge_cmd

diff --git a/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java b/server/src/main/java/org/allaymc/server/world/chunk/ChunkSection.java
@@ -4,7 +4,7 @@
 import org.allaymc.api.block.type.BlockState;
 import org.allaymc.api.world.biome.BiomeId;
 import org.allaymc.api.world.biome.BiomeType;
-import org.allaymc.server.world.palette.Palette;
+import org.allaymc.server.datastruct.palette.Palette;
 
 import javax.annotation.concurrent.NotThreadSafe;
 

diff --git a/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java b/server/src/main/java/org/allaymc/server/world/storage/AllayLevelDBWorldStorage.java
@@ -23,13 +23,13 @@
 import org.allaymc.api.world.gamerule.GameRules;
 import org.allaymc.api.world.storage.WorldStorage;
 import org.allaymc.api.world.storage.WorldStorageException;
+import org.allaymc.server.datastruct.palette.Palette;
+import org.allaymc.server.datastruct.palette.PaletteException;
+import org.allaymc.server.datastruct.palette.PaletteUtils;
 import org.allaymc.server.world.AllayWorldData;
 import org.allaymc.server.world.HeightMap;
 import org.allaymc.server.world.chunk.AllayUnsafeChunk;
 import org.allaymc.server.world.chunk.ChunkSection;
-import org.allaymc.server.world.palette.Palette;
-import org.allaymc.server.world.palette.PaletteException;
-import org.allaymc.server.world.palette.PaletteUtils;
 import org.allaymc.updater.block.BlockStateUpdaters;
 import org.cloudburstmc.nbt.*;
 import org.cloudburstmc.nbt.util.stream.LittleEndianDataInputStream;