diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java index 7761a04ac..811762b26 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java @@ -25,8 +25,6 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe public String getServerLevelKey() { return this.serverLevelKey; } @Override - public String getDimensionName() { return this.getServerLevelKey(); } - @Override - public String getLevelIdString() { return this.getServerLevelKey(); } + public String getDhIdentifier() { return this.getServerLevelKey(); } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index 4ed15391d..ca575cf14 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -334,9 +334,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra @Override public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); } - @Override - public boolean isWorldNew() { throw new UnsupportedOperationException("Not Implemented"); } - @Override public int getPlayerCount() { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java index 3eb8409fa..32d9532ac 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java @@ -43,10 +43,6 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper #endif } - @Override - public boolean isWorldNew() - { return this.dedicatedServer.getWorldData().overworldData().isInitialized(); } - @Override public int getPlayerCount() { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java index adc52d94a..3fef06f82 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java @@ -39,7 +39,6 @@ import java.util.concurrent.ConcurrentHashMap; import net.minecraft.world.level.chunk.ChunkStatus; #else import net.minecraft.world.level.chunk.status.ChunkStatus; -import com.seibel.distanthorizons.core.util.ColorUtil; #endif public class ClientLevelWrapper implements IClientLevelWrapper @@ -187,13 +186,16 @@ public class ClientLevelWrapper implements IClientLevelWrapper @Override public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); } - + @Override public String getDimensionName() { return this.level.dimension().location().toString(); } @Override - public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; } + public int getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; } + + @Override + public String getDhIdentifier() { return this.getHashedSeed() + "@" + this.getDimensionName(); } @Override public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; } @@ -320,7 +322,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper return "Wrapped{null}"; } - return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}"; + return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}"; } } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java index f737f9b95..2e9801db4 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java @@ -96,8 +96,11 @@ public class ServerLevelWrapper implements IServerLevelWrapper @Override public String getDimensionName() { return this.level.dimension().location().toString(); } - @Override - public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; } + @Override + public int getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; } + + @Override + public String getDhIdentifier() { return this.getDimensionName(); } @Override public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; } @@ -202,6 +205,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper //================// @Override - public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}"; } + public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}"; } } diff --git a/coreSubProjects b/coreSubProjects index 52452e356..bd264086e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 52452e356dc995837b25557185d8ed48929e3b3d +Subproject commit bd264086e314415faa6ea7dc81a540790bde3ab6