diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java index a1db1eb56..aa6fe7383 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze; +#if MC_VER <= MC_1_21_10 +public class BlazeDebugWireframeRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -322,3 +327,4 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java index 05859dfec..5185353f6 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze; +#if MC_VER <= MC_1_21_10 +public class BlazeDhGenericObjectRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -622,3 +627,4 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhMetaRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhMetaRenderer.java index 71bf83451..e71e91dab 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhMetaRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhMetaRenderer.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze; +#if MC_VER <= MC_1_21_10 +public class BlazeDhMetaRenderer {} + +#else + import com.mojang.blaze3d.textures.GpuTexture; import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer; import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper; @@ -86,3 +91,4 @@ public class BlazeDhMetaRenderer implements IDhMetaRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhRenderApiDefinition.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhRenderApiDefinition.java index f91eb3c32..4c40669a4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhRenderApiDefinition.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhRenderApiDefinition.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze; +#if MC_VER <= MC_1_21_10 +public class BlazeDhRenderApiDefinition {} + +#else + import com.seibel.distanthorizons.common.render.blaze.objects.BlazeGenericObjectVertexContainer; import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFarFadeRenderer; import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFogRenderer; @@ -63,3 +68,4 @@ public class BlazeDhRenderApiDefinition extends AbstractDhRenderApiDefinition } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java index 11b3845dd..27513a919 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java @@ -1,5 +1,9 @@ package com.seibel.distanthorizons.common.render.blaze; +#if MC_VER <= MC_1_21_10 +public class BlazeDhTerrainRenderer {} + +#else import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; @@ -387,3 +391,4 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java index 636716246..83accc661 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.apply; +#if MC_VER <= MC_1_21_10 +public class BlazeDhApplyRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.BlendFunction; import com.mojang.blaze3d.pipeline.RenderPipeline; @@ -260,3 +265,4 @@ public class BlazeDhApplyRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java index 429e8ac21..7286a0758 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.apply; +#if MC_VER <= MC_1_21_10 +public class BlazeDhCopyRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.platform.DepthTestFunction; @@ -157,3 +162,4 @@ public class BlazeDhCopyRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/objects/BlazeGenericObjectVertexContainer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/objects/BlazeGenericObjectVertexContainer.java index b6fe50565..34b16009f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/objects/BlazeGenericObjectVertexContainer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/objects/BlazeGenericObjectVertexContainer.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.objects; +#if MC_VER <= MC_1_21_10 +public class BlazeGenericObjectVertexContainer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.CommandEncoder; @@ -277,3 +282,4 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex } +#endif \ No newline at end of file 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 9f01b56c4..8d1d0a451 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 @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.postProcessing; +#if MC_VER <= MC_1_21_10 +public class BlazeDhFarFadeRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -227,3 +232,4 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java index f8f86c2b7..4d20e9c65 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.postProcessing; +#if MC_VER <= MC_1_21_10 +public class BlazeDhFogRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -355,3 +360,4 @@ public class BlazeDhFogRenderer implements IDhFogRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java index f9de81aa8..87f0e91b1 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.postProcessing; +#if MC_VER <= MC_1_21_10 +public class BlazeDhSsaoRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -275,3 +280,4 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java index 788fd1538..f1d7166c2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.postProcessing; +#if MC_VER <= MC_1_21_10 +public class BlazeVanillaFadeRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.buffers.Std140Builder; @@ -254,3 +259,4 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java index 563b82853..aaa295de2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java @@ -19,6 +19,11 @@ package com.seibel.distanthorizons.common.render.blaze.test; +#if MC_VER <= MC_1_21_10 +public class BlazeDhTestTriangleRenderer {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.pipeline.RenderPipeline; @@ -184,3 +189,4 @@ public class BlazeDhTestTriangleRenderer implements IDhTestTriangleRenderer } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeDhVertexFormatUtil.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeDhVertexFormatUtil.java index 810d77d4d..d4cea9b20 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeDhVertexFormatUtil.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeDhVertexFormatUtil.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.util; +#if MC_VER <= MC_1_21_10 +public class BlazeDhVertexFormatUtil {} + +#else + import com.mojang.blaze3d.vertex.VertexFormatElement; import com.seibel.distanthorizons.api.enums.config.EDhApiRenderApi; import com.seibel.distanthorizons.core.config.Config; @@ -97,3 +102,4 @@ public class BlazeDhVertexFormatUtil } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java index bca3e31f5..c1a29951f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.util; +#if MC_VER <= MC_1_21_10 +public class BlazePostProcessUtil {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.CommandEncoder; @@ -73,3 +78,4 @@ public class BlazePostProcessUtil } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeUniformUtil.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeUniformUtil.java index e9262a797..6b40aaa11 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeUniformUtil.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeUniformUtil.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.util; +#if MC_VER <= MC_1_21_10 +public class BlazeUniformUtil {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; @@ -30,3 +35,4 @@ public class BlazeUniformUtil } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java index cfe982fcd..ea707adfc 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.buffer; +#if MC_VER <= MC_1_21_10 +public class BlazeVertexBufferWrapper {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.CommandEncoder; @@ -82,3 +87,4 @@ public class BlazeVertexBufferWrapper implements IVertexBufferWrapper } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java index 991982410..5f5a33d2b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.texture; +#if MC_VER <= MC_1_21_10 +public class BlazeTextureViewWrapper {} + +#else + import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; import com.mojang.blaze3d.systems.RenderSystem; @@ -64,3 +69,4 @@ public class BlazeTextureViewWrapper } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java index 60557565c..fe1a3a8f2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.texture; +#if MC_VER <= MC_1_21_10 +public class BlazeTextureWrapper {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.systems.CommandEncoder; import com.mojang.blaze3d.systems.GpuDevice; @@ -159,3 +164,4 @@ public class BlazeTextureWrapper } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java index 0ac76e60e..ba39f5018 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform; +#if MC_VER <= MC_1_21_10 +public class BlazeLodUniformBufferWrapper {} + +#else + import com.mojang.blaze3d.buffers.Std140Builder; import com.mojang.blaze3d.buffers.Std140SizeCalculator; import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer; @@ -68,3 +73,4 @@ public class BlazeLodUniformBufferWrapper extends BlazeUniformBufferWrapper impl //endregion } +#endif \ No newline at end of file diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeUniformBufferWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeUniformBufferWrapper.java index 55b25e612..a487b0bde 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeUniformBufferWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeUniformBufferWrapper.java @@ -1,5 +1,10 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers.uniform; +#if MC_VER <= MC_1_21_10 +public class BlazeUniformBufferWrapper {} + +#else + import com.mojang.blaze3d.buffers.GpuBuffer; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.CommandEncoder; @@ -122,3 +127,4 @@ public class BlazeUniformBufferWrapper implements IUniformBufferWrapper } +#endif \ No newline at end of file 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 d743e99fa..caa9b8a64 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 @@ -101,7 +101,11 @@ public class DependencySetup } else if (renderingApiEnum == EDhApiRenderApi.BLAZE_3D) { + #if MC_VER <= MC_1_21_10 + throw new IllegalStateException("["+renderingApiEnum+"] is not supported on this version of Minecraft."); + #else renderDefinition = new BlazeDhRenderApiDefinition(); + #endif } else { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index d2d685c1b..fede80a71 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -25,13 +25,10 @@ import java.util.concurrent.ConcurrentHashMap; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.NativeImage; -import com.mojang.blaze3d.textures.GpuTexture; import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; -import com.seibel.distanthorizons.core.api.internal.ClientApi; import com.seibel.distanthorizons.core.config.Config; -import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; @@ -88,6 +85,7 @@ import com.mojang.blaze3d.opengl.GlTexture; #if MC_VER <= MC_1_21_10 #else import net.minecraft.world.attribute.EnvironmentAttributes; +import com.mojang.blaze3d.textures.GpuTexture; #endif /** @@ -489,6 +487,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper LightMapWrapper wrapper = this.lightmapByDimensionType.computeIfAbsent(dimensionType, (dimType) -> new LightMapWrapper()); wrapper.setLightmapId(tetxureId); } + + #if MC_VER <= MC_1_21_10 + #else public void setLightmapGpuTexture(GpuTexture gpuTexture, IClientLevelWrapper level) { // Using ClientLevelWrapper as the key would be better, but we don't have a consistent way to create the same @@ -499,6 +500,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper LightMapWrapper wrapper = this.lightmapByDimensionType.computeIfAbsent(dimensionType, (dimType) -> new LightMapWrapper()); wrapper.setLightmapGpuTexture(gpuTexture); } + #endif @Override public float getShade(EDhDirection lodDirection) 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 5bee728d6..775a5ef77 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 @@ -20,7 +20,6 @@ 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.texture.BlazeTextureViewWrapper; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; @@ -33,6 +32,11 @@ import java.nio.ByteBuffer; #else #endif +#if MC_VER <= MC_1_21_10 +#else +import com.mojang.blaze3d.textures.GpuTexture; +#endif + public class LightMapWrapper implements ILightMapWrapper { private static final MinecraftGLWrapper GLMC = MinecraftGLWrapper.INSTANCE; @@ -46,7 +50,11 @@ public class LightMapWrapper implements ILightMapWrapper private int textureId = 0; + #if MC_VER <= MC_1_21_10 + #else private GpuTexture gpuTexture = null; + #endif + private final BlazeTextureViewWrapper lightmapTextureWrapper = new BlazeTextureViewWrapper(); @@ -109,11 +117,14 @@ public class LightMapWrapper implements ILightMapWrapper this.textureId = minecraftLightmapTextureId; } + #if MC_VER <= MC_1_21_10 + #else public void setLightmapGpuTexture(GpuTexture gpuTexture) { this.gpuTexture = gpuTexture; this.lightmapTextureWrapper.tryWrap(this.gpuTexture); } + #endif //endregion diff --git a/coreSubProjects b/coreSubProjects index 1bbe41c06..d75b65e6e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 1bbe41c0685546fa91c95ddd265fac78949ff43b +Subproject commit d75b65e6e72716f43c2879b67c4732536fbd411c