From 120dddf84420f656934802ee4c7e1f4cc7d9c837 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Thu, 4 Jul 2024 16:14:32 -0500
Subject: [PATCH] Fix Api client level not containing the generic renderer

---
 .../com/seibel/distanthorizons/core/level/DhClientLevel.java | 4 ++--
 .../distanthorizons/core/level/DhClientServerLevel.java      | 1 +
 .../distanthorizons/core/world/DhClientServerWorld.java      | 1 +
 .../core/wrapperInterfaces/world/IClientLevelWrapper.java    | 5 ++---
 .../core/wrapperInterfaces/world/ILevelWrapper.java          | 4 ++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
index 1f7e19a9b..b4c82336e 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java
@@ -60,7 +60,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	public DhClientLevel(AbstractSaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable File fullDataSaveDirOverride, boolean enableRendering)
 	{
 		this.levelWrapper = clientLevelWrapper;
-		this.levelWrapper.setParentClientLevel(this);
+		this.levelWrapper.setParentLevel(this);
 		this.saveStructure = saveStructure;
 		this.dataFileHandler = new RemoteFullDataSourceProvider(this, saveStructure, fullDataSaveDirOverride);
 		this.clientside = new ClientLevelModule(this);
@@ -157,7 +157,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	@Override
 	public void close()
 	{
-		this.levelWrapper.setParentClientLevel(null);
+		this.levelWrapper.setParentLevel(null);
 		this.clientside.close();
 		super.close();
 		this.dataFileHandler.close();
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
index 5d6f6ca79..af8f78cdf 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
@@ -68,6 +68,7 @@ public class DhClientServerLevel extends AbstractDhLevel implements IDhClientLev
 			LOGGER.warn("unable to create data folder.");
 		}
 		this.serverLevelWrapper = serverLevelWrapper;
+		this.serverLevelWrapper.setParentLevel(this);
 		this.serverside = new ServerLevelModule(this, saveStructure);
 		this.clientside = new ClientLevelModule(this);
 		this.createAndSetSupportingRepos(this.serverside.fullDataFileHandler.repo.databaseFile);
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
index 7b39f48e7..020f5289f 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientServerWorld.java
@@ -98,6 +98,7 @@ public class DhClientServerWorld extends AbstractDhWorld implements IDhClientWor
 				}
 				
 				level.startRenderer(clientLevelWrapper);
+				clientLevelWrapper.setParentLevel(level);
 				return level;
 			});
 		}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java
index 17a49bc82..e21cf6a8e 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IClientLevelWrapper.java
@@ -19,7 +19,8 @@
 
 package com.seibel.distanthorizons.core.wrapperInterfaces.world;
 
-import com.seibel.distanthorizons.core.level.DhClientLevel;
+import com.seibel.distanthorizons.core.level.IDhClientLevel;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import org.jetbrains.annotations.Nullable;
@@ -42,6 +43,4 @@ public interface IClientLevelWrapper extends ILevelWrapper
 	@Nullable
 	IBiomeWrapper getPlainsBiomeWrapper();
 	
-	void setParentClientLevel(DhClientLevel parentClientLevel);
-	
 }
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java
index 127ff04fa..ac52dd9b2 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/ILevelWrapper.java
@@ -21,6 +21,7 @@ package com.seibel.distanthorizons.core.wrapperInterfaces.world;
 
 import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper;
 import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -64,4 +65,7 @@ public interface ILevelWrapper extends IDhApiLevelWrapper, IBindable
 	/** Fired when the level is being unloaded. Doesn't unload the level. */
 	void onUnload();
 	
+	@Deprecated
+	void setParentLevel(IDhLevel parentLevel);
+	
 }