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 122937345..4934e5ee4 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 @@ -8,7 +8,7 @@ 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.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.util.FullDataPointUtil; import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.level.IDhLevel; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java index 542502b94..660593d24 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/FullDataDownSampler.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.dataObjects.fullData; import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; 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/dataObjects/fullData/accessor/IFullDataAccessor.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java index 237479d91..514096110 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/accessor/IFullDataAccessor.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.dataObjects.fullData.accessor; import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.util.FullDataPointUtil; import java.util.Iterator; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java index cd79a2ea9..52c9e53c0 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/AbstractFullDataSourceLoader.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.dataObjects.fullData.loader; import com.google.common.collect.HashMultimap; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java index c98c733f2..4be4d23cf 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/CompleteFullDataSourceLoader.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; 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/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java index 7aa9f9ae8..919b72f7a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/HighDetailIncompleteFullDataSourceLoader.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; 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/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java index 61a918dcc..da0dce92d 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/loader/LowDetailIncompleteFullDataSourceLoader.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.dataObjects.fullData.loader; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; 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/dataObjects/fullData/sources/CompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java index 3c55860b6..7a35608a7 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/CompleteFullDataSource.java @@ -5,6 +5,8 @@ import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.pos.DhBlockPos2D; import com.seibel.lod.core.pos.DhLodPos; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java index 0477ed234..5f5e528ed 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/HighDetailIncompleteFullDataSource.java @@ -5,6 +5,9 @@ import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.pos.DhLodPos; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java index 6f1ae90db..7c81e296f 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/LowDetailIncompleteFullDataSource.java @@ -5,6 +5,9 @@ import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IStreamableFullDataSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; import com.seibel.lod.core.logging.DhLoggerBuilder; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java similarity index 94% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java index 869c36c6e..677badb43 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IFullDataSource.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; @@ -15,10 +15,13 @@ import java.io.BufferedOutputStream; import java.io.IOException; /** + * Base for all Full Data Source objects.

+ * * Contains full DH data, methods related to file/stream reading/writing, and the data necessary to create {@link ColumnRenderSource}'s.
* {@link IFullDataSource}'s will either implement or contain {@link IFullDataAccessor}'s. * * @see IFullDataAccessor + * @see IIncompleteFullDataSource * @see IStreamableFullDataSource */ public interface IFullDataSource diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java similarity index 79% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java index a36c5c068..074302530 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IIncompleteFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IIncompleteFullDataSource.java @@ -1,4 +1,6 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; + +import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; public interface IIncompleteFullDataSource extends IFullDataSource { diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IStreamableFullDataSource.java b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java similarity index 92% rename from core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IStreamableFullDataSource.java rename to core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java index 4388a03f4..455474804 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/IStreamableFullDataSource.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/fullData/sources/interfaces/IStreamableFullDataSource.java @@ -1,15 +1,10 @@ -package com.seibel.lod.core.dataObjects.fullData.sources; +package com.seibel.lod.core.dataObjects.fullData.sources.interfaces; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; -import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.accessor.FullDataArrayAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.IFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; import com.seibel.lod.core.file.fullDatafile.FullDataMetaFile; import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.pos.DhSectionPos; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java b/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java index 2a18fd600..50bbb3f64 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/render/ColumnRenderLoader.java @@ -2,8 +2,8 @@ package com.seibel.lod.core.dataObjects.render; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.transformers.FullToColumnTransformer; 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/dataObjects/transformers/DataRenderTransformer.java b/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java index 80151dcc2..654704fe1 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/DataRenderTransformer.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.dataObjects.transformers; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.render.ColumnRenderLoader; import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; import com.seibel.lod.core.dependencyInjection.SingletonInjector; diff --git a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullToColumnTransformer.java b/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullToColumnTransformer.java index 89223f771..47f24922a 100644 --- a/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullToColumnTransformer.java +++ b/core/src/main/java/com/seibel/lod/core/dataObjects/transformers/FullToColumnTransformer.java @@ -3,7 +3,7 @@ package com.seibel.lod.core.dataObjects.transformers; import com.seibel.lod.core.dataObjects.fullData.FullDataPointIdMap; import com.seibel.lod.core.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IIncompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; import com.seibel.lod.core.util.RenderDataPointUtil; import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; import com.seibel.lod.core.dataObjects.render.columnViews.ColumnArrayView; 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 765beb75f..b0a4b689a 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 @@ -4,6 +4,8 @@ import com.google.common.collect.HashMultimap; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.sources.*; import com.seibel.lod.core.dataObjects.fullData.sources.CompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; import com.seibel.lod.core.util.FileUtil; import com.seibel.lod.core.file.metaData.BaseMetaData; 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 b54cd76ff..b732eab38 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.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.loader.AbstractFullDataSourceLoader; import com.seibel.lod.core.dependencyInjection.SingletonInjector; import com.seibel.lod.core.file.metaData.BaseMetaData; 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 9cd2012f6..d92be93cb 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,8 +2,8 @@ package com.seibel.lod.core.file.fullDatafile; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.dataObjects.fullData.sources.HighDetailIncompleteFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; -import com.seibel.lod.core.dataObjects.fullData.sources.IIncompleteFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IIncompleteFullDataSource; import com.seibel.lod.core.dataObjects.fullData.sources.LowDetailIncompleteFullDataSource; import com.seibel.lod.core.generation.tasks.IWorldGenTaskTracker; import com.seibel.lod.core.generation.WorldGenerationQueue; 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 35ace107a..c633d74dc 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.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.file.metaData.BaseMetaData; import com.seibel.lod.core.pos.DhSectionPos; diff --git a/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java b/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java index a4603a571..8c7498c85 100644 --- a/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java +++ b/core/src/main/java/com/seibel/lod/core/file/metaData/BaseMetaData.java @@ -1,7 +1,7 @@ package com.seibel.lod.core.file.metaData; import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.pos.DhSectionPos; import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; diff --git a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java index a8484fffe..40c1ee44a 100644 --- a/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java +++ b/core/src/main/java/com/seibel/lod/core/file/renderfile/RenderSourceFileHandler.java @@ -2,7 +2,7 @@ package com.seibel.lod.core.file.renderfile; import com.google.common.collect.HashMultimap; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.render.ColumnRenderSource; import com.seibel.lod.core.dataObjects.transformers.DataRenderTransformer; import com.seibel.lod.core.file.fullDatafile.IFullDataSourceProvider; 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 ce1151b47..13abef23a 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.dataObjects.fullData.accessor.SingleColumnFullDataAccessor; -import com.seibel.lod.core.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.dataObjects.fullData.accessor.ChunkSizedFullDataAccessor; import com.seibel.lod.core.util.FullDataPointUtil; import com.seibel.lod.core.dataObjects.transformers.LodDataBuilder; 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 d7fee04e6..f41102070 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.dataObjects.fullData.sources.IFullDataSource; +import com.seibel.lod.core.dataObjects.fullData.sources.interfaces.IFullDataSource; import com.seibel.lod.core.util.BitShiftUtil; import com.seibel.lod.core.util.LodUtil; import org.jetbrains.annotations.NotNull;