From c4ea887b034fcd739e91f3d0f7c091162a8e2bd7 Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Sun, 20 Oct 2024 15:14:03 +0500
Subject: [PATCH] Move commands under `/dh`, add `/dh debug` command

---
 .../core/level/AbstractDhServerLevel.java     | 35 +++++++++++++++++++
 .../core/level/DhClientServerLevel.java       | 25 +------------
 .../core/level/DhServerLevel.java             |  5 ++-
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java
index 7598972e4..9644fcd70 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java
@@ -6,6 +6,7 @@ import com.seibel.distanthorizons.core.file.fullDatafile.FullDataSourceProviderV
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerState;
 import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerStateManager;
 import com.seibel.distanthorizons.core.network.exceptions.InvalidLevelException;
@@ -31,6 +32,7 @@ import org.apache.logging.log4j.Logger;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.*;
@@ -456,6 +458,39 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	
 	
 	
+	//===========//
+	// debugging //
+	//===========//
+	
+	@Override
+	public void addDebugMenuStringsToList(List<String> messageList)
+	{
+		// migration
+		boolean migrationErrored = this.serverside.fullDataFileHandler.getMigrationStoppedWithError();
+		if (!migrationErrored)
+		{
+			long legacyDeletionCount = this.serverside.fullDataFileHandler.getLegacyDeletionCount();
+			if (legacyDeletionCount > 0)
+			{
+				messageList.add("  Migrating - Deleting #: " + F3Screen.NUMBER_FORMAT.format(legacyDeletionCount));
+			}
+			long migrationCount = this.serverside.fullDataFileHandler.getTotalMigrationCount();
+			if (migrationCount > 0)
+			{
+				messageList.add("  Migrating - Conversion #: " + F3Screen.NUMBER_FORMAT.format(migrationCount));
+			}
+		}
+		else
+		{
+			messageList.add("  Migration Failed");
+		}
+		
+		// world gen
+		this.serverside.worldGenModule.addDebugMenuStringsToList(messageList);
+	}
+	
+	
+	
 	//=========//
 	// getters //
 	//=========//
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 ab51ed1ee..357a68521 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
@@ -136,30 +136,7 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		boolean rendering = this.clientside.isRendering();
 		messageList.add("["+dimName+"] rendering: "+(rendering ? "yes" : "no"));
 		
-		
-		// migration
-		boolean migrationErrored = this.serverside.fullDataFileHandler.getMigrationStoppedWithError();
-		if (!migrationErrored)
-		{
-			long legacyDeletionCount = this.serverside.fullDataFileHandler.getLegacyDeletionCount();
-			if (legacyDeletionCount > 0)
-			{
-				messageList.add("  Migrating - Deleting #: " + F3Screen.NUMBER_FORMAT.format(legacyDeletionCount));
-			}
-			long migrationCount = this.serverside.fullDataFileHandler.getTotalMigrationCount();
-			if (migrationCount > 0)
-			{
-				messageList.add("  Migrating - Conversion #: " + F3Screen.NUMBER_FORMAT.format(migrationCount));
-			}
-		}
-		else
-		{
-			messageList.add("  Migration Failed");
-		}
-		
-		
-		// world gen
-		this.serverside.worldGenModule.addDebugMenuStringsToList(messageList);
+		super.addDebugMenuStringsToList(messageList);
 	}
 	
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java
index bceed4786..0dc6640b4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java
@@ -77,7 +77,10 @@ public class DhServerLevel extends AbstractDhServerLevel
 	
 	@Override
 	public void addDebugMenuStringsToList(List<String> messageList)
-	{ messageList.add("["+this.serverLevelWrapper.getDimensionName()+"], SL"); }
+	{
+		messageList.add("[" + this.serverLevelWrapper.getDimensionName() + "]");
+		super.addDebugMenuStringsToList(messageList);
+	}