From 053917d3d7495e963545550847318005d3f38290 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 8 Apr 2026 21:53:37 -0500 Subject: [PATCH] Fix compiling old MC versions --- .../RenderPipelineBuilderWrapper.java | 27 +++++++++++++++---- .../mixins/client/MixinLevelRenderer.java | 2 ++ .../mixins/client/MixinLevelRenderer.java | 17 ++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPipelineBuilderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPipelineBuilderWrapper.java index af57a9aba..0885bc195 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPipelineBuilderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPipelineBuilderWrapper.java @@ -1,15 +1,26 @@ package com.seibel.distanthorizons.common.render.blaze.wrappers; + +#if MC_VER <= MC_1_21_10 +public class RenderPipelineBuilderWrapper {} + +#else + import com.mojang.blaze3d.pipeline.BlendFunction; -import com.mojang.blaze3d.pipeline.ColorTargetState; -import com.mojang.blaze3d.pipeline.DepthStencilState; import com.mojang.blaze3d.pipeline.RenderPipeline; -import com.mojang.blaze3d.platform.CompareOp; import com.mojang.blaze3d.platform.PolygonMode; import com.mojang.blaze3d.shaders.UniformType; import com.mojang.blaze3d.vertex.VertexFormat; import net.minecraft.resources.Identifier; +#if MC_VER <= MC_1_21_11 +import com.mojang.blaze3d.platform.DepthTestFunction; +#else +import com.mojang.blaze3d.pipeline.ColorTargetState; +import com.mojang.blaze3d.pipeline.DepthStencilState; +import com.mojang.blaze3d.platform.CompareOp; +#endif + import java.io.IOException; import java.io.InputStream; import java.util.Optional; @@ -206,15 +217,20 @@ public class RenderPipelineBuilderWrapper this.blazePipelineBuilder.withoutBlend(); } + DepthTestFunction depthTestFunction; switch (this.depthTest) { case NONE: - + depthTestFunction = DepthTestFunction.NO_DEPTH_TEST; break; case LESS: + depthTestFunction = DepthTestFunction.LESS_DEPTH_TEST; break; + + default: + throw new UnsupportedOperationException("No depth test defined for type ["+this.depthTest+"]."); } - this.blazepipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE); + this.blazePipelineBuilder.withDepthTestFunction(depthTestFunction); #else @@ -349,3 +365,4 @@ public class RenderPipelineBuilderWrapper } +#endif \ No newline at end of file diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 748b8c331..425bd2191 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -51,8 +51,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.resource.GraphicsResourceAllocator; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; +import net.minecraft.client.Camera; import net.minecraft.client.DeltaTracker; import net.minecraft.client.renderer.chunk.ChunkSectionsToRender; +import org.joml.Matrix4f; import org.joml.Matrix4fc; import org.joml.Vector4f; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java index 169dd9659..58681a496 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java @@ -26,6 +26,23 @@ import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; import net.neoforged.neoforge.client.event.RenderLevelStageEvent; import org.joml.Matrix4f; +#elif MC_VER <= MC_1_21_11 +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.chunk.ChunkSectionsToRender; +import net.minecraft.client.Camera; +import net.minecraft.client.DeltaTracker; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.LevelRenderer; + +import org.joml.Matrix4f; +import org.joml.Matrix4fc; +import org.joml.Vector4f; + +import com.mojang.blaze3d.buffers.GpuBufferSlice; +import com.mojang.blaze3d.resource.GraphicsResourceAllocator; + +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; #else import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import net.minecraft.client.Minecraft;