diff --git a/src/main/java/com/volmit/iris/object/tile/TileBanner.java b/src/main/java/com/volmit/iris/object/tile/TileBanner.java index 4af500149..20e833532 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileBanner.java +++ b/src/main/java/com/volmit/iris/object/tile/TileBanner.java @@ -1,8 +1,8 @@ package com.volmit.iris.object.tile; import lombok.Data; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; import org.bukkit.DyeColor; import org.bukkit.Material; import org.bukkit.block.Banner; diff --git a/src/main/java/com/volmit/iris/object/tile/TileData.java b/src/main/java/com/volmit/iris/object/tile/TileData.java index 193ffb257..3ac98f56c 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileData.java +++ b/src/main/java/com/volmit/iris/object/tile/TileData.java @@ -1,7 +1,7 @@ package com.volmit.iris.object.tile; import com.volmit.iris.util.KList; -import net.querz.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.TileState; diff --git a/src/main/java/com/volmit/iris/object/tile/TileSign.java b/src/main/java/com/volmit/iris/object/tile/TileSign.java index b2e014c0a..3c873ede4 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSign.java +++ b/src/main/java/com/volmit/iris/object/tile/TileSign.java @@ -1,7 +1,7 @@ package com.volmit.iris.object.tile; import lombok.Data; -import net.querz.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; import org.bukkit.DyeColor; import org.bukkit.block.Sign; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java b/src/main/java/com/volmit/iris/object/tile/TileSpawner.java index 57fbb4905..f95c1a50a 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java +++ b/src/main/java/com/volmit/iris/object/tile/TileSpawner.java @@ -1,8 +1,8 @@ package com.volmit.iris.object.tile; import lombok.Data; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java index 7ae9010aa..48472c58a 100644 --- a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java +++ b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java @@ -7,12 +7,12 @@ import com.volmit.iris.scaffold.parallel.MultiBurst; import com.volmit.iris.util.B; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; -import net.querz.mca.Chunk; -import net.querz.mca.MCAFile; -import net.querz.mca.MCAUtil; -import net.querz.mca.Section; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.StringTag; +import com.volmit.iris.scaffold.data.mca.Chunk; +import com.volmit.iris.scaffold.data.mca.MCAFile; +import com.volmit.iris.scaffold.data.mca.MCAUtil; +import com.volmit.iris.scaffold.data.mca.Section; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.StringTag; import org.bukkit.NamespacedKey; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/net/querz/io/Deserializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java similarity index 96% rename from src/main/java/net/querz/io/Deserializer.java rename to src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java index 1849fe9dd..a8f627a54 100644 --- a/src/main/java/net/querz/io/Deserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; diff --git a/src/main/java/net/querz/io/ExceptionBiFunction.java b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java similarity index 74% rename from src/main/java/net/querz/io/ExceptionBiFunction.java rename to src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java index c34dba722..b7e2a0365 100644 --- a/src/main/java/net/querz/io/ExceptionBiFunction.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; @FunctionalInterface public interface ExceptionBiFunction { diff --git a/src/main/java/net/querz/io/ExceptionTriConsumer.java b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java similarity index 76% rename from src/main/java/net/querz/io/ExceptionTriConsumer.java rename to src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java index d49ccc908..56643ff75 100644 --- a/src/main/java/net/querz/io/ExceptionTriConsumer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; @FunctionalInterface public interface ExceptionTriConsumer { diff --git a/src/main/java/net/querz/io/MaxDepthIO.java b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java similarity index 88% rename from src/main/java/net/querz/io/MaxDepthIO.java rename to src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java index 0a5fc3e70..f042ff717 100644 --- a/src/main/java/net/querz/io/MaxDepthIO.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; public interface MaxDepthIO { diff --git a/src/main/java/net/querz/io/MaxDepthReachedException.java b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java similarity index 85% rename from src/main/java/net/querz/io/MaxDepthReachedException.java rename to src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java index eb9032289..dc85f7216 100644 --- a/src/main/java/net/querz/io/MaxDepthReachedException.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; /** * Exception indicating that the maximum (de-)serialization depth has been reached. diff --git a/src/main/java/net/querz/io/Serializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java similarity index 94% rename from src/main/java/net/querz/io/Serializer.java rename to src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java index a6c9377a9..d6cfe2e2b 100644 --- a/src/main/java/net/querz/io/Serializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/net/querz/io/StringDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java similarity index 95% rename from src/main/java/net/querz/io/StringDeserializer.java rename to src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java index 2160e2a8b..32c05b569 100644 --- a/src/main/java/net/querz/io/StringDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; import java.io.File; import java.io.FileReader; diff --git a/src/main/java/net/querz/io/StringSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java similarity index 95% rename from src/main/java/net/querz/io/StringSerializer.java rename to src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java index c4da81042..c289f1e91 100644 --- a/src/main/java/net/querz/io/StringSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java @@ -1,4 +1,4 @@ -package net.querz.io; +package com.volmit.iris.scaffold.data.io; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/net/querz/mca/Chunk.java b/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java similarity index 98% rename from src/main/java/net/querz/mca/Chunk.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java index 0236717f2..b09ed9825 100644 --- a/src/main/java/net/querz/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java @@ -1,10 +1,11 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; + +import com.volmit.iris.scaffold.data.nbt.io.NBTDeserializer; +import com.volmit.iris.scaffold.data.nbt.io.NBTSerializer; +import com.volmit.iris.scaffold.data.nbt.io.NamedTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.io.NamedTag; -import net.querz.nbt.io.NBTDeserializer; -import net.querz.nbt.io.NBTSerializer; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -12,7 +13,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.RandomAccessFile; import java.util.Arrays; -import static net.querz.mca.LoadFlags.*; +import static com.volmit.iris.scaffold.data.mca.LoadFlags.*; public class Chunk { diff --git a/src/main/java/net/querz/mca/CompressionType.java b/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java similarity index 96% rename from src/main/java/net/querz/mca/CompressionType.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java index 9ae41d4c6..ef470ae3a 100644 --- a/src/main/java/net/querz/mca/CompressionType.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java @@ -1,4 +1,4 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/querz/mca/ExceptionFunction.java b/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java similarity index 72% rename from src/main/java/net/querz/mca/ExceptionFunction.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java index 40fe81959..da09daac6 100644 --- a/src/main/java/net/querz/mca/ExceptionFunction.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java @@ -1,4 +1,4 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; @FunctionalInterface public interface ExceptionFunction { diff --git a/src/main/java/net/querz/mca/LoadFlags.java b/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java similarity index 95% rename from src/main/java/net/querz/mca/LoadFlags.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java index e41228983..1cd570cb4 100644 --- a/src/main/java/net/querz/mca/LoadFlags.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java @@ -1,4 +1,4 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; public class LoadFlags { diff --git a/src/main/java/net/querz/mca/MCAFile.java b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java similarity index 98% rename from src/main/java/net/querz/mca/MCAFile.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java index 73eda6075..449bb2734 100644 --- a/src/main/java/net/querz/mca/MCAFile.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java @@ -1,6 +1,6 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; -import net.querz.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/src/main/java/net/querz/mca/MCAUtil.java b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java similarity index 99% rename from src/main/java/net/querz/mca/MCAUtil.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java index 8a607ef7a..5b7654d11 100644 --- a/src/main/java/net/querz/mca/MCAUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java @@ -1,4 +1,4 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; import java.io.File; import java.io.IOException; diff --git a/src/main/java/net/querz/mca/Section.java b/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java similarity index 96% rename from src/main/java/net/querz/mca/Section.java rename to src/main/java/com/volmit/iris/scaffold/data/mca/Section.java index 0a63f8a33..ad768d7e7 100644 --- a/src/main/java/net/querz/mca/Section.java +++ b/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java @@ -1,19 +1,16 @@ -package net.querz.mca; +package com.volmit.iris.scaffold.data.mca; -import com.volmit.iris.Iris; import com.volmit.iris.util.KMap; -import net.querz.nbt.tag.ByteArrayTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.tag.LongArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static net.querz.mca.LoadFlags.*; - public class Section { private CompoundTag data; @@ -25,7 +22,7 @@ public class Section { private int dataVersion; public Section(CompoundTag sectionRoot, int dataVersion) { - this(sectionRoot, dataVersion, ALL_DATA); + this(sectionRoot, dataVersion, LoadFlags.ALL_DATA); } public Section(CompoundTag sectionRoot, int dataVersion, long loadFlags) { @@ -45,13 +42,13 @@ public class Section { LongArrayTag blockStates = sectionRoot.getLongArrayTag("BlockStates"); ByteArrayTag skyLight = sectionRoot.getByteArrayTag("SkyLight"); - if ((loadFlags & BLOCK_LIGHTS) != 0) { + if ((loadFlags & LoadFlags.BLOCK_LIGHTS) != 0) { this.blockLight = blockLight != null ? blockLight.getValue() : null; } - if ((loadFlags & BLOCK_STATES) != 0) { + if ((loadFlags & LoadFlags.BLOCK_STATES) != 0) { this.blockStates = blockStates != null ? blockStates.getValue() : null; } - if ((loadFlags & SKY_LIGHT) != 0) { + if ((loadFlags & LoadFlags.SKY_LIGHT) != 0) { this.skyLight = skyLight != null ? skyLight.getValue() : null; } } diff --git a/src/main/java/net/querz/nbt/io/NBTDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java similarity index 80% rename from src/main/java/net/querz/nbt/io/NBTDeserializer.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java index 2f7289e32..90c6a7741 100644 --- a/src/main/java/net/querz/nbt/io/NBTDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java @@ -1,7 +1,7 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.Deserializer; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.Deserializer; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.IOException; import java.io.InputStream; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/net/querz/nbt/io/NBTInputStream.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java similarity index 82% rename from src/main/java/net/querz/nbt/io/NBTInputStream.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java index b3ca6b8ae..5a323620e 100644 --- a/src/main/java/net/querz/nbt/io/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java @@ -1,21 +1,21 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.ExceptionBiFunction; -import net.querz.io.MaxDepthIO; -import net.querz.nbt.tag.ByteArrayTag; -import net.querz.nbt.tag.ByteTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.DoubleTag; -import net.querz.nbt.tag.EndTag; -import net.querz.nbt.tag.FloatTag; -import net.querz.nbt.tag.IntArrayTag; -import net.querz.nbt.tag.IntTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.tag.LongArrayTag; -import net.querz.nbt.tag.LongTag; -import net.querz.nbt.tag.ShortTag; -import net.querz.nbt.tag.StringTag; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.ExceptionBiFunction; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.DoubleTag; +import com.volmit.iris.scaffold.data.nbt.tag.EndTag; +import com.volmit.iris.scaffold.data.nbt.tag.FloatTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongTag; +import com.volmit.iris.scaffold.data.nbt.tag.ShortTag; +import com.volmit.iris.scaffold.data.nbt.tag.StringTag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/net/querz/nbt/io/NBTOutputStream.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java similarity index 83% rename from src/main/java/net/querz/nbt/io/NBTOutputStream.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java index 4879052ef..cdf054281 100644 --- a/src/main/java/net/querz/nbt/io/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java @@ -1,21 +1,21 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.ExceptionTriConsumer; -import net.querz.io.MaxDepthIO; -import net.querz.nbt.tag.ByteArrayTag; -import net.querz.nbt.tag.ByteTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.DoubleTag; -import net.querz.nbt.tag.EndTag; -import net.querz.nbt.tag.FloatTag; -import net.querz.nbt.tag.IntArrayTag; -import net.querz.nbt.tag.IntTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.tag.LongArrayTag; -import net.querz.nbt.tag.LongTag; -import net.querz.nbt.tag.ShortTag; -import net.querz.nbt.tag.StringTag; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.ExceptionTriConsumer; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.DoubleTag; +import com.volmit.iris.scaffold.data.nbt.tag.EndTag; +import com.volmit.iris.scaffold.data.nbt.tag.FloatTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongTag; +import com.volmit.iris.scaffold.data.nbt.tag.ShortTag; +import com.volmit.iris.scaffold.data.nbt.tag.StringTag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/net/querz/nbt/io/NBTSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java similarity index 81% rename from src/main/java/net/querz/nbt/io/NBTSerializer.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java index fe5059926..74973e4fe 100644 --- a/src/main/java/net/querz/nbt/io/NBTSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java @@ -1,7 +1,7 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.Serializer; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.Serializer; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.IOException; import java.io.OutputStream; import java.util.zip.GZIPOutputStream; diff --git a/src/main/java/net/querz/nbt/io/NBTUtil.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java similarity index 96% rename from src/main/java/net/querz/nbt/io/NBTUtil.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java index d8efc150b..05eb09b75 100644 --- a/src/main/java/net/querz/nbt/io/NBTUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java @@ -1,6 +1,6 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/main/java/net/querz/nbt/io/NamedTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java similarity index 79% rename from src/main/java/net/querz/nbt/io/NamedTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java index b1873087a..2fafd76c0 100644 --- a/src/main/java/net/querz/nbt/io/NamedTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java @@ -1,6 +1,6 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; public class NamedTag { diff --git a/src/main/java/net/querz/nbt/io/ParseException.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java similarity index 92% rename from src/main/java/net/querz/nbt/io/ParseException.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java index c62e0610c..91c20fc12 100644 --- a/src/main/java/net/querz/nbt/io/ParseException.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java @@ -1,4 +1,4 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; import java.io.IOException; diff --git a/src/main/java/net/querz/nbt/io/SNBTDeserializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java similarity index 81% rename from src/main/java/net/querz/nbt/io/SNBTDeserializer.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java index 05a98fefc..aea21774a 100644 --- a/src/main/java/net/querz/nbt/io/SNBTDeserializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java @@ -1,7 +1,7 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.StringDeserializer; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.StringDeserializer; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; diff --git a/src/main/java/net/querz/nbt/io/SNBTParser.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java similarity index 88% rename from src/main/java/net/querz/nbt/io/SNBTParser.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java index 7a9ac5d26..46b3ed6d9 100644 --- a/src/main/java/net/querz/nbt/io/SNBTParser.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java @@ -1,21 +1,21 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.MaxDepthIO; -import net.querz.nbt.tag.ArrayTag; -import net.querz.nbt.tag.ByteArrayTag; -import net.querz.nbt.tag.ByteTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.DoubleTag; -import net.querz.nbt.tag.EndTag; -import net.querz.nbt.tag.FloatTag; -import net.querz.nbt.tag.IntArrayTag; -import net.querz.nbt.tag.IntTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.tag.LongArrayTag; -import net.querz.nbt.tag.LongTag; -import net.querz.nbt.tag.ShortTag; -import net.querz.nbt.tag.StringTag; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.scaffold.data.nbt.tag.ArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.DoubleTag; +import com.volmit.iris.scaffold.data.nbt.tag.EndTag; +import com.volmit.iris.scaffold.data.nbt.tag.FloatTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongTag; +import com.volmit.iris.scaffold.data.nbt.tag.ShortTag; +import com.volmit.iris.scaffold.data.nbt.tag.StringTag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; diff --git a/src/main/java/net/querz/nbt/io/SNBTSerializer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java similarity index 70% rename from src/main/java/net/querz/nbt/io/SNBTSerializer.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java index 50ea44a63..78653a673 100644 --- a/src/main/java/net/querz/nbt/io/SNBTSerializer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java @@ -1,7 +1,8 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; + +import com.volmit.iris.scaffold.data.io.StringSerializer; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; -import net.querz.io.StringSerializer; -import net.querz.nbt.tag.Tag; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/net/querz/nbt/io/SNBTUtil.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java similarity index 74% rename from src/main/java/net/querz/nbt/io/SNBTUtil.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java index fe87484a3..48c5d8641 100644 --- a/src/main/java/net/querz/nbt/io/SNBTUtil.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java @@ -1,6 +1,7 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; + +import com.volmit.iris.scaffold.data.nbt.tag.Tag; -import net.querz.nbt.tag.Tag; import java.io.IOException; public class SNBTUtil { diff --git a/src/main/java/net/querz/nbt/io/SNBTWriter.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java similarity index 78% rename from src/main/java/net/querz/nbt/io/SNBTWriter.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java index c6cffcb70..9dbff0892 100644 --- a/src/main/java/net/querz/nbt/io/SNBTWriter.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java @@ -1,20 +1,20 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; -import net.querz.io.MaxDepthIO; -import net.querz.nbt.tag.ByteArrayTag; -import net.querz.nbt.tag.ByteTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.DoubleTag; -import net.querz.nbt.tag.EndTag; -import net.querz.nbt.tag.FloatTag; -import net.querz.nbt.tag.IntArrayTag; -import net.querz.nbt.tag.IntTag; -import net.querz.nbt.tag.ListTag; -import net.querz.nbt.tag.LongArrayTag; -import net.querz.nbt.tag.LongTag; -import net.querz.nbt.tag.ShortTag; -import net.querz.nbt.tag.StringTag; -import net.querz.nbt.tag.Tag; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.ByteTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.DoubleTag; +import com.volmit.iris.scaffold.data.nbt.tag.EndTag; +import com.volmit.iris.scaffold.data.nbt.tag.FloatTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; +import com.volmit.iris.scaffold.data.nbt.tag.LongTag; +import com.volmit.iris.scaffold.data.nbt.tag.ShortTag; +import com.volmit.iris.scaffold.data.nbt.tag.StringTag; +import com.volmit.iris.scaffold.data.nbt.tag.Tag; import java.io.IOException; import java.io.Writer; import java.lang.reflect.Array; diff --git a/src/main/java/net/querz/nbt/io/StringPointer.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java similarity index 98% rename from src/main/java/net/querz/nbt/io/StringPointer.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java index 11bdddcc4..6d6b84c7c 100644 --- a/src/main/java/net/querz/nbt/io/StringPointer.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java @@ -1,4 +1,4 @@ -package net.querz.nbt.io; +package com.volmit.iris.scaffold.data.nbt.io; public class StringPointer { diff --git a/src/main/java/net/querz/nbt/tag/ArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java similarity index 95% rename from src/main/java/net/querz/nbt/tag/ArrayTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java index 2842fa636..3645b248e 100644 --- a/src/main/java/net/querz/nbt/tag/ArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; import java.lang.reflect.Array; diff --git a/src/main/java/net/querz/nbt/tag/ByteArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java similarity index 94% rename from src/main/java/net/querz/nbt/tag/ByteArrayTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java index 8fbcf8a30..078e694aa 100644 --- a/src/main/java/net/querz/nbt/tag/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/net/querz/nbt/tag/ByteTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java similarity index 94% rename from src/main/java/net/querz/nbt/tag/ByteTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java index 207cefd25..e59d21be5 100644 --- a/src/main/java/net/querz/nbt/tag/ByteTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class ByteTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/CompoundTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java similarity index 98% rename from src/main/java/net/querz/nbt/tag/CompoundTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java index 8084948a2..d6b6f2fd8 100644 --- a/src/main/java/net/querz/nbt/tag/CompoundTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java @@ -1,8 +1,7 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; -import com.volmit.iris.Iris; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; import com.volmit.iris.util.KMap; -import net.querz.io.MaxDepthIO; import java.util.*; import java.util.function.BiConsumer; diff --git a/src/main/java/net/querz/nbt/tag/DoubleTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java similarity index 93% rename from src/main/java/net/querz/nbt/tag/DoubleTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java index 28d08658b..fade64869 100644 --- a/src/main/java/net/querz/nbt/tag/DoubleTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class DoubleTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/EndTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java similarity index 90% rename from src/main/java/net/querz/nbt/tag/EndTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java index 30b970b80..6090d4483 100644 --- a/src/main/java/net/querz/nbt/tag/EndTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public final class EndTag extends Tag { diff --git a/src/main/java/net/querz/nbt/tag/FloatTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java similarity index 93% rename from src/main/java/net/querz/nbt/tag/FloatTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java index 9d79204fb..2adaed314 100644 --- a/src/main/java/net/querz/nbt/tag/FloatTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class FloatTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/IntArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java similarity index 94% rename from src/main/java/net/querz/nbt/tag/IntArrayTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java index 1799c93c9..d1d6967c2 100644 --- a/src/main/java/net/querz/nbt/tag/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/net/querz/nbt/tag/IntTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java similarity index 93% rename from src/main/java/net/querz/nbt/tag/IntTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java index 57c1f2bad..1e5b5a18d 100644 --- a/src/main/java/net/querz/nbt/tag/IntTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class IntTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/ListTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java similarity index 98% rename from src/main/java/net/querz/nbt/tag/ListTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java index a72b94b51..78473b011 100644 --- a/src/main/java/net/querz/nbt/tag/ListTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java @@ -1,7 +1,7 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; +import com.volmit.iris.scaffold.data.io.MaxDepthIO; import com.volmit.iris.util.KList; -import net.querz.io.MaxDepthIO; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/net/querz/nbt/tag/LongArrayTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java similarity index 94% rename from src/main/java/net/querz/nbt/tag/LongArrayTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java index e0528dd14..600b3e5c0 100644 --- a/src/main/java/net/querz/nbt/tag/LongArrayTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/net/querz/nbt/tag/LongTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java similarity index 93% rename from src/main/java/net/querz/nbt/tag/LongTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java index 8f40a3258..4451a0044 100644 --- a/src/main/java/net/querz/nbt/tag/LongTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class LongTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/NonNullEntrySet.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java similarity index 98% rename from src/main/java/net/querz/nbt/tag/NonNullEntrySet.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java index e157ba264..235ec232e 100644 --- a/src/main/java/net/querz/nbt/tag/NonNullEntrySet.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/net/querz/nbt/tag/NumberTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java similarity index 92% rename from src/main/java/net/querz/nbt/tag/NumberTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java index 48faa0248..76b85fd98 100644 --- a/src/main/java/net/querz/nbt/tag/NumberTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public abstract class NumberTag> extends Tag { diff --git a/src/main/java/net/querz/nbt/tag/ShortTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java similarity index 93% rename from src/main/java/net/querz/nbt/tag/ShortTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java index 5f434c374..290fec635 100644 --- a/src/main/java/net/querz/nbt/tag/ShortTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class ShortTag extends NumberTag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/StringTag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java similarity index 94% rename from src/main/java/net/querz/nbt/tag/StringTag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java index 0d30c4b62..490c4895e 100644 --- a/src/main/java/net/querz/nbt/tag/StringTag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java @@ -1,4 +1,4 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; public class StringTag extends Tag implements Comparable { diff --git a/src/main/java/net/querz/nbt/tag/Tag.java b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java similarity index 98% rename from src/main/java/net/querz/nbt/tag/Tag.java rename to src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java index dd1c8d551..8949ad524 100644 --- a/src/main/java/net/querz/nbt/tag/Tag.java +++ b/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java @@ -1,6 +1,7 @@ -package net.querz.nbt.tag; +package com.volmit.iris.scaffold.data.nbt.tag; + +import com.volmit.iris.scaffold.data.io.MaxDepthReachedException; -import net.querz.io.MaxDepthReachedException; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java index d4bc5e789..2a40f6131 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java @@ -6,7 +6,6 @@ import com.volmit.iris.generator.IrisEngineCompound; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.object.IrisNoiseGenerator; import com.volmit.iris.object.IrisPosition; import com.volmit.iris.pregen.DirectWorldWriter; import com.volmit.iris.scaffold.IrisWorlds; @@ -31,7 +30,6 @@ import org.jetbrains.annotations.Nullable; import java.io.File; import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -40,12 +38,8 @@ import java.util.List; import java.util.Objects; import java.util.Random; import java.util.Set; -import java.util.concurrent.Callable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Consumer; -import java.util.stream.Collectors; public class EngineCompositeGenerator extends ChunkGenerator implements IrisAccess { private EngineCompound compound = null; @@ -494,7 +488,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce { int ox = x << 4; int oz = z << 4; - net.querz.mca.Chunk cc = writer.getChunk(x, z); + com.volmit.iris.scaffold.data.mca.Chunk cc = writer.getChunk(x, z); generateChunkRawData(w, x, z, new TerrainChunk() { @Override public void setRaw(ChunkData data) { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 2057b05e4..18012d652 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -21,6 +21,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; import org.bukkit.util.Consumer; +import java.io.IOException; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -551,7 +552,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { { for(int i = 0; i < objectPlacement.getDensity(); i++) { - IrisObject v = objectPlacement.getObject(getComplex(), rng); + IrisObject v = objectPlacement.getScale().get(rng, objectPlacement.getObject(getComplex(), rng)); if (v == null){ return; } @@ -604,12 +605,21 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { zg.set(0); int jig = 0; KSet objects = new KSet<>(); + KMap> scalars = new KMap<>(); KList r = getAllRegions(); KList b = getAllBiomes(); for (IrisBiome i : b) { for (IrisObjectPlacement j : i.getObjects()) { - objects.addAll(j.getPlace()); + if(j.getScale().canScaleBeyond()) + { + scalars.put(j.getScale(), j.getPlace()); + } + + else + { + objects.addAll(j.getPlace()); + } } for (IrisJigsawStructurePlacement j : i.getJigsawStructures()) { @@ -619,6 +629,18 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { for (IrisRegion i : r) { + for (IrisObjectPlacement j : i.getObjects()) { + if(j.getScale().canScaleBeyond()) + { + scalars.put(j.getScale(), j.getPlace()); + } + + else + { + objects.addAll(j.getPlace()); + } + } + for(IrisJigsawStructurePlacement j : i.getJigsawStructures()) { jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); @@ -646,12 +668,32 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects."); BurstExecutor e = MultiBurst.burst.burst(objects.size()); + KMap sizeCache = new KMap<>(); for(String i : objects) { e.queue(() -> { try { - BlockVector bv = IrisObject.sampleSize(getData().getObjectLoader().findFile(i)); + BlockVector bv = sizeCache.compute(i, (k,v) -> { + if(v != null) + { + return v; + } + + try { + return IrisObject.sampleSize(getData().getObjectLoader().findFile(i)); + } catch (IOException ioException) { + ioException.printStackTrace(); + } + + return null; + }); + + if(bv == null) + { + throw new RuntimeException(); + } + warn(i, bv); synchronized (xg) @@ -672,6 +714,55 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { }); } + for(IrisObjectScale i : scalars.keySet()) + { + double ms = i.getMaximumScale(); + for(String j : scalars.get(i)) + { + e.queue(() -> { + try + { + BlockVector bv = sizeCache.compute(j, (k,v) -> { + if(v != null) + { + return v; + } + + try { + return IrisObject.sampleSize(getData().getObjectLoader().findFile(j)); + } catch (IOException ioException) { + ioException.printStackTrace(); + } + + return null; + }); + + if(bv == null) + { + throw new RuntimeException(); + } + + warnScaled(j, bv, ms); + + synchronized (xg) + { + xg.getAndSet((int) Math.max(Math.ceil(bv.getBlockX() * ms), xg.get())); + } + + synchronized (zg) + { + zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ()* ms), zg.get())); + } + } + + catch(Throwable ignored) + { + + } + }); + } + } + e.complete(); int x = xg.get(); @@ -739,6 +830,14 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } } + default void warnScaled(String ob, BlockVector bv, double ms) + { + if(Math.max(bv.getBlockX(), bv.getBlockZ()) > 128) + { + Iris.warn("Object " + ob + " has a large size (" + bv.toString() + ") and may increase memory usage! (Object scaled up to "+Form.pc(ms, 2)+")"); + } + } + @Override default int getHighest(int x, int z) { return getHighest(x,z,false); diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java index f043e520a..436ba892c 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java @@ -1002,16 +1002,7 @@ public interface Hunk { if(x < 0 || x >= getWidth() || y < 0 || y >= getHeight() || z < 0 || z >= getDepth()) { - try - { - throw new RuntimeException(); - } - - catch(Throwable e) - { - e.printStackTrace(); - } - Iris.warn(x + "," + y + "," + z + " does not fit within size " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")"); + //Iris.warn(x + "," + y + "," + z + " does not fit within size " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")"); } } @@ -1019,7 +1010,7 @@ public interface Hunk { if(x < 0 || x >= getWidth() || y < 0 || y >= getHeight() || z < 0 || z >= getDepth() || x + w < 0 || x + w > getWidth() || y + h < 0 || y + h > getHeight() || z + d < 0 || z + d > getDepth()) { - Iris.warn("The hunk " + w + "," + h + "," + d + " with an offset of " + x + "," + y + "," + z + " does not fit within the parent hunk " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")"); + //Iris.warn("The hunk " + w + "," + h + "," + d + " with an offset of " + x + "," + y + "," + z + " does not fit within the parent hunk " + getWidth() + "," + getHeight() + "," + getDepth() + " (0,0,0 to " + (getWidth() - 1) + "," + (getHeight() - 1) + "," + (getDepth() - 1) + ")"); } } diff --git a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java index f93c44091..b4396c276 100644 --- a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java +++ b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java @@ -2,6 +2,7 @@ package com.volmit.iris.util; import com.volmit.iris.object.IrisPosition; import org.bukkit.World; +import org.bukkit.util.BlockVector; public class AxisAlignedBB { @@ -62,11 +63,22 @@ public class AxisAlignedBB return new IrisPosition((int)xb, (int)yb, (int)zb); } + + public BlockVector maxbv() + { + return new BlockVector((int)xb, (int)yb, (int)zb); + } + public IrisPosition min() { return new IrisPosition((int)xa, (int)ya, (int)za); } + public BlockVector minbv() + { + return new BlockVector((int)xa, (int)ya, (int)za); + } + public Cuboid toCuboid(World world) { return new Cuboid(min().toLocation(world), max().toLocation(world)); } diff --git a/src/main/java/com/volmit/iris/util/KList.java b/src/main/java/com/volmit/iris/util/KList.java index b2c1b688a..612c1f946 100644 --- a/src/main/java/com/volmit/iris/util/KList.java +++ b/src/main/java/com/volmit/iris/util/KList.java @@ -703,6 +703,21 @@ public class KList extends ArrayList implements List return get(M.irand(0, last())); } + public T getRandom(RNG rng) + { + if(isEmpty()) + { + return null; + } + + if(size() == 1) + { + return get(0); + } + + return get(rng.i(0, last())); + } + public KList qdel(T t) { remove(t);