wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move commands under /dh, add /dh debug command

Browse Source
This commit is contained in:
s809
2024-10-20 15:14:03 +05:00
parent d12e797732
commit c4ea887b03
3 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java
+35
View File
@@ -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 //
//=========//
core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java
+1 -24
View File
@@ -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);
}
core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java
+4 -1
View File
@@ -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);
}