From f8eb1e8a97de6faeaf05847f8967cae9f076122f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 08:27:24 -0500 Subject: [PATCH] Move blaze render namespace --- .../blaze}/McDebugObjectRenderer.java | 7 +++---- .../blaze}/McGenericObjectRenderer.java | 13 +++++-------- .../blaze}/McLodRenderer.java | 7 +++---- .../blaze}/apply/DhApplyRenderer.java | 9 ++++----- .../blaze}/apply/McCopyRenderer.java | 17 +++++------------ .../helpers/AbstractUniformBufferWrapper.java | 2 +- .../blaze}/helpers/DhVertexFormat.java | 2 +- .../LodContainerUniformBufferWrapper.java | 2 +- .../blaze}/helpers/McInstancedVboContainer.java | 2 +- .../blaze}/helpers/McTextureViewWrapper.java | 2 +- .../blaze}/helpers/McTextureWrapper.java | 2 +- .../blaze}/helpers/PostProcessHelper.java | 2 +- .../blaze}/helpers/UniformHandler.java | 2 +- .../blaze}/helpers/VertexBufferWrapper.java | 2 +- .../postProcessing/McFarFadeRenderer.java | 10 ++++------ .../blaze}/postProcessing/McFogRenderer.java | 17 +++++++---------- .../blaze}/postProcessing/McSsaoRenderer.java | 14 +++++++------- .../postProcessing/McVanillaFadeRenderer.java | 10 ++++------ .../blaze}/test/DhTestRenderer.java | 4 ++-- .../common/wrappers/DependencySetup.java | 13 +++++++------ .../common/wrappers/WrapperFactory.java | 8 ++++---- .../common/wrappers/misc/LightMapWrapper.java | 2 +- 22 files changed, 65 insertions(+), 84 deletions(-) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/McDebugObjectRenderer.java (97%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/McGenericObjectRenderer.java (97%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/McLodRenderer.java (98%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/apply/DhApplyRenderer.java (95%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/apply/McCopyRenderer.java (86%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/AbstractUniformBufferWrapper.java (97%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/DhVertexFormat.java (97%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/LodContainerUniformBufferWrapper.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/McInstancedVboContainer.java (99%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/McTextureViewWrapper.java (95%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/McTextureWrapper.java (98%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/PostProcessHelper.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/UniformHandler.java (92%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/helpers/VertexBufferWrapper.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/postProcessing/McFarFadeRenderer.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/postProcessing/McFogRenderer.java (94%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/postProcessing/McSsaoRenderer.java (94%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/postProcessing/McVanillaFadeRenderer.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/{renderTest => render/blaze}/test/DhTestRenderer.java (97%) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McDebugObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/McDebugObjectRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java index 1050db3fa..0fc2019a3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McDebugObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McDebugObjectRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest; +package com.seibel.distanthorizons.common.render.blaze; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -31,10 +31,9 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.UniformHandler; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/McGenericObjectRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java index cdfc5d6c5..9e1ce1dea 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest; +package com.seibel.distanthorizons.common.render.blaze; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -32,7 +32,6 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial; import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister; @@ -43,10 +42,10 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeG import com.seibel.distanthorizons.api.objects.math.DhApiVec3d; import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox; import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.McInstancedVboContainer; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureViewWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.UniformHandler; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.McInstancedVboContainer; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -59,7 +58,6 @@ import com.seibel.distanthorizons.core.render.renderer.generic.RenderableBoxGrou import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.util.math.Vec3d; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcGenericRenderer; @@ -75,7 +73,6 @@ import java.util.Collection; import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; /** * Handles rendering generic groups of {@link DhApiRenderableBox}. diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McLodRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/McLodRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java index 34d51edab..050bca36b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/McLodRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest; +package com.seibel.distanthorizons.common.render.blaze; import com.mojang.blaze3d.buffers.GpuBuffer; @@ -16,8 +16,8 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.apply.DhApplyRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.*; +import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; @@ -45,7 +45,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * Renders a TODO diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/DhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/DhApplyRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java index e66701dd2..c6cb0d436 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/DhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.apply; +package com.seibel.distanthorizons.common.render.blaze.apply; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -32,10 +32,9 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureViewWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.coreapi.ModInfo; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/McCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java similarity index 86% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/McCopyRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java index bdc663459..433c11b30 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/apply/McCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java @@ -17,10 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.apply; +package com.seibel.distanthorizons.common.render.blaze.apply; import com.mojang.blaze3d.buffers.GpuBuffer; -import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; import com.mojang.blaze3d.platform.PolygonMode; @@ -30,22 +29,16 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureViewWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.PostProcessHelper; -import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import net.minecraft.resources.Identifier; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * TODO ??? diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/AbstractUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/AbstractUniformBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java index 3f6b9e322..e561b70e8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/AbstractUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/DhVertexFormat.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/DhVertexFormat.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java index a687124b3..5cd213582 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/DhVertexFormat.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/DhVertexFormat.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.vertex.VertexFormatElement; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/LodContainerUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/LodContainerUniformBufferWrapper.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/LodContainerUniformBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/LodContainerUniformBufferWrapper.java index faa19377f..647162a76 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/LodContainerUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/LodContainerUniformBufferWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McInstancedVboContainer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java similarity index 99% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McInstancedVboContainer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java index bc8b8036b..d6e204c93 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McInstancedVboContainer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McInstancedVboContainer.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureViewWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureViewWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java index 5e6cc87c5..9686708ff 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureViewWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureViewWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java index 8aba4aacf..bb508adee 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/McTextureWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/McTextureWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/PostProcessHelper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/PostProcessHelper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java index c5b03d767..e30276f28 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/PostProcessHelper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/PostProcessHelper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/UniformHandler.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/UniformHandler.java similarity index 92% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/UniformHandler.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/UniformHandler.java index ebc4295bb..ead28ddcb 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/UniformHandler.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/UniformHandler.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.GpuDevice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/VertexBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/VertexBufferWrapper.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/VertexBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/VertexBufferWrapper.java index 44552b0c3..a180419ca 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/helpers/VertexBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/VertexBufferWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.renderTest.helpers; +package com.seibel.distanthorizons.common.render.blaze.helpers; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFarFadeRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java index 70387a5ac..a05cac1b6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFarFadeRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.postProcessing; +package com.seibel.distanthorizons.common.render.blaze.postProcessing; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -31,11 +31,10 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.*; -import com.seibel.distanthorizons.common.renderTest.apply.McCopyRenderer; -import com.seibel.distanthorizons.common.renderTest.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; @@ -51,7 +50,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * Renders a TODO diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java similarity index 94% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFogRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java index 9494c6a04..81e762ec8 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.postProcessing; +package com.seibel.distanthorizons.common.render.blaze.postProcessing; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -34,18 +34,17 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogColorMode; import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection; import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode; import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; -import com.seibel.distanthorizons.common.renderTest.apply.DhApplyRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; -import com.seibel.distanthorizons.common.renderTest.McLodRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureWrapper; -import com.seibel.distanthorizons.common.renderTest.helpers.PostProcessHelper; -import com.seibel.distanthorizons.common.renderTest.helpers.UniformHandler; +import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -53,7 +52,6 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcFogRenderer; import net.minecraft.resources.Identifier; @@ -63,7 +61,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * Renders a TODO diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java similarity index 94% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McSsaoRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java index cb66847f2..2bac3f00a 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.postProcessing; +package com.seibel.distanthorizons.common.render.blaze.postProcessing; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -34,18 +34,19 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; -import com.seibel.distanthorizons.common.renderTest.apply.DhApplyRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.*; -import com.seibel.distanthorizons.common.renderTest.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.PostProcessHelper; +import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.RenderUtil; import com.seibel.distanthorizons.core.util.math.Mat4f; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcSsaoRenderer; import net.minecraft.resources.Identifier; @@ -54,7 +55,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * Renders a TODO diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McVanillaFadeRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java index 122c0e44d..f45e4e38d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/postProcessing/McVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.postProcessing; +package com.seibel.distanthorizons.common.render.blaze.postProcessing; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -31,11 +31,10 @@ import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.McLodRenderer; -import com.seibel.distanthorizons.common.renderTest.apply.McCopyRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.*; +import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; @@ -52,7 +51,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.OptionalDouble; import java.util.OptionalInt; -import java.util.function.Supplier; /** * Renders a TODO diff --git a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/test/DhTestRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/renderTest/test/DhTestRenderer.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java index 988d5f16b..79942a9da 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/renderTest/test/DhTestRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/DhTestRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.common.renderTest.test; +package com.seibel.distanthorizons.common.render.blaze.test; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -30,7 +30,7 @@ import com.mojang.blaze3d.systems.RenderPass; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; -import com.seibel.distanthorizons.common.renderTest.helpers.DhVertexFormat; +import com.seibel.distanthorizons.common.render.blaze.helpers.DhVertexFormat; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.render.IMcTestRenderer; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index d3d9b3827..cffbce4ec 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -19,12 +19,13 @@ package com.seibel.distanthorizons.common.wrappers; -import com.seibel.distanthorizons.common.renderTest.*; -import com.seibel.distanthorizons.common.renderTest.postProcessing.McFarFadeRenderer; -import com.seibel.distanthorizons.common.renderTest.postProcessing.McFogRenderer; -import com.seibel.distanthorizons.common.renderTest.postProcessing.McSsaoRenderer; -import com.seibel.distanthorizons.common.renderTest.postProcessing.McVanillaFadeRenderer; -import com.seibel.distanthorizons.common.renderTest.test.DhTestRenderer; +import com.seibel.distanthorizons.common.render.blaze.McDebugObjectRenderer; +import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.McFarFadeRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.McFogRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.McSsaoRenderer; +import com.seibel.distanthorizons.common.render.blaze.postProcessing.McVanillaFadeRenderer; +import com.seibel.distanthorizons.common.render.blaze.test.DhTestRenderer; import com.seibel.distanthorizons.common.wrappers.gui.ClassicConfigGUI; import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper; import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java index 798e4c559..5344336c4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java @@ -24,10 +24,10 @@ import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper; import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory; -import com.seibel.distanthorizons.common.renderTest.helpers.LodContainerUniformBufferWrapper; -import com.seibel.distanthorizons.common.renderTest.McGenericObjectRenderer; -import com.seibel.distanthorizons.common.renderTest.helpers.McInstancedVboContainer; -import com.seibel.distanthorizons.common.renderTest.helpers.VertexBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.McGenericObjectRenderer; +import com.seibel.distanthorizons.common.render.blaze.helpers.LodContainerUniformBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.McInstancedVboContainer; +import com.seibel.distanthorizons.common.render.blaze.helpers.VertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java index 3835720e1..bd6978e13 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java @@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.misc; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.textures.GpuTexture; -import com.seibel.distanthorizons.common.renderTest.helpers.McTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.helpers.McTextureViewWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;