From 4820c11f8eba43540324a6a37979742a5424c290 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 22 Mar 2022 21:51:26 -0500 Subject: [PATCH] Move a few objects to the objects.opengl package --- src/main/java/com/seibel/lod/core/api/ApiShared.java | 2 +- src/main/java/com/seibel/lod/core/api/ClientApi.java | 2 +- .../com/seibel/lod/core/objects/opengl/LodQuadBuilder.java | 2 +- .../java/com/seibel/lod/core/objects/opengl/RenderRegion.java | 4 ++-- .../seibel/lod/core/objects/opengl/SimpleRenderBuffer.java | 4 +--- .../opengl}/builders/bufferBuilding/CubicLodTemplate.java | 2 +- .../builders/bufferBuilding/LodBufferBuilderFactory.java | 2 +- .../{ => objects/opengl}/builders/lodBuilding/LodBuilder.java | 2 +- .../opengl}/builders/lodBuilding/LodBuilderConfig.java | 2 +- .../opengl}/builders/worldGeneration/BatchGenerator.java | 4 ++-- src/main/java/com/seibel/lod/core/render/LodRenderer.java | 4 +--- .../seibel/lod/core/wrapperInterfaces/IWrapperFactory.java | 2 +- .../AbstractBatchGenerationEnvionmentWrapper.java | 2 +- 13 files changed, 15 insertions(+), 19 deletions(-) rename src/main/java/com/seibel/lod/core/{ => objects/opengl}/builders/bufferBuilding/CubicLodTemplate.java (98%) rename src/main/java/com/seibel/lod/core/{ => objects/opengl}/builders/bufferBuilding/LodBufferBuilderFactory.java (99%) rename src/main/java/com/seibel/lod/core/{ => objects/opengl}/builders/lodBuilding/LodBuilder.java (99%) rename src/main/java/com/seibel/lod/core/{ => objects/opengl}/builders/lodBuilding/LodBuilderConfig.java (97%) rename src/main/java/com/seibel/lod/core/{ => objects/opengl}/builders/worldGeneration/BatchGenerator.java (98%) diff --git a/src/main/java/com/seibel/lod/core/api/ApiShared.java b/src/main/java/com/seibel/lod/core/api/ApiShared.java index 6f4de01c0..2aaa23fd6 100644 --- a/src/main/java/com/seibel/lod/core/api/ApiShared.java +++ b/src/main/java/com/seibel/lod/core/api/ApiShared.java @@ -20,7 +20,7 @@ package com.seibel.lod.core.api; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.enums.config.VerticalQuality; import com.seibel.lod.core.objects.lod.LodWorld; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/seibel/lod/core/api/ClientApi.java b/src/main/java/com/seibel/lod/core/api/ClientApi.java index 063538699..e2fc94eb9 100644 --- a/src/main/java/com/seibel/lod/core/api/ClientApi.java +++ b/src/main/java/com/seibel/lod/core/api/ClientApi.java @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import org.lwjgl.glfw.GLFW; import com.seibel.lod.core.ModInfo; -import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory; +import com.seibel.lod.core.objects.opengl.builders.bufferBuilding.LodBufferBuilderFactory; import com.seibel.lod.core.enums.config.DistanceGenerationMode; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.lod.LodDimension; diff --git a/src/main/java/com/seibel/lod/core/objects/opengl/LodQuadBuilder.java b/src/main/java/com/seibel/lod/core/objects/opengl/LodQuadBuilder.java index ebe7fe443..c2904fadc 100644 --- a/src/main/java/com/seibel/lod/core/objects/opengl/LodQuadBuilder.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/LodQuadBuilder.java @@ -7,7 +7,7 @@ import java.util.Iterator; import java.util.ListIterator; import com.seibel.lod.core.api.ApiShared; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.enums.LodDirection; import com.seibel.lod.core.enums.LodDirection.Axis; import com.seibel.lod.core.enums.config.GpuUploadMethod; diff --git a/src/main/java/com/seibel/lod/core/objects/opengl/RenderRegion.java b/src/main/java/com/seibel/lod/core/objects/opengl/RenderRegion.java index 2aed984bd..b6e76da01 100644 --- a/src/main/java/com/seibel/lod/core/objects/opengl/RenderRegion.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/RenderRegion.java @@ -9,8 +9,8 @@ import java.util.concurrent.atomic.AtomicReference; import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.api.ClientApi; -import com.seibel.lod.core.builders.bufferBuilding.CubicLodTemplate; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.bufferBuilding.CubicLodTemplate; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.enums.LodDirection; import com.seibel.lod.core.enums.config.GpuUploadMethod; import com.seibel.lod.core.enums.rendering.DebugMode; diff --git a/src/main/java/com/seibel/lod/core/objects/opengl/SimpleRenderBuffer.java b/src/main/java/com/seibel/lod/core/objects/opengl/SimpleRenderBuffer.java index b4328d59c..cc126b52e 100644 --- a/src/main/java/com/seibel/lod/core/objects/opengl/SimpleRenderBuffer.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/SimpleRenderBuffer.java @@ -4,12 +4,10 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.concurrent.TimeUnit; -import com.seibel.lod.core.render.LodRenderer; -import com.seibel.lod.core.util.SpamReducedLogger; import org.lwjgl.opengl.GL32; import com.seibel.lod.core.api.ApiShared; -import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory; +import com.seibel.lod.core.objects.opengl.builders.bufferBuilding.LodBufferBuilderFactory; import com.seibel.lod.core.enums.config.GpuUploadMethod; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; import com.seibel.lod.core.objects.opengl.LodQuadBuilder.BufferFiller; diff --git a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/CubicLodTemplate.java b/src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/CubicLodTemplate.java similarity index 98% rename from src/main/java/com/seibel/lod/core/builders/bufferBuilding/CubicLodTemplate.java rename to src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/CubicLodTemplate.java index b37de0fa1..935efbf9d 100644 --- a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/CubicLodTemplate.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/CubicLodTemplate.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.builders.bufferBuilding; +package com.seibel.lod.core.objects.opengl.builders.bufferBuilding; import com.seibel.lod.core.api.ApiShared; import com.seibel.lod.core.enums.rendering.DebugMode; diff --git a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java b/src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/LodBufferBuilderFactory.java similarity index 99% rename from src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java rename to src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/LodBufferBuilderFactory.java index 3fc13ebf7..5dbd6e1d2 100644 --- a/src/main/java/com/seibel/lod/core/builders/bufferBuilding/LodBufferBuilderFactory.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/builders/bufferBuilding/LodBufferBuilderFactory.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.builders.bufferBuilding; +package com.seibel.lod.core.objects.opengl.builders.bufferBuilding; import java.time.Duration; import java.util.concurrent.*; diff --git a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java b/src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilder.java similarity index 99% rename from src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java rename to src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilder.java index b34fa99fb..c502b601b 100644 --- a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilder.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilder.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.builders.lodBuilding; +package com.seibel.lod.core.objects.opengl.builders.lodBuilding; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilderConfig.java b/src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilderConfig.java similarity index 97% rename from src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilderConfig.java rename to src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilderConfig.java index e60c4b8df..724d9e0be 100644 --- a/src/main/java/com/seibel/lod/core/builders/lodBuilding/LodBuilderConfig.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/builders/lodBuilding/LodBuilderConfig.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.builders.lodBuilding; +package com.seibel.lod.core.objects.opengl.builders.lodBuilding; import com.seibel.lod.core.enums.config.DistanceGenerationMode; diff --git a/src/main/java/com/seibel/lod/core/builders/worldGeneration/BatchGenerator.java b/src/main/java/com/seibel/lod/core/objects/opengl/builders/worldGeneration/BatchGenerator.java similarity index 98% rename from src/main/java/com/seibel/lod/core/builders/worldGeneration/BatchGenerator.java rename to src/main/java/com/seibel/lod/core/objects/opengl/builders/worldGeneration/BatchGenerator.java index 4be3570ef..3dee195d5 100644 --- a/src/main/java/com/seibel/lod/core/builders/worldGeneration/BatchGenerator.java +++ b/src/main/java/com/seibel/lod/core/objects/opengl/builders/worldGeneration/BatchGenerator.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.core.enums.worldGeneration; +package com.seibel.lod.core.objects.opengl.builders.worldGeneration; import com.seibel.lod.core.api.ApiShared; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.enums.config.DistanceGenerationMode; import com.seibel.lod.core.enums.config.GenerationPriority; import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler; diff --git a/src/main/java/com/seibel/lod/core/render/LodRenderer.java b/src/main/java/com/seibel/lod/core/render/LodRenderer.java index ed706674d..1b387c3ff 100644 --- a/src/main/java/com/seibel/lod/core/render/LodRenderer.java +++ b/src/main/java/com/seibel/lod/core/render/LodRenderer.java @@ -21,7 +21,6 @@ package com.seibel.lod.core.render; import java.awt.Color; import java.time.Duration; -import java.util.Set; import java.util.concurrent.TimeUnit; import com.seibel.lod.core.objects.BoolType; @@ -31,7 +30,7 @@ import com.seibel.lod.core.util.gridList.*; import org.lwjgl.opengl.GL32; import com.seibel.lod.core.api.ApiShared; -import com.seibel.lod.core.builders.bufferBuilding.LodBufferBuilderFactory; +import com.seibel.lod.core.objects.opengl.builders.bufferBuilding.LodBufferBuilderFactory; import com.seibel.lod.core.enums.rendering.DebugMode; import com.seibel.lod.core.enums.rendering.FogColorMode; import com.seibel.lod.core.enums.rendering.FogDistance; @@ -43,7 +42,6 @@ import com.seibel.lod.core.objects.math.Vec3f; import com.seibel.lod.core.objects.opengl.RenderRegion; import com.seibel.lod.core.render.objects.LightmapTexture; import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper; import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java index 029665030..9a9842e54 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/IWrapperFactory.java @@ -19,7 +19,7 @@ package com.seibel.lod.core.wrapperInterfaces; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.handlers.dependencyInjection.IBindable; import com.seibel.lod.core.objects.lod.LodDimension; import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper; diff --git a/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java b/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java index 0c022ecff..ca29bb94e 100644 --- a/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java +++ b/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java @@ -1,6 +1,6 @@ package com.seibel.lod.core.wrapperInterfaces.worldGeneration; -import com.seibel.lod.core.builders.lodBuilding.LodBuilder; +import com.seibel.lod.core.objects.opengl.builders.lodBuilding.LodBuilder; import com.seibel.lod.core.objects.lod.LodDimension; import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;