From 271bdb9f12b5e65adadbe532da958bc4500611f2 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 18 Feb 2023 09:36:59 -0600 Subject: [PATCH] Move Full data sources into their own package --- .../com/seibel/lod/core/datatype/IFullDataSource.java | 2 +- .../java/com/seibel/lod/core/datatype/IRenderSource.java | 2 +- .../seibel/lod/core/datatype/PlaceHolderRenderSource.java | 2 +- .../lod/core/datatype/column/ColumnRenderLoader.java | 3 +-- .../lod/core/datatype/column/ColumnRenderSource.java | 2 +- .../lod/core/datatype/full/FullDataDownSampler.java | 1 + .../com/seibel/lod/core/datatype/full/FullDataLoader.java | 1 + .../seibel/lod/core/datatype/full/FullDataPointIdMap.java | 4 ++-- .../lod/core/datatype/full/SingleChunkFullDataLoader.java | 1 + .../seibel/lod/core/datatype/full/SparseDataLoader.java | 1 + .../full/{ => sources}/ChunkSizedFullDataSource.java | 3 ++- .../core/datatype/full/{ => sources}/FullDataSource.java | 6 ++++-- .../full/{ => sources}/SampledFullDataSource.java | 3 ++- .../full/{ => sources}/SingleChunkFullDataSource.java | 3 ++- .../datatype/full/{ => sources}/SparseFullDataSource.java | 8 +++++--- .../lod/core/datatype/transform/ChunkToLodBuilder.java | 2 +- .../core/datatype/transform/FullToColumnTransformer.java | 2 ++ .../lod/core/datatype/transform/LodDataBuilder.java | 2 +- .../lod/core/file/fullDatafile/FullDataFileHandler.java | 8 ++++---- .../lod/core/file/fullDatafile/FullDataMetaFile.java | 2 +- .../file/fullDatafile/GeneratedFullDataFileHandler.java | 6 +++--- .../core/file/fullDatafile/IFullDataSourceProvider.java | 2 +- .../core/file/renderfile/ILodRenderSourceProvider.java | 2 +- .../lod/core/file/renderfile/RenderFileHandler.java | 2 +- .../lod/core/file/renderfile/RenderMetaDataFile.java | 2 +- .../file/subDimMatching/SubDimensionLevelMatcher.java | 2 +- .../seibel/lod/core/generation/WorldGenerationQueue.java | 2 +- .../generation/tasks/AbstractWorldGenTaskTracker.java | 2 +- .../lod/core/generation/tasks/SplitTaskTracker.java | 2 +- .../lod/core/generation/tasks/WorldGenTaskGroup.java | 2 +- .../com/seibel/lod/core/level/DhClientServerLevel.java | 4 ++-- 31 files changed, 49 insertions(+), 37 deletions(-) rename core/src/main/java/com/seibel/lod/core/datatype/full/{ => sources}/ChunkSizedFullDataSource.java (88%) rename core/src/main/java/com/seibel/lod/core/datatype/full/{ => sources}/FullDataSource.java (97%) rename core/src/main/java/com/seibel/lod/core/datatype/full/{ => sources}/SampledFullDataSource.java (66%) rename core/src/main/java/com/seibel/lod/core/datatype/full/{ => sources}/SingleChunkFullDataSource.java (99%) rename core/src/main/java/com/seibel/lod/core/datatype/full/{ => sources}/SparseFullDataSource.java (99%) diff --git a/core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java index 4fcf009bc..b91a08727 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java b/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java index f7f6f92e2..d89892d42 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.pos.DhSectionPos; import com.seibel.lod.core.render.LodQuadTree; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java b/core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java index 3f5cfce6b..19af61cda 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.pos.DhSectionPos; import com.seibel.lod.core.render.LodQuadTree; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java index a18f27888..edcb78c63 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java @@ -2,8 +2,7 @@ package com.seibel.lod.core.datatype.column; import com.seibel.lod.core.datatype.IIncompleteFullDataSource; import com.seibel.lod.core.datatype.IFullDataSource; -import com.seibel.lod.core.datatype.column.accessor.ColumnFormat; -import com.seibel.lod.core.datatype.full.FullDataSource; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.datatype.transform.FullToColumnTransformer; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.datatype.IRenderSource; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java b/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java index 043458937..8f3cf74b6 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.datatype.column; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.datatype.column.accessor.*; import com.seibel.lod.core.datatype.column.render.ColumnRenderBuffer; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.transform.FullToColumnTransformer; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.pos.DhSectionPos; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java index db4e733fd..124a62204 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java @@ -2,6 +2,7 @@ package com.seibel.lod.core.datatype.full; import com.seibel.lod.core.datatype.IFullDataSource; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; import com.seibel.lod.core.pos.DhLodPos; import com.seibel.lod.core.pos.DhSectionPos; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java index bf9385da9..51cecb6ef 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java @@ -2,6 +2,7 @@ package com.seibel.lod.core.datatype.full; import com.seibel.lod.core.datatype.AbstractDataSourceLoader; import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPointIdMap.java b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPointIdMap.java index 132cad059..72372c438 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPointIdMap.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPointIdMap.java @@ -60,7 +60,7 @@ public class FullDataPointIdMap } /** Serializes all contained entries into the given stream, formatted in UTF */ - void serialize(OutputStream outputStream) throws IOException + public void serialize(OutputStream outputStream) throws IOException { DataOutputStream dataStream = new DataOutputStream(outputStream); // DO NOT CLOSE! It would close all related streams dataStream.writeInt(this.entries.size()); @@ -71,7 +71,7 @@ public class FullDataPointIdMap } /** Creates a new IdBiomeBlockStateMap from the given UTF formatted stream */ - static FullDataPointIdMap deserialize(InputStream inputStream) throws IOException + public static FullDataPointIdMap deserialize(InputStream inputStream) throws IOException { DataInputStream dataStream = new DataInputStream(inputStream); // DO NOT CLOSE! It would close all related streams int entityCount = dataStream.readInt(); diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java index 7f26bd718..e952fb772 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java @@ -2,6 +2,7 @@ package com.seibel.lod.core.datatype.full; import com.seibel.lod.core.datatype.AbstractDataSourceLoader; import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataLoader.java index 5b3f26130..2802aaed3 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataLoader.java @@ -2,6 +2,7 @@ package com.seibel.lod.core.datatype.full; import com.seibel.lod.core.datatype.AbstractDataSourceLoader; import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.sources.SparseFullDataSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/ChunkSizedFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/ChunkSizedFullDataSource.java similarity index 88% rename from core/src/main/java/com/seibel/lod/core/datatype/full/ChunkSizedFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/sources/ChunkSizedFullDataSource.java index 8df285bcf..d1cb2aad9 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/ChunkSizedFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/ChunkSizedFullDataSource.java @@ -1,5 +1,6 @@ -package com.seibel.lod.core.datatype.full; +package com.seibel.lod.core.datatype.full.sources; +import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.FullArrayView; import com.seibel.lod.core.pos.DhLodPos; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/datatype/full/FullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java index 71454d5b7..27665a262 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/FullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java @@ -1,6 +1,7 @@ -package com.seibel.lod.core.datatype.full; +package com.seibel.lod.core.datatype.full.sources; import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.FullArrayView; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; import com.seibel.lod.core.level.IDhLevel; @@ -32,13 +33,14 @@ public class FullDataSource extends FullArrayView implements IFullDataSource + // TODO why is this protected? protected FullDataSource(DhSectionPos sectionPos) { super(new FullDataPointIdMap(), new long[SECTION_SIZE*SECTION_SIZE][0], SECTION_SIZE); this.sectionPos = sectionPos; } - FullDataSource(DhSectionPos pos, FullDataPointIdMap mapping, long[][] data) + public FullDataSource(DhSectionPos pos, FullDataPointIdMap mapping, long[][] data) { super(mapping, data, SECTION_SIZE); LodUtil.assertTrue(data.length == SECTION_SIZE * SECTION_SIZE); diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/SampledFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SampledFullDataSource.java similarity index 66% rename from core/src/main/java/com/seibel/lod/core/datatype/full/SampledFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/sources/SampledFullDataSource.java index 950eb4d8d..a9ec8d112 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SampledFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SampledFullDataSource.java @@ -1,5 +1,6 @@ -package com.seibel.lod.core.datatype.full; +package com.seibel.lod.core.datatype.full.sources; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.pos.DhSectionPos; public class SampledFullDataSource extends FullDataSource diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java index adb0f68ac..2f12fb18e 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java @@ -1,7 +1,8 @@ -package com.seibel.lod.core.datatype.full; +package com.seibel.lod.core.datatype.full.sources; import com.seibel.lod.core.datatype.IFullDataSource; import com.seibel.lod.core.datatype.IIncompleteFullDataSource; +import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.FullArrayView; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java index 9c2894d32..84f5b34a6 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java @@ -1,7 +1,8 @@ -package com.seibel.lod.core.datatype.full; +package com.seibel.lod.core.datatype.full.sources; import com.seibel.lod.core.datatype.IIncompleteFullDataSource; import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.FullArrayView; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; @@ -42,9 +43,10 @@ public class SparseFullDataSource implements IIncompleteFullDataSource protected final FullDataPointIdMap mapping; private final DhSectionPos sectionPos; private final FullArrayView[] sparseData; - final int chunks; - final int dataPerChunk; private final DhLodPos chunkPos; + + public final int chunks; + public final int dataPerChunk; public boolean isEmpty = true; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/transform/ChunkToLodBuilder.java b/core/src/main/java/com/seibel/lod/core/datatype/transform/ChunkToLodBuilder.java index 962452563..bd92d0984 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/transform/ChunkToLodBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/transform/ChunkToLodBuilder.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.datatype.transform; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.logging.ConfigBasedLogger; import com.seibel.lod.core.pos.DhChunkPos; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java b/core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java index c792af764..d5d18142d 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java @@ -8,6 +8,8 @@ import com.seibel.lod.core.datatype.column.accessor.ColumnArrayView; import com.seibel.lod.core.datatype.column.accessor.ColumnQuadView; import com.seibel.lod.core.datatype.full.*; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.pos.DhSectionPos; import com.seibel.lod.core.config.Config; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/transform/LodDataBuilder.java b/core/src/main/java/com/seibel/lod/core/datatype/transform/LodDataBuilder.java index c849ac5db..9b94b7e02 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/transform/LodDataBuilder.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/transform/LodDataBuilder.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype.transform; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.full.FullDataPoint; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.util.LodUtil; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java index 1886d7425..8949ec45a 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java +++ b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java @@ -3,10 +3,10 @@ package com.seibel.lod.core.file.fullDatafile; import com.google.common.collect.HashMultimap; import com.seibel.lod.core.datatype.IFullDataSource; import com.seibel.lod.core.datatype.IIncompleteFullDataSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; -import com.seibel.lod.core.datatype.full.FullDataSource; -import com.seibel.lod.core.datatype.full.SingleChunkFullDataSource; -import com.seibel.lod.core.datatype.full.SparseFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; +import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource; +import com.seibel.lod.core.datatype.full.sources.SparseFullDataSource; import com.seibel.lod.core.file.FileUtil; import com.seibel.lod.core.file.metaData.MetaData; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java index 301e16376..6b5151742 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java +++ b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java @@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import com.seibel.lod.core.datatype.IFullDataSource; import com.seibel.lod.core.datatype.AbstractDataSourceLoader; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.file.metaData.MetaData; import com.seibel.lod.core.pos.DhLodPos; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java index cb0fa2701..3c16af29f 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java +++ b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java @@ -2,9 +2,9 @@ package com.seibel.lod.core.file.fullDatafile; import com.seibel.lod.core.datatype.IFullDataSource; import com.seibel.lod.core.datatype.IIncompleteFullDataSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; -import com.seibel.lod.core.datatype.full.SparseFullDataSource; -import com.seibel.lod.core.datatype.full.SingleChunkFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.SparseFullDataSource; +import com.seibel.lod.core.datatype.full.sources.SingleChunkFullDataSource; import com.seibel.lod.core.generation.tasks.AbstractWorldGenTaskTracker; import com.seibel.lod.core.generation.WorldGenerationQueue; import com.seibel.lod.core.level.IDhServerLevel; diff --git a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java index 6b99c9d93..0160a5c64 100644 --- a/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java +++ b/core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.file.fullDatafile; import com.seibel.lod.core.datatype.IFullDataSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.file.metaData.MetaData; import com.seibel.lod.core.pos.DhSectionPos; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java index 4eebe2030..548bd4aa2 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java +++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.file.renderfile; import com.seibel.lod.core.datatype.IRenderSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.pos.DhSectionPos; import java.io.File; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java index dec9c9787..ec5e1fb67 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java +++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java @@ -6,7 +6,7 @@ import com.seibel.lod.core.datatype.PlaceHolderRenderSource; import com.seibel.lod.core.datatype.IRenderSource; import com.seibel.lod.core.datatype.AbstractRenderSourceLoader; import com.seibel.lod.core.datatype.column.ColumnRenderSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.transform.DataRenderTransformer; import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; import com.seibel.lod.core.level.IDhClientLevel; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java index caa9fdfe4..54381986a 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java +++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.file.renderfile; import com.seibel.lod.core.datatype.IRenderSource; import com.seibel.lod.core.datatype.AbstractRenderSourceLoader; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.file.metaData.MetaData; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java b/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java index da97ed608..3dffa2c1f 100644 --- a/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java +++ b/core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.file.subDimMatching; import com.seibel.lod.core.config.Config; import com.seibel.lod.core.datatype.IFullDataSource; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.full.FullDataPoint; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; import com.seibel.lod.core.datatype.transform.LodDataBuilder; diff --git a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java index ddadec1b5..24898a541 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java +++ b/core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.generation; import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.transform.LodDataBuilder; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.generation.tasks.*; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java b/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java index ad5c4d96c..b38c7eb7c 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java +++ b/core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.generation.tasks; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import java.util.function.Consumer; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java b/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java index 5adba26d8..9515ad17d 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java +++ b/core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.generation.tasks; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java b/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java index d6ad9f760..ab64a56cd 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java +++ b/core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.generation.tasks; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.pos.DhLodPos; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java index ce02b1c1c..0dbf1b8e3 100644 --- a/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java +++ b/core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java @@ -3,8 +3,8 @@ package com.seibel.lod.core.level; import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; import com.seibel.lod.core.DependencyInjection.WorldGeneratorInjector; import com.seibel.lod.core.config.AppliedConfigState; -import com.seibel.lod.core.datatype.full.ChunkSizedFullDataSource; -import com.seibel.lod.core.datatype.full.FullDataSource; +import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; +import com.seibel.lod.core.datatype.full.sources.FullDataSource; import com.seibel.lod.core.datatype.transform.ChunkToLodBuilder; import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; import com.seibel.lod.core.generation.BatchGenerator;