From e530d0ffda51a69f30a688af9852cfc95dff2cb4 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 9 Mar 2026 12:28:58 -0500 Subject: [PATCH] wrapper movement --- .../render/blaze/McGenericObjectRenderer.java | 6 ++-- .../common/render/blaze/McLodRenderer.java | 8 ++--- .../render/blaze/apply/DhApplyRenderer.java | 2 +- .../render/blaze/apply/McCopyRenderer.java | 4 +-- .../BlazeDhFarFadeRenderer.java | 4 +-- .../blaze/postProcessing/McFogRenderer.java | 2 +- .../blaze/postProcessing/McSsaoRenderer.java | 2 +- .../postProcessing/McVanillaFadeRenderer.java | 4 +-- .../{ => buffer}/VertexBufferWrapper.java | 2 +- .../BlazeTextureViewWrapper.java | 2 +- .../{ => texture}/BlazeTextureWrapper.java | 2 +- .../AbstractUniformBufferWrapper.java | 3 +- .../LodUniformBufferWrapper.java | 3 +- .../common/wrappers/WrapperFactory.java | 35 ++++++++++++------- .../common/wrappers/misc/LightMapWrapper.java | 2 +- coreSubProjects | 2 +- 16 files changed, 46 insertions(+), 37 deletions(-) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/{ => buffer}/VertexBufferWrapper.java (96%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/{ => texture}/BlazeTextureViewWrapper.java (95%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/{ => texture}/BlazeTextureWrapper.java (98%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/{helpers => wrappers/uniform}/AbstractUniformBufferWrapper.java (97%) rename common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/{ => uniform}/LodUniformBufferWrapper.java (91%) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java index 1f5b6c09b..9d303b8f1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McGenericObjectRenderer.java @@ -44,7 +44,7 @@ import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox; import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading; import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; @@ -397,7 +397,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer boxGroup.tryUpdateInstancedDataAsync(); // skip groups that haven't been uploaded yet - if (boxGroup.instancedVbos.getState() != IGenericObjectVertexBufferContainer.EState.RENDER) + if (boxGroup.vertexBufferContainer.getState() != IGenericObjectVertexBufferContainer.EState.RENDER) { continue; } @@ -548,7 +548,7 @@ public class McGenericObjectRenderer implements IMcGenericRenderer profiler.push("vertex setup"); - BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.instancedVbos; + BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.vertexBufferContainer; LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap; BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper(); diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java index b83f4b089..28ef2d342 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/McLodRenderer.java @@ -19,10 +19,10 @@ import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.LodUniformBufferWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.VertexBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.VertexBufferWrapper; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java index a63e48858..2f5478c71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/DhApplyRenderer.java @@ -32,7 +32,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; 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/render/blaze/apply/McCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java index 358bfdb97..4dbd4aa44 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/McCopyRenderer.java @@ -30,8 +30,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.*; import com.mojang.blaze3d.vertex.VertexFormat; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; 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/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java index f9c3123c0..816b43537 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java @@ -37,8 +37,8 @@ import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.render.renderer.RenderParams; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java index deb7e7fd7..b4bfca676 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McFogRenderer.java @@ -42,7 +42,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.config.Config; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java index 4cdea47d3..f0e9db5c1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McSsaoRenderer.java @@ -39,7 +39,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f; import com.seibel.distanthorizons.common.render.blaze.McLodRenderer; import com.seibel.distanthorizons.common.render.blaze.apply.DhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.helpers.UniformHandler; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java index 40fd2bb9f..8eb518c88 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/McVanillaFadeRenderer.java @@ -37,8 +37,8 @@ import com.seibel.distanthorizons.common.render.blaze.apply.McCopyRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.*; import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil; import com.seibel.distanthorizons.common.render.blaze.util.DhBlazeVertexFormatUtil; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureViewWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeTextureWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLogger; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/VertexBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java similarity index 96% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/VertexBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java index 852594d1f..c4c0f5c76 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/VertexBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/VertexBufferWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.render.blaze.wrappers; +package com.seibel.distanthorizons.common.render.blaze.wrappers.buffer; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java similarity index 95% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java index eccf93226..991982410 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureViewWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.render.blaze.wrappers; +package com.seibel.distanthorizons.common.render.blaze.wrappers.texture; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java similarity index 98% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java index fcc5be7fb..60557565c 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeTextureWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.render.blaze.wrappers; +package com.seibel.distanthorizons.common.render.blaze.wrappers.texture; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/AbstractUniformBufferWrapper.java similarity index 97% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/AbstractUniformBufferWrapper.java index 6f55ceae3..f342dcf54 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/helpers/AbstractUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/AbstractUniformBufferWrapper.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.common.render.blaze.helpers; +package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform; import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -26,6 +26,7 @@ public abstract class AbstractUniformBufferWrapper implements IUniformBufferWrap public GpuBuffer gpuBuffer = null; + //=============// // constructor // //=============// diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/LodUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java similarity index 91% rename from common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/LodUniformBufferWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java index bc7711ecd..f0677a1c2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/LodUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/LodUniformBufferWrapper.java @@ -1,8 +1,7 @@ -package com.seibel.distanthorizons.common.render.blaze.wrappers; +package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform; import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; -import com.seibel.distanthorizons.common.render.blaze.helpers.AbstractUniformBufferWrapper; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; import com.seibel.distanthorizons.core.render.renderer.RenderParams; import com.seibel.distanthorizons.core.util.math.Mat4f; 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 4d3a23d2e..8471bedf6 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 @@ -26,8 +26,8 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper; import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory; import com.seibel.distanthorizons.common.render.blaze.McGenericObjectRenderer; import com.seibel.distanthorizons.common.render.blaze.helpers.BlazeGenericObjectVertexContainer; -import com.seibel.distanthorizons.common.render.blaze.wrappers.LodUniformBufferWrapper; -import com.seibel.distanthorizons.common.render.blaze.wrappers.VertexBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.LodUniformBufferWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.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; @@ -72,6 +72,7 @@ public class WrapperFactory implements IWrapperFactory //==============// // core methods // //==============// + //region @Override public IBatchGeneratorEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel) @@ -218,10 +219,25 @@ public class WrapperFactory implements IWrapperFactory } + @Override + public IVertexBufferWrapper createVboWrapper(String name) { return new VertexBufferWrapper(name); } + @Override + public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodUniformBufferWrapper(); } + + @Override + public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } + + @Override + public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); } + + //endregion + + //=============// // api methods // //=============// + //region // documentation should be in the API interface @@ -320,12 +336,15 @@ public class WrapperFactory implements IWrapperFactory return createWrapperErrorMessage("BlockState wrapper", expectedClassNames, objectArray); } + //endregion + //================// // helper methods // //================// + //region private static String createWrapperErrorMessage(String wrapperName, String[] expectedClassNames, Object[] objectArray) { @@ -361,17 +380,7 @@ public class WrapperFactory implements IWrapperFactory return message.toString(); } - - @Override - public IVertexBufferWrapper createVboWrapper(String name) { return new VertexBufferWrapper(name); } - @Override - public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new LodUniformBufferWrapper(); } - - @Override - public IGenericObjectVertexBufferContainer createInstancedVboContainer() { return new BlazeGenericObjectVertexContainer(); } - - @Override - public IMcGenericRenderer createGenericRenderer() { return new McGenericObjectRenderer(); } + //endregion 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 440f5b7aa..9ae35a965 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.render.blaze.wrappers.BlazeTextureViewWrapper; +import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper; diff --git a/coreSubProjects b/coreSubProjects index fee0aadcb..39dd1c850 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit fee0aadcbe9d82b9cf6e210b90beb6e08e4ffe44 +Subproject commit 39dd1c8509c23facf77ef9cafc5364a0908dd71f