From 16c6dffdd667c1efab86314a434bd4551f64ec10 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 18 Feb 2023 09:53:16 -0600 Subject: [PATCH] Move files into Full and Render dataType packages --- .../java/com/seibel/lod/core/Initializer.java | 2 +- .../methods/data/DhApiTerrainDataRepo.java | 2 +- .../datatype/PlaceHolderRenderSource.java | 62 ------------------- .../column/render/ColumnRenderBuffer.java | 2 +- .../column/render/CubicLodTemplate.java | 2 +- .../AbstractFullDataSourceLoader.java | 2 +- .../datatype/full/FullDataDownSampler.java | 1 - .../core/datatype/full/FullDataLoader.java | 2 - .../datatype/{ => full}/IFullDataSource.java | 2 +- .../{ => full}/IIncompleteFullDataSource.java | 2 +- .../full/SingleChunkFullDataLoader.java | 2 - .../datatype/full/SparseFullDataLoader.java | 2 - .../datatype/full/sources/FullDataSource.java | 2 +- .../sources/SingleChunkFullDataSource.java | 4 +- .../full/sources/SparseFullDataSource.java | 4 +- .../AbstractRenderSourceLoader.java | 3 +- .../ColumnRenderLoader.java | 8 +-- .../ColumnRenderSource.java | 3 +- .../datatype/{ => render}/IRenderSource.java | 4 +- .../transform/DataRenderTransformer.java | 8 +-- .../transform/FullToColumnTransformer.java | 6 +- .../fullDatafile/FullDataFileHandler.java | 4 +- .../file/fullDatafile/FullDataMetaFile.java | 4 +- .../GeneratedFullDataFileHandler.java | 4 +- .../fullDatafile/IFullDataSourceProvider.java | 2 +- .../renderfile/ILodRenderSourceProvider.java | 2 +- .../file/renderfile/RenderFileHandler.java | 8 +-- .../file/renderfile/RenderMetaDataFile.java | 4 +- .../SubDimensionLevelMatcher.java | 2 +- .../com/seibel/lod/core/pos/DhLodPos.java | 2 +- .../seibel/lod/core/render/LodQuadTree.java | 2 +- .../lod/core/render/LodRenderSection.java | 2 +- .../lod/core/render/RenderBufferHandler.java | 2 +- 33 files changed, 46 insertions(+), 117 deletions(-) delete mode 100644 core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java rename core/src/main/java/com/seibel/lod/core/datatype/{ => full}/AbstractFullDataSourceLoader.java (98%) rename core/src/main/java/com/seibel/lod/core/datatype/{ => full}/IFullDataSource.java (95%) rename core/src/main/java/com/seibel/lod/core/datatype/{ => full}/IIncompleteFullDataSource.java (78%) rename core/src/main/java/com/seibel/lod/core/datatype/{ => render}/AbstractRenderSourceLoader.java (97%) rename core/src/main/java/com/seibel/lod/core/datatype/{column => render}/ColumnRenderLoader.java (94%) rename core/src/main/java/com/seibel/lod/core/datatype/{column => render}/ColumnRenderSource.java (99%) rename core/src/main/java/com/seibel/lod/core/datatype/{ => render}/IRenderSource.java (93%) diff --git a/core/src/main/java/com/seibel/lod/core/Initializer.java b/core/src/main/java/com/seibel/lod/core/Initializer.java index 2f44af107..bb9f381bd 100644 --- a/core/src/main/java/com/seibel/lod/core/Initializer.java +++ b/core/src/main/java/com/seibel/lod/core/Initializer.java @@ -2,7 +2,7 @@ package com.seibel.lod.core; import com.seibel.lod.core.api.external.methods.config.DhApiConfig; import com.seibel.lod.core.api.external.methods.data.DhApiTerrainDataRepo; -import com.seibel.lod.core.datatype.column.ColumnRenderLoader; +import com.seibel.lod.core.datatype.render.ColumnRenderLoader; import com.seibel.lod.core.datatype.full.FullDataLoader; import com.seibel.lod.core.datatype.full.SparseFullDataLoader; import com.seibel.lod.api.DhApiMain; diff --git a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java b/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java index ba709583c..1e4bec2e3 100644 --- a/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java +++ b/core/src/main/java/com/seibel/lod/core/api/external/methods/data/DhApiTerrainDataRepo.java @@ -7,7 +7,7 @@ import com.seibel.lod.api.objects.data.DhApiTerrainDataPoint; import com.seibel.lod.api.interfaces.data.IDhApiTerrainDataRepo; import com.seibel.lod.api.objects.math.DhApiVec3i; import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; import com.seibel.lod.core.datatype.full.FullDataPoint; import com.seibel.lod.core.datatype.full.FullDataPointIdMap; import com.seibel.lod.core.datatype.full.accessor.SingleFullArrayView; 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 deleted file mode 100644 index 19af61cda..000000000 --- a/core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.seibel.lod.core.datatype; - -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; -import com.seibel.lod.core.render.AbstractRenderBuffer; -import com.seibel.lod.core.file.renderfile.RenderMetaDataFile; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.concurrent.atomic.AtomicReference; - -public class PlaceHolderRenderSource implements IRenderSource -{ - final DhSectionPos pos; - boolean isValid = true; - - public PlaceHolderRenderSource(DhSectionPos pos) { this.pos = pos; } - - @Override - public DhSectionPos getSectionPos() { return pos; } - - @Override - public byte getDataDetail() { return 0; } - - @Override - public void enableRender(IDhClientLevel level, LodQuadTree quadTree) { /* TODO */ } - - @Override - public void disableRender() { /* TODO */ } - - @Override - public void dispose() { /* TODO */ } - - @Override - public boolean trySwapRenderBufferAsync(LodQuadTree quadTree, AtomicReference referenceSlots) { return false; } - - @Override - public void saveRender(IDhClientLevel level, RenderMetaDataFile file, OutputStream dataStream) throws IOException - { - throw new UnsupportedOperationException("EmptyRenderSource should NEVER be saved!"); - } - - @Override - public byte getRenderVersion() { return 0; } - - public void markInvalid() { isValid = false; } - - @Override - public boolean isValid() { return isValid; } - - @Override - public boolean isEmpty() { return true; } - - @Override - public void fastWrite(ChunkSizedFullDataSource chunkData, IDhClientLevel level) { /* TODO */ } - - @Override - public void updateFromRenderSource(IRenderSource source) { /* TODO */ } - -} diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java index c938fedaf..712de32fd 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/ColumnRenderBuffer.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype.column.render; -import com.seibel.lod.core.datatype.column.ColumnRenderSource; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; import com.seibel.lod.core.datatype.column.accessor.ColumnArrayView; import com.seibel.lod.core.datatype.column.accessor.ColumnFormat; import com.seibel.lod.core.level.IDhClientLevel; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java b/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java index 7d0d20c3b..ab9c535f2 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/column/render/CubicLodTemplate.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.datatype.column.render; -import com.seibel.lod.core.datatype.column.ColumnRenderSource; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; import com.seibel.lod.core.datatype.column.accessor.ColumnFormat; import com.seibel.lod.api.enums.rendering.EDebugMode; import com.seibel.lod.core.dependencyInjection.SingletonInjector; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/AbstractFullDataSourceLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/full/AbstractFullDataSourceLoader.java similarity index 98% rename from core/src/main/java/com/seibel/lod/core/datatype/AbstractFullDataSourceLoader.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/AbstractFullDataSourceLoader.java index 8380acb9d..ceaa804e7 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/AbstractFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/AbstractFullDataSourceLoader.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.datatype; +package com.seibel.lod.core.datatype.full; import com.google.common.collect.HashMultimap; import com.seibel.lod.core.level.IDhLevel; 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 124a62204..15949823e 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 @@ -1,6 +1,5 @@ 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; 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 e90ce5955..6d364ba2f 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 @@ -1,7 +1,5 @@ package com.seibel.lod.core.datatype.full; -import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader; -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/IFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/IFullDataSource.java similarity index 95% rename from core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/IFullDataSource.java index b91a08727..cd266c082 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/IFullDataSource.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.datatype; +package com.seibel.lod.core.datatype.full; import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.datatype.full.FullDataPointIdMap; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/IIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/IIncompleteFullDataSource.java similarity index 78% rename from core/src/main/java/com/seibel/lod/core/datatype/IIncompleteFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/full/IIncompleteFullDataSource.java index eb679034e..0d9a60923 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/IIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/IIncompleteFullDataSource.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.datatype; +package com.seibel.lod.core.datatype.full; public interface IIncompleteFullDataSource extends IFullDataSource { 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 809a7492a..364951483 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 @@ -1,7 +1,5 @@ package com.seibel.lod.core.datatype.full; -import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader; -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/SparseFullDataLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataLoader.java index 1899d3866..79e9d8321 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataLoader.java @@ -1,7 +1,5 @@ package com.seibel.lod.core.datatype.full; -import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader; -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/sources/FullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java index 27665a262..8515ce510 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.datatype.full.sources; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.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; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java index 2f12fb18e..46561255a 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java @@ -1,7 +1,7 @@ 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.IFullDataSource; +import com.seibel.lod.core.datatype.full.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; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java index 84f5b34a6..d254477f9 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java @@ -1,7 +1,7 @@ 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.IIncompleteFullDataSource; +import com.seibel.lod.core.datatype.full.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; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/AbstractRenderSourceLoader.java b/core/src/main/java/com/seibel/lod/core/datatype/render/AbstractRenderSourceLoader.java similarity index 97% rename from core/src/main/java/com/seibel/lod/core/datatype/AbstractRenderSourceLoader.java rename to core/src/main/java/com/seibel/lod/core/datatype/render/AbstractRenderSourceLoader.java index 2215f3eb3..9bca5835a 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/AbstractRenderSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/render/AbstractRenderSourceLoader.java @@ -1,6 +1,7 @@ -package com.seibel.lod.core.datatype; +package com.seibel.lod.core.datatype.render; import com.google.common.collect.HashMultimap; +import com.seibel.lod.core.datatype.full.IFullDataSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.file.renderfile.RenderMetaDataFile; 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/render/ColumnRenderLoader.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java rename to core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderLoader.java index edcb78c63..9bc0fca74 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderLoader.java @@ -1,12 +1,10 @@ -package com.seibel.lod.core.datatype.column; +package com.seibel.lod.core.datatype.render; -import com.seibel.lod.core.datatype.IIncompleteFullDataSource; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; 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; -import com.seibel.lod.core.datatype.AbstractRenderSourceLoader; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.file.renderfile.RenderMetaDataFile; import com.seibel.lod.core.logging.DhLoggerBuilder; 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/render/ColumnRenderSource.java similarity index 99% rename from core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderSource.java index 8f3cf74b6..61b2da423 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/render/ColumnRenderSource.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.datatype.column; +package com.seibel.lod.core.datatype.render; import com.seibel.lod.core.ModInfo; import com.seibel.lod.core.datatype.column.accessor.*; @@ -14,7 +14,6 @@ import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.render.LodQuadTree; import com.seibel.lod.core.render.LodRenderSection; -import com.seibel.lod.core.datatype.IRenderSource; import com.seibel.lod.core.util.ColorUtil; import com.seibel.lod.core.util.objects.Reference; import com.seibel.lod.core.util.LodUtil; diff --git a/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java b/core/src/main/java/com/seibel/lod/core/datatype/render/IRenderSource.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java rename to core/src/main/java/com/seibel/lod/core/datatype/render/IRenderSource.java index d89892d42..b37a16d15 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/render/IRenderSource.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.datatype; +package com.seibel.lod.core.datatype.render; import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.level.IDhClientLevel; @@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * This represents LOD data that is stored in system memory
- * Example: {@link com.seibel.lod.core.datatype.column.ColumnRenderSource ColumnRenderSource}

+ * Example: {@link ColumnRenderSource ColumnRenderSource}

* * These are created via {@link com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider ILodRenderSourceProvider}'s */ diff --git a/core/src/main/java/com/seibel/lod/core/datatype/transform/DataRenderTransformer.java b/core/src/main/java/com/seibel/lod/core/datatype/transform/DataRenderTransformer.java index bcbfb15c7..2d2a8ed3e 100644 --- a/core/src/main/java/com/seibel/lod/core/datatype/transform/DataRenderTransformer.java +++ b/core/src/main/java/com/seibel/lod/core/datatype/transform/DataRenderTransformer.java @@ -1,9 +1,9 @@ package com.seibel.lod.core.datatype.transform; -import com.seibel.lod.core.datatype.IFullDataSource; -import com.seibel.lod.core.datatype.IRenderSource; -import com.seibel.lod.core.datatype.column.ColumnRenderLoader; -import com.seibel.lod.core.datatype.column.ColumnRenderSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; +import com.seibel.lod.core.datatype.render.IRenderSource; +import com.seibel.lod.core.datatype.render.ColumnRenderLoader; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.util.LodUtil; 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 d5d18142d..e074590a7 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 @@ -1,9 +1,9 @@ package com.seibel.lod.core.datatype.transform; -import com.seibel.lod.core.datatype.IIncompleteFullDataSource; -import com.seibel.lod.core.datatype.IRenderSource; +import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource; +import com.seibel.lod.core.datatype.render.IRenderSource; import com.seibel.lod.core.datatype.column.accessor.ColumnFormat; -import com.seibel.lod.core.datatype.column.ColumnRenderSource; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; 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.*; 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 8949ec45a..89bc75931 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 @@ -1,8 +1,8 @@ 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.IFullDataSource; +import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource; 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; 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 ae8333f52..7bcd15b5f 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 @@ -8,8 +8,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.seibel.lod.core.datatype.IFullDataSource; -import com.seibel.lod.core.datatype.AbstractFullDataSourceLoader; +import com.seibel.lod.core.datatype.full.IFullDataSource; +import com.seibel.lod.core.datatype.full.AbstractFullDataSourceLoader; import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.file.metaData.MetaData; 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 3c16af29f..5ef216f2f 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 @@ -1,7 +1,7 @@ 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.IFullDataSource; +import com.seibel.lod.core.datatype.full.IIncompleteFullDataSource; 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; 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 0160a5c64..f2d17f59e 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,6 +1,6 @@ package com.seibel.lod.core.file.fullDatafile; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; 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 548bd4aa2..47a6cbff7 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,6 +1,6 @@ package com.seibel.lod.core.file.renderfile; -import com.seibel.lod.core.datatype.IRenderSource; +import com.seibel.lod.core.datatype.render.IRenderSource; import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.pos.DhSectionPos; 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 ec5e1fb67..e2d7e494a 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 @@ -1,11 +1,11 @@ package com.seibel.lod.core.file.renderfile; import com.google.common.collect.HashMultimap; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; 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.render.IRenderSource; +import com.seibel.lod.core.datatype.render.AbstractRenderSourceLoader; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; 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; 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 54381986a..319fdb0e4 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 @@ -1,7 +1,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.render.IRenderSource; +import com.seibel.lod.core.datatype.render.AbstractRenderSourceLoader; import com.seibel.lod.core.datatype.full.sources.ChunkSizedFullDataSource; import com.seibel.lod.core.file.metaData.MetaData; import com.seibel.lod.core.level.IDhClientLevel; 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 3dffa2c1f..47e2582fd 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 @@ -1,7 +1,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.IFullDataSource; 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; diff --git a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java b/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java index 19f2ad9a7..784c07269 100644 --- a/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java +++ b/core/src/main/java/com/seibel/lod/core/pos/DhLodPos.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.pos; -import com.seibel.lod.core.datatype.IFullDataSource; +import com.seibel.lod.core.datatype.full.IFullDataSource; import com.seibel.lod.core.util.BitShiftUtil; import com.seibel.lod.core.util.LodUtil; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java b/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java index c5913ad9c..01779f525 100644 --- a/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java +++ b/core/src/main/java/com/seibel/lod/core/render/LodQuadTree.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.render; -import com.seibel.lod.core.datatype.column.ColumnRenderSource; +import com.seibel.lod.core.datatype.render.ColumnRenderSource; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.pos.DhBlockPos2D; import com.seibel.lod.core.pos.DhSectionPos; diff --git a/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java index 7e7cfb8c2..33ab478fd 100644 --- a/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/lod/core/render/LodRenderSection.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.render; import com.seibel.lod.core.level.IDhClientLevel; import com.seibel.lod.core.logging.DhLoggerBuilder; import com.seibel.lod.core.pos.DhSectionPos; -import com.seibel.lod.core.datatype.IRenderSource; +import com.seibel.lod.core.datatype.render.IRenderSource; import com.seibel.lod.core.file.renderfile.ILodRenderSourceProvider; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java index d108a0dfc..77c7db1df 100644 --- a/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java +++ b/core/src/main/java/com/seibel/lod/core/render/RenderBufferHandler.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.render; -import com.seibel.lod.core.datatype.IRenderSource; +import com.seibel.lod.core.datatype.render.IRenderSource; import com.seibel.lod.core.enums.ELodDirection; import com.seibel.lod.core.pos.Pos2D; import com.seibel.lod.core.pos.DhSectionPos;