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 3e07eba12..7761a04ac 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 @@ -2,6 +2,8 @@ package com.seibel.distanthorizons.common.wrappers.level; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.coreapi.util.StringUtil; import net.minecraft.client.multiplayer.ClientLevel; public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServerKeyedClientLevel @@ -9,16 +11,22 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe /** A unique identifier (generally the level's name) for differentiating multiverse levels */ private final String serverLevelKey; + + public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey) { super(level); this.serverLevelKey = serverLevelKey; } + + @Override public String getServerLevelKey() { return this.serverLevelKey; } @Override public String getDimensionName() { return this.getServerLevelKey(); } - + @Override + public String getLevelIdString() { return this.getServerLevelKey(); } + } 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 a98ffd646..571fe8f17 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 @@ -13,7 +13,6 @@ import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos; import com.seibel.distanthorizons.core.pos.DhChunkPos; -import com.seibel.distanthorizons.core.util.ColorUtil; import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; @@ -192,6 +191,9 @@ public class ClientLevelWrapper implements IClientLevelWrapper @Override public String getDimensionName() { return this.level.dimension().location().toString(); } + @Override + public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; } + @Override public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; } @@ -317,7 +319,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper return "Wrapped{null}"; } - return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}"; + return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}"; } } 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 aa85b1742..f737f9b95 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,6 +96,9 @@ 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 EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; } @@ -199,6 +202,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper //================// @Override - public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}"; } + public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getLevelIdString() + "}"; } } diff --git a/common/src/main/resources/1_16.distanthorizons.accesswidener b/common/src/main/resources/1_16.distanthorizons.accesswidener index efb1e6a1f..a9f333d6b 100644 --- a/common/src/main/resources/1_16.distanthorizons.accesswidener +++ b/common/src/main/resources/1_16.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible field com/mojang/blaze3d/vertex/VertexBuffer vertexCount I diff --git a/common/src/main/resources/1_17.distanthorizons.accesswidener b/common/src/main/resources/1_17.distanthorizons.accesswidener index f1cc91a97..87f8e9f19 100644 --- a/common/src/main/resources/1_17.distanthorizons.accesswidener +++ b/common/src/main/resources/1_17.distanthorizons.accesswidener @@ -1,8 +1,9 @@ accessWidener v1 named - # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I diff --git a/common/src/main/resources/1_18.distanthorizons.accesswidener b/common/src/main/resources/1_18.distanthorizons.accesswidener index 1748e9607..1f4f81c02 100644 --- a/common/src/main/resources/1_18.distanthorizons.accesswidener +++ b/common/src/main/resources/1_18.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_19_2.distanthorizons.accesswidener b/common/src/main/resources/1_19_2.distanthorizons.accesswidener index bd847717b..16c8707d0 100644 --- a/common/src/main/resources/1_19_2.distanthorizons.accesswidener +++ b/common/src/main/resources/1_19_2.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_19_4.distanthorizons.accesswidener b/common/src/main/resources/1_19_4.distanthorizons.accesswidener index 91baee12e..b01b15ede 100644 --- a/common/src/main/resources/1_19_4.distanthorizons.accesswidener +++ b/common/src/main/resources/1_19_4.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_20.distanthorizons.accesswidener b/common/src/main/resources/1_20.distanthorizons.accesswidener index c0cfb2c33..913b85093 100644 --- a/common/src/main/resources/1_20.distanthorizons.accesswidener +++ b/common/src/main/resources/1_20.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel iss +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_20_2.distanthorizons.accesswidener b/common/src/main/resources/1_20_2.distanthorizons.accesswidener index c793fab68..376a23c09 100644 --- a/common/src/main/resources/1_20_2.distanthorizons.accesswidener +++ b/common/src/main/resources/1_20_2.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_20_6.distanthorizons.accesswidener b/common/src/main/resources/1_20_6.distanthorizons.accesswidener index 427617544..28f6df923 100644 --- a/common/src/main/resources/1_20_6.distanthorizons.accesswidener +++ b/common/src/main/resources/1_20_6.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D diff --git a/common/src/main/resources/1_21_3.distanthorizons.accesswidener b/common/src/main/resources/1_21_3.distanthorizons.accesswidener index 15ab6269a..aea30febe 100644 --- a/common/src/main/resources/1_21_3.distanthorizons.accesswidener +++ b/common/src/main/resources/1_21_3.distanthorizons.accesswidener @@ -2,6 +2,8 @@ accessWidener v1 named # used when determining where to save files to accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/nio/file/Path; +# used to help determine what folder a clientLevel is +accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J # used when rendering accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F diff --git a/coreSubProjects b/coreSubProjects index 534684328..f396a650b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 534684328ee5fd7dd5143093abaa140ee6ea72af +Subproject commit f396a650b4f56c5485236a56efd4ab7359322e75