diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java similarity index 96% rename from core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java rename to core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java index 44c7f4712..fcc10c2c1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/ILodRenderSourceProvider.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/IRenderSourceProvider.java @@ -32,7 +32,7 @@ import java.util.concurrent.CompletableFuture; * * This is used to create {@link ColumnRenderSource}'s */ -public interface ILodRenderSourceProvider extends AutoCloseable +public interface IRenderSourceProvider extends AutoCloseable { CompletableFuture readAsync(DhSectionPos pos); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderDataMetaFile.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderDataMetaFile.java index af570733a..d20f12edd 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderDataMetaFile.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderDataMetaFile.java @@ -70,7 +70,7 @@ public class RenderDataMetaFile extends AbstractMetaDataContainerFile implements private final IDhClientLevel clientLevel; private final IFullDataSourceProvider fullDataSourceProvider; - private final ILodRenderSourceProvider renderDataSourceProvider; + private final IRenderSourceProvider renderDataSourceProvider; private boolean doesDtoExist; @@ -83,8 +83,8 @@ public class RenderDataMetaFile extends AbstractMetaDataContainerFile implements * NOTE: should only be used if there is NOT an existing file. * @throws IOException if a file already exists for this position */ - public static RenderDataMetaFile createNewFileForPos(IFullDataSourceProvider fullDataSourceProvider, ILodRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, DhSectionPos pos) throws IOException { return new RenderDataMetaFile(fullDataSourceProvider, renderDataSourceProvider, clientLevel, pos); } - private RenderDataMetaFile(IFullDataSourceProvider fullDataSourceProvider, ILodRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, DhSectionPos pos) throws IOException + public static RenderDataMetaFile createNewFileForPos(IFullDataSourceProvider fullDataSourceProvider, IRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, DhSectionPos pos) throws IOException { return new RenderDataMetaFile(fullDataSourceProvider, renderDataSourceProvider, clientLevel, pos); } + private RenderDataMetaFile(IFullDataSourceProvider fullDataSourceProvider, IRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, DhSectionPos pos) throws IOException { super(pos); this.fullDataSourceProvider = fullDataSourceProvider; @@ -100,8 +100,8 @@ public class RenderDataMetaFile extends AbstractMetaDataContainerFile implements * NOTE: should only be used if there IS an existing file. * @throws IOException if no file exists for this position */ - public static RenderDataMetaFile createFromExistingFile(IFullDataSourceProvider fullDataSourceProvider, ILodRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, MetaDataDto metaDataDto) throws IOException { return new RenderDataMetaFile(fullDataSourceProvider, renderDataSourceProvider, clientLevel, metaDataDto); } - private RenderDataMetaFile(IFullDataSourceProvider fullDataSourceProvider, ILodRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, MetaDataDto metaDataDto) throws IOException + public static RenderDataMetaFile createFromExistingFile(IFullDataSourceProvider fullDataSourceProvider, IRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, MetaDataDto metaDataDto) throws IOException { return new RenderDataMetaFile(fullDataSourceProvider, renderDataSourceProvider, clientLevel, metaDataDto); } + private RenderDataMetaFile(IFullDataSourceProvider fullDataSourceProvider, IRenderSourceProvider renderDataSourceProvider, IDhClientLevel clientLevel, MetaDataDto metaDataDto) throws IOException { super(metaDataDto.dataArray); this.fullDataSourceProvider = fullDataSourceProvider; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java index e175d47f3..5253d3bca 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/file/renderfile/RenderSourceFileHandler.java @@ -27,10 +27,8 @@ import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; import com.seibel.distanthorizons.core.file.fullDatafile.IFullDataSourceProvider; import com.seibel.distanthorizons.core.level.IDhClientLevel; -import com.seibel.distanthorizons.core.sql.FullDataRepo; import com.seibel.distanthorizons.core.sql.MetaDataDto; import com.seibel.distanthorizons.core.sql.RenderDataRepo; -import com.seibel.distanthorizons.core.util.FileUtil; import com.seibel.distanthorizons.core.util.ThreadUtil; import org.apache.logging.log4j.Logger; @@ -41,7 +39,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -public class RenderSourceFileHandler implements ILodRenderSourceProvider +public class RenderSourceFileHandler implements IRenderSourceProvider { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java index f4ffbb4db..6e4de26ed 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java @@ -23,7 +23,7 @@ import com.seibel.distanthorizons.api.enums.config.EHorizontalQuality; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener; import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; -import com.seibel.distanthorizons.core.file.renderfile.ILodRenderSourceProvider; +import com.seibel.distanthorizons.core.file.renderfile.IRenderSourceProvider; import com.seibel.distanthorizons.core.level.IDhClientLevel; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhBlockPos2D; @@ -49,7 +49,7 @@ public class LodQuadTree extends QuadTree implements AutoClose private static final Logger LOGGER = DhLoggerBuilder.getLogger(); public final int blockRenderDistanceRadius; - private final ILodRenderSourceProvider renderSourceProvider; + private final IRenderSourceProvider renderSourceProvider; /** * This holds every {@link DhSectionPos} that should be reloaded next tick.
@@ -79,7 +79,7 @@ public class LodQuadTree extends QuadTree implements AutoClose public LodQuadTree( IDhClientLevel level, int viewDistanceInBlocks, int initialPlayerBlockX, int initialPlayerBlockZ, - ILodRenderSourceProvider provider) + IRenderSourceProvider provider) { super(viewDistanceInBlocks, new DhBlockPos2D(initialPlayerBlockX, initialPlayerBlockZ), TREE_LOWEST_DETAIL_LEVEL); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java index 0c44cd489..ef5574629 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java @@ -23,7 +23,7 @@ import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBufferBuilder; import com.seibel.distanthorizons.core.enums.EDhDirection; -import com.seibel.distanthorizons.core.file.renderfile.ILodRenderSourceProvider; +import com.seibel.distanthorizons.core.file.renderfile.IRenderSourceProvider; import com.seibel.distanthorizons.core.level.IDhClientLevel; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.DhSectionPos; @@ -55,12 +55,12 @@ public class LodRenderSection implements IDebugRenderable private boolean isRenderingEnabled = false; /** - * If this is true, then {@link LodRenderSection#reload(ILodRenderSourceProvider)} was called while - * a {@link ILodRenderSourceProvider} was already being loaded. + * If this is true, then {@link LodRenderSection#reload(IRenderSourceProvider)} was called while + * a {@link IRenderSourceProvider} was already being loaded. */ private boolean reloadRenderSourceOnceLoaded = false; - private ILodRenderSourceProvider renderSourceProvider = null; + private IRenderSourceProvider renderSourceProvider = null; private CompletableFuture renderSourceLoadFuture; private ColumnRenderSource renderSource; @@ -114,7 +114,7 @@ public class LodRenderSection implements IDebugRenderable //=============// /** does nothing if a render source is already loaded or in the process of loading */ - public void loadRenderSource(ILodRenderSourceProvider renderDataProvider, IDhClientLevel level) + public void loadRenderSource(IRenderSourceProvider renderDataProvider, IDhClientLevel level) { this.renderSourceProvider = renderDataProvider; this.level = level; @@ -139,7 +139,7 @@ public class LodRenderSection implements IDebugRenderable this.startLoadRenderSourceAsync(); } - public void reload(ILodRenderSourceProvider renderDataProvider) + public void reload(IRenderSourceProvider renderDataProvider) { // debug rendering boolean showRenderSectionStatus = Config.Client.Advanced.Debugging.DebugWireframe.showRenderSectionStatus.get();