From 9cfdbdc0ca79b20b007c058cd4b0745d4cb1fc10 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sun, 5 Oct 2025 16:27:06 -0500
Subject: [PATCH] Fix compiling for MC 1.21.8 and older

---
 .../distanthorizons/common/AbstractModInitializer.java |  4 ++++
 .../common/wrappers/gui/DebugScreenEntry.java          | 10 ++++++++++
 .../distanthorizons/fabric/FabricClientProxy.java      |  2 ++
 gradle.properties                                      |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
index b9da685f5..dca8860f5 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java
@@ -84,7 +84,11 @@ public abstract class AbstractModInitializer
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
 		
+		#if MC_VER < MC_1_21_9
+		// debug screen rendering handled via a mixin
+		#else
 		DebugScreenEntry.register();
+		#endif
 		
 		this.subscribeClientStartedEvent(this::postInit);
 	}
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DebugScreenEntry.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DebugScreenEntry.java
index e5478f37f..f591bfe45 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DebugScreenEntry.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DebugScreenEntry.java
@@ -1,5 +1,8 @@
 package com.seibel.distanthorizons.common.wrappers.gui;
 
+#if MC_VER < MC_1_21_9
+// not supported for older MC versions
+#else
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 
@@ -14,7 +17,13 @@ import net.minecraft.client.gui.components.debug.DebugScreenEntries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.LevelChunk;
+#endif
 
+#if MC_VER < MC_1_21_9
+// not supported for older MC versions
+public class DebugScreenEntry
+{}
+#else
 public class DebugScreenEntry implements net.minecraft.client.gui.components.debug.DebugScreenEntry
 {
 	public static void register()
@@ -77,3 +86,4 @@ public class DebugScreenEntry implements net.minecraft.client.gui.components.deb
 		return true;
 	}
 }
+#endif
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
index f4e1c7a1b..90b64350d 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.fabric;
 
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+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.common.wrappers.chunk.ChunkWrapper;
@@ -29,6 +30,7 @@ import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
diff --git a/gradle.properties b/gradle.properties
index 08b2f5416..197997bb9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ versionStr=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.21.9
+mcVer=1.21.8
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
 #minecraftMemoryJavaArg="-Xmx4G"