From 363df0ad6f9aae31edb350403b3cd732e8e658c7 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 3 Aug 2024 11:38:02 -0500
Subject: [PATCH] Fix MC 1.16/1.17 compiling

---
 .../fabric/testing/TestWorldGenBindingEvent.java     |  6 +++---
 .../fabric/testing/TestWorldGenerator.java           | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java
index caee4c80c..3830ae053 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java
@@ -1,16 +1,16 @@
 package com.seibel.distanthorizons.fabric.testing;
 
-import com.mojang.logging.LogUtils;
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
-import com.seibel.distanthorizons.fabric.FabricServerProxy;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.server.level.ServerLevel;
+import org.apache.logging.log4j.Logger;
 
 public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent
 {
-	private static final org.slf4j.Logger LOGGER = LogUtils.getLogger();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	@Override
 	public void onLevelLoad(DhApiEventParam<DhApiLevelLoadEvent.EventParam> event)
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenerator.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenerator.java
index 74f0fa90f..d5cf9d578 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenerator.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenerator.java
@@ -9,6 +9,7 @@ import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.Abstrac
 import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
@@ -45,10 +46,14 @@ public class TestWorldGenerator extends AbstractDhApiChunkWorldGenerator
 	@Override
 	public DhApiChunk generateApiChunk(int chunkPosX, int chunkPosZ, EDhApiDistantGeneratorMode generatorMode)
 	{
+		// this test is only validated for 1.18.2 and up 
+		// (and it is only needed when testing world gen overrides/API chunks, so it isn't normally needed)
+		#if MC_VER >= MC_1_18_2
 		ChunkAccess chunk = this.level.getChunk(chunkPosX, chunkPosZ);
+		ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, null, null);
 		
-		int minBuildHeight = chunk.getMinBuildHeight();
-		int maxBuildHeight = chunk.getMaxBuildHeight();
+		int minBuildHeight = chunkWrapper.getMinBuildHeight();
+		int maxBuildHeight = chunkWrapper.getMaxBuildHeight();
 		
 		DhApiChunk apiChunk = DhApiChunk.create(chunkPosX, chunkPosZ, minBuildHeight, maxBuildHeight);
 		for (int x = 0; x < 16; x++)
@@ -71,6 +76,9 @@ public class TestWorldGenerator extends AbstractDhApiChunkWorldGenerator
 			}
 		}
 		return apiChunk;
+		#else
+		return null;
+		#endif
 	}
 	
 	@Override