diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java index 1198885cd..0f0ecc4c3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java @@ -36,9 +36,9 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager public IServerKeyedClientLevel getServerKeyedLevel() { return this.serverKeyedLevel; } @Override - public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey) + public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String serverKey, String levelKey) { - IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevelWrapper((ClientLevel) clientLevel.getWrappedMcObject(), levelKey); + IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevelWrapper((ClientLevel) clientLevel.getWrappedMcObject(), serverKey, levelKey); this.serverKeyedLevel = keyedLevel; this.enabled = true; return keyedLevel; diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevelWrapper.java index a6d15657f..f6c661be3 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevelWrapper.java @@ -6,6 +6,9 @@ import net.minecraft.client.multiplayer.ClientLevel; public class ServerKeyedClientLevelWrapper extends ClientLevelWrapper implements IServerKeyedClientLevel { + /** Returns the folder name the server wants the client to use. */ + private final String serverKey; + /** A unique identifier (generally the level's name) for differentiating multiverse levels */ private final String serverLevelKey; @@ -15,13 +18,16 @@ public class ServerKeyedClientLevelWrapper extends ClientLevelWrapper implements // constructor // //=============// - public ServerKeyedClientLevelWrapper(ClientLevel level, String serverLevelKey) + public ServerKeyedClientLevelWrapper(ClientLevel level, String serverKey, String serverLevelKey) { super(level); + this.serverKey = serverKey; this.serverLevelKey = serverLevelKey; } + @Override + public String getServerKey() { return this.serverKey; } //======================// // level identification // diff --git a/coreSubProjects b/coreSubProjects index f7ece2b02..07e3091d1 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit f7ece2b02e7e55ee02ce1e2878671d49ec8dcda5 +Subproject commit 07e3091d13f7ca7ccf3aa93dd1aed1e672e48afb