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 8f68e5f86..cec827b61 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 @@ -73,7 +73,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I IServerLevelWrapper serverLevelWrapper, ServerPlayerStateManager serverPlayerStateManager, boolean runRepoReliantSetup - ) + ) { if (saveStructure.getFullDataFolder(serverLevelWrapper).mkdirs()) { @@ -147,9 +147,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I @Override public boolean shouldDoWorldGen() - { - return Config.Client.Advanced.WorldGenerator.enableDistantGeneration.get() && !this.worldGenPlayerCenteringQueue.isEmpty(); - } + { return Config.Client.Advanced.WorldGenerator.enableDistantGeneration.get() && !this.worldGenPlayerCenteringQueue.isEmpty(); } @Override @Nullable @@ -170,10 +168,8 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I return new DhBlockPos2D((int) position.x, (int) position.z); } - @Override public void worldGenTick() - { - this.serverside.worldGenModule.worldGenTick(); - } + @Override + public void worldGenTick() { this.serverside.worldGenModule.worldGenTick(); } 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 56a03f798..90dc5a50d 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 @@ -325,9 +325,12 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel - //==========// - // shutdown // - //==========// + //================// + // base overrides // + //================// + + @Override + public String toString() { return "DhClientLevel{"+this.getClientLevelWrapper().getDimensionName()+"}"; } @Override public void 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 fe450a3e2..724efd61d 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 @@ -178,15 +178,6 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli // data handling // //===============// - @Override - public void close() - { - this.clientside.close(); - super.close(); - this.serverside.close(); - LOGGER.info("Closed " + this.getClass().getSimpleName() + " for " + this.getServerLevelWrapper()); - } - @Override public void onWorldGenTaskComplete(long pos) { @@ -202,4 +193,22 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli this.clientside.reloadPos(pos); } + + + //================// + // base overrides // + //================// + + @Override + public String toString() { return "DhClientServerLevel{"+this.serverLevelWrapper.getKeyedLevelDimensionName()+"}"; } + + @Override + public void close() + { + this.clientside.close(); + super.close(); + this.serverside.close(); + LOGGER.info("Closed " + this.getClass().getSimpleName() + " for " + this.getServerLevelWrapper()); + } + } 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 7178c992b..4f0bec77b 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,22 +77,23 @@ public class DhServerLevel extends AbstractDhServerLevel @Override public void addDebugMenuStringsToList(List messageList) - { - messageList.add("[${this.serverLevelWrapper.getDimensionName()}]"); - } + { messageList.add("["+this.serverLevelWrapper.getDimensionName()+"], SL"); } - //==========// - // shutdown // - //==========// + //================// + // base overrides // + //================// + + @Override + public String toString() { return "DhServerLevel{"+this.serverLevelWrapper.getKeyedLevelDimensionName()+"}"; } @Override public void close() { super.close(); this.serverside.close(); - LOGGER.info("Closed DHLevel for [${this.getLevelWrapper()}]."); + LOGGER.info("Closed DHLevel for ["+this.getLevelWrapper()+"]."); } } 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 bbdb0368c..f9c3d656c 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 @@ -129,7 +129,8 @@ public class DhClientServerWorld extends AbstractDhServerWorld