From 76b3e81cb1f192d91e4faf982a2317926bf1e624 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 14 Dec 2024 14:05:36 -0600
Subject: [PATCH] rename generation mode FULL -> INTERNAL_SERVER

---
 .../enums/worldGeneration/EDhApiDistantGeneratorMode.java    | 4 ++--
 .../java/com/seibel/distanthorizons/core/config/Config.java  | 5 ++---
 .../distanthorizons/core/generation/BatchGenerator.java      | 4 +---
 .../core/wrapperInterfaces/chunk/IChunkWrapper.java          | 1 -
 .../main/resources/assets/distanthorizons/lang/en_us.json    | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java
index bea57ff9a..e0f5bde06 100644
--- a/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java
+++ b/api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java
@@ -79,12 +79,12 @@ public enum EDhApiDistantGeneratorMode
 	/**
 	 * Ask the server to generate/load each chunk.
 	 * This is the most compatible and will generate structures correctly, 
-	 * but will cause server/simulation lag. <br><br>
+	 * but may cause server/simulation lag. <br><br>
 	 * 
 	 * Unlike other modes this option DOES save generated chunks to
 	 * Minecraft's region files.
 	 */
-	FULL((byte) 7);
+	INTERNAL_SERVER((byte) 6);
 	
 	
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
index b8cce9b40..74a2dc2ad 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java
@@ -1170,13 +1170,12 @@ public class Config
 							+ "Generate everything except structures. \n"
 							+ "WARNING: This may cause world generator bugs or instability when paired with certain world generator mods. \n"
 							+ "\n"
-							+ EDhApiDistantGeneratorMode.FULL + " \n"
+							+ EDhApiDistantGeneratorMode.INTERNAL_SERVER + " \n"
 							+ "Ask the local server to generate/load each chunk. \n"
 							+ "This is the most compatible and will generate structures correctly, \n"
-							+ "but will cause server/simulation lag. \n"
+							+ "but may cause server/simulation lag. \n"
 							+ "Note: unlike other modes this option DOES save generated chunks to \n"
 							+ "Minecraft's region files. \n"
-							+ "- Slow (15-50 ms, with spikes up to 200 ms) \n"
 							+ "")
 					.build();
 			
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java
index 0dbecf6bc..95de08a1d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java
@@ -26,9 +26,7 @@ import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
-import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
@@ -111,7 +109,7 @@ public class BatchGenerator implements IDhApiWorldGenerator
 			case FEATURES:
 				targetStep = EDhApiWorldGenerationStep.FEATURES;
 				break;
-			case FULL:
+			case INTERNAL_SERVER:
 				targetStep = EDhApiWorldGenerationStep.LIGHT;  // TODO using something other than LIGHT would be good for clarity
 				break;
 		}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
index 0b81e7096..ef788b796 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
@@ -109,7 +109,6 @@ public interface IChunkWrapper extends IBindable
 				&& blockPos.z >= this.getMinBlockZ() && blockPos.z <= this.getMaxBlockZ());
 	}
 	
-	boolean doNearbyChunksExist();
 	String toString();
 	
 	
diff --git a/core/src/main/resources/assets/distanthorizons/lang/en_us.json b/core/src/main/resources/assets/distanthorizons/lang/en_us.json
index 178c9d66c..356e99bb1 100644
--- a/core/src/main/resources/assets/distanthorizons/lang/en_us.json
+++ b/core/src/main/resources/assets/distanthorizons/lang/en_us.json
@@ -879,8 +879,8 @@
     "Surface",
   "distanthorizons.config.enum.EDhApiDistantGeneratorMode.FEATURES":
     "Features",
-  "distanthorizons.config.enum.EDhApiDistantGeneratorMode.FULL":
-    "Full",
+  "distanthorizons.config.enum.EDhApiDistantGeneratorMode.INTERNAL_SERVER":
+    "Internal Server",
     
   "distanthorizons.config.enum.EDhApiDataCompressionMode.UNCOMPRESSED":
     "Uncompressed",