From 49e3e112509849bf886ffc526ab49f40e96dc2a7 Mon Sep 17 00:00:00 2001
From: Acuadragon100 <8165958-acuadragon100@users.noreply.gitlab.com>
Date: Sun, 31 May 2026 11:16:01 +0200
Subject: [PATCH] Move getShade into ClientLevelWrapper.

---
 .../minecraft/MinecraftRenderWrapper.java      | 10 +++-------
 .../wrappers/world/ClientLevelWrapper.java     | 18 ++++++++++++++++++
 coreSubProjects                                |  2 +-
 3 files changed, 22 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 cf57ab829..27c462caf 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
@@ -659,14 +659,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				#if MC_VER <= MC_1_12_2
 				// 1.12.2 has no getShade, fall through to ENABLED
 				#else
-				if (MC.level != null)
+				IClientLevelWrapper level = MinecraftClientWrapper.INSTANCE.getWrappedClientLevel();
+				if (level != null)
 				{
-					Direction mcDir = McObjectConverter.Convert(lodDirection);
-					#if MC_VER <= MC_1_21_11
-					return MC.level.getShade(mcDir, true);
-					#else
-					return MC.level.cardinalLighting().byFace(mcDir);
-					#endif
+					return level.getShade(lodDirection);
 				}
 				else
 				{
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
index b07cdc462..23c16ff62 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java
@@ -2,6 +2,7 @@ package com.seibel.distanthorizons.common.wrappers.world;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCache;
@@ -11,6 +12,7 @@ import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapp
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.level.*;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -32,6 +34,7 @@ import net.minecraft.block.state.IBlockState;
 #else
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -664,6 +667,21 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		#endif
 	}
 	
+	@Override
+	public float getShade(EDhDirection lodDirection)
+	{
+		#if MC_VER <= MC_1_12_2
+			return 0; // 1.12.2 has no getShade
+		#else
+		Direction mcDir = McObjectConverter.Convert(lodDirection);
+		#if MC_VER <= MC_1_21_11
+			return level.getShade(mcDir, true);
+		#else
+			return level.cardinalLighting().byFace(mcDir);
+		#endif
+		#endif
+	}
+	
 	//endregion
 	
 	
diff --git a/coreSubProjects b/coreSubProjects
index 4f6d78189..653b86c51 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 4f6d78189b915876d01406ab33d9558437415b06
+Subproject commit 653b86c51a3e6c04a61511e6e13eedf5cd2b42aa