wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Full data sources into their own package

Browse Source
This commit is contained in:
James Seibel
2023-02-18 09:36:59 -06:00
parent fbcf687ef9
commit 271bdb9f12
31 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/datatype/IFullDataSource.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/IRenderSource.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/PlaceHolderRenderSource.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderLoader.java
+1 -2
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/column/ColumnRenderSource.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataDownSampler.java
+1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataLoader.java
+1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataPointIdMap.java
+2 -2
View File
@@ -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();
core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataLoader.java
+1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/SparseDataLoader.java
+1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/ChunkSizedFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/sources/ChunkSizedFullDataSource.java
+2 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/FullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/sources/FullDataSource.java
+4 -2
View File
@@ -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);
core/src/main/java/com/seibel/lod/core/datatype/full/SampledFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/sources/SampledFullDataSource.java
+2 -1
View File
@@ -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
core/src/main/java/com/seibel/lod/core/datatype/full/SingleChunkFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/sources/SingleChunkFullDataSource.java
+2 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/full/SparseFullDataSource.java → core/src/main/java/com/seibel/lod/core/datatype/full/sources/SparseFullDataSource.java
+5 -3
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/transform/ChunkToLodBuilder.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/transform/FullToColumnTransformer.java
+2
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/datatype/transform/LodDataBuilder.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataFileHandler.java
+4 -4
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/FullDataMetaFile.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/GeneratedFullDataFileHandler.java
+3 -3
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/fullDatafile/IFullDataSourceProvider.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/renderfile/ILodRenderSourceProvider.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/renderfile/RenderFileHandler.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/renderfile/RenderMetaDataFile.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/file/subDimMatching/SubDimensionLevelMatcher.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/generation/WorldGenerationQueue.java
+1 -1
View File
@@ -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.*;
core/src/main/java/com/seibel/lod/core/generation/tasks/AbstractWorldGenTaskTracker.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/generation/tasks/SplitTaskTracker.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/generation/tasks/WorldGenTaskGroup.java
+1 -1
View File
@@ -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;
core/src/main/java/com/seibel/lod/core/level/DhClientServerLevel.java
+2 -2
View File
@@ -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;