From a37a2c9c9d32b746f6eb434afd673a0a1d5c17ff Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 28 Sep 2024 14:31:41 -0500
Subject: [PATCH] Capitalize EWorldEnvironment variables

---
 .../file/fullDatafile/FullDataSourceProviderV2.java  |  2 +-
 .../core/file/structure/LocalSaveStructure.java      |  2 +-
 .../network/messages/AbstractTrackableMessage.java   |  2 +-
 .../core/world/DhClientServerWorld.java              |  3 +--
 .../distanthorizons/core/world/DhClientWorld.java    |  3 +--
 .../distanthorizons/core/world/DhServerWorld.java    |  5 +----
 .../core/world/EWorldEnvironment.java                | 12 ++++++------
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java
index 1d130a77c..86457c267 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/FullDataSourceProviderV2.java
@@ -136,7 +136,7 @@ public class FullDataSourceProviderV2
 		this.migrationThreadPool.execute(this::convertLegacyDataSources);
 		
 		// update propagation doesn't need to be run on the server since only the highest detail level is needed
-		if (SharedApi.getEnvironment() != EWorldEnvironment.Server_Only)
+		if (SharedApi.getEnvironment() != EWorldEnvironment.SERVER_ONLY)
 		{
 			this.updateQueueProcessor = ThreadUtil.makeSingleThreadPool("Parent Update Queue ["+dimensionName+"]");
 			this.updateQueueProcessor.execute(this::runUpdateQueue);
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java
index 496f85aa2..9889f7e73 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/file/structure/LocalSaveStructure.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger;
 import java.io.File;
 
 /**
- * Designed for {@link EWorldEnvironment#Client_Server} & {@link EWorldEnvironment#Server_Only} environments.
+ * Designed for {@link EWorldEnvironment#CLIENT_SERVER} & {@link EWorldEnvironment#SERVER_ONLY} environments.
  *
  * @version 2022-12-17
  */
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/AbstractTrackableMessage.java b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/AbstractTrackableMessage.java
index f41bd813c..5c6c7d8e3 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/network/messages/AbstractTrackableMessage.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/network/messages/AbstractTrackableMessage.java
@@ -72,7 +72,7 @@ public abstract class AbstractTrackableMessage extends AbstractNetworkMessage
 		// message/Request ID written as the least significant bits
 		long id = LAST_MESSAGE_ID_REF.getAndIncrement();
 		// write requesting side at bit 32
-		id |= ((worldEnvironment == EWorldEnvironment.Server_Only) ? 1 : 0) << 31;
+		id |= ((worldEnvironment == EWorldEnvironment.SERVER_ONLY) ? 1 : 0) << 31;
 		this.futureId = id;
 	}
 	
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 0696d030a..714c94b76 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
@@ -28,7 +28,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -49,7 +48,7 @@ public class DhClientServerWorld extends AbstractDhServerWorld<DhClientServerLev
 	
 	public DhClientServerWorld()
 	{
-		super(EWorldEnvironment.Client_Server);
+		super(EWorldEnvironment.CLIENT_SERVER);
 		LOGGER.info("Started DhWorld of type " + this.environment);
 	}
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
index 6b554ecd4..a6ff2f868 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java
@@ -29,7 +29,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapp
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
@@ -51,7 +50,7 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
 	
 	public DhClientWorld()
 	{
-		super(EWorldEnvironment.Client_Only);
+		super(EWorldEnvironment.CLIENT_ONLY);
 		
 		this.saveStructure = new ClientOnlySaveStructure();
 		this.levels = new ConcurrentHashMap<>();
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java b/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java
index cf2fda4c6..5dfd51da4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java
@@ -20,13 +20,10 @@
 package com.seibel.distanthorizons.core.world;
 
 import com.seibel.distanthorizons.core.level.DhServerLevel;
-import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.File;
-
 public class DhServerWorld extends AbstractDhServerWorld<DhServerLevel>
 {
 	//==============//
@@ -35,7 +32,7 @@ public class DhServerWorld extends AbstractDhServerWorld<DhServerLevel>
 	
 	public DhServerWorld()
 	{
-		super(EWorldEnvironment.Server_Only);
+		super(EWorldEnvironment.SERVER_ONLY);
 		LOGGER.info("Started ["+DhServerWorld.class.getSimpleName()+"] of type ["+this.environment+"].");
 	}
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java b/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java
index f96e29cb5..26974525d 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/world/EWorldEnvironment.java
@@ -20,13 +20,13 @@
 package com.seibel.distanthorizons.core.world;
 
 /**
- * Client_Only,
- * Client_Server,
- * Server_Only
+ * CLIENT_ONLY, <br>
+ * CLIENT_SERVER, <br>
+ * SERVER_ONLY <br>
  */
 public enum EWorldEnvironment
 {
-	Client_Only,
-	Client_Server,
-	Server_Only
+	CLIENT_ONLY,
+	CLIENT_SERVER,
+	SERVER_ONLY
 }