From f72ad60f58b422f155d1cef1951e44fc61b1d91e Mon Sep 17 00:00:00 2001 From: James Seibel Date: Thu, 26 Jun 2025 07:10:32 -0500 Subject: [PATCH] Fix old MC version compiling --- .../wrappers/minecraft/MinecraftRenderWrapper.java | 6 +++++- .../fabric/mixins/client/MixinFogRenderer.java | 1 - .../fabric/mixins/client/MixinLevelRenderer.java | 13 ++++++++----- .../forge/mixins/client/MixinLevelRenderer.java | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) 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 12c62449f..2f7fd0c55 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 @@ -33,7 +33,8 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; -#if MC_VER >= MC_1_17_1 && MC_VER < MC_1_21_6 +#if MC_VER < MC_1_17_1 +#elif MC_VER < MC_1_21_6 import net.minecraft.client.renderer.FogRenderer; import com.mojang.blaze3d.systems.RenderSystem; #else @@ -108,7 +109,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper public boolean colorTextureCastFailLogged = false; public boolean depthTextureCastFailLogged = false; + #if MC_VER < MC_1_21_6 + #else private static FogRenderer mcFogRenderer = null; + #endif diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java index ced56d7e3..6977a6578 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java @@ -19,7 +19,6 @@ package com.seibel.distanthorizons.fabric.mixins.client; -import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; 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 1836244fc..e9b238fe9 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 @@ -20,17 +20,18 @@ package com.seibel.distanthorizons.fabric.mixins.client; #if MC_VER < MC_1_19_4 +import net.minecraft.client.renderer.RenderType; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; import org.lwjgl.opengl.GL32; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; #elif MC_VER < MC_1_21_6 import net.minecraft.client.renderer.RenderType; +import com.mojang.blaze3d.vertex.PoseStack; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; #else import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.distanthorizons.coreapi.ModInfo; -import com.seibel.distanthorizons.fabric.FabricClientProxy; import net.minecraft.client.Camera; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.chunk.ChunkSectionsToRender; @@ -43,6 +44,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.seibel.distanthorizons.common.wrappers.McObjectConverter; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.fabric.FabricClientProxy; import com.seibel.distanthorizons.core.util.math.Mat4f; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.client.Minecraft; @@ -149,9 +152,9 @@ public class MixinLevelRenderer if (renderType.equals(RenderType.translucent())) { ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level), - mcModelViewMatrix, - mcProjectionMatrix, - frameTime + FabricClientProxy.neoRenderState.mcModelViewMatrix, + FabricClientProxy.neoRenderState.mcProjectionMatrix, + FabricClientProxy.neoRenderState.frameTime ); } #endif diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index d94d3bae3..ce159d7d5 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -156,7 +156,7 @@ public class MixinLevelRenderer } else if (renderType.equals(RenderType.translucent())) { - ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime); + ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime); } // render fade