From c46c056980059312b197ae6bba7c068f9191f0ec Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sat, 16 Aug 2025 20:59:34 +0500 Subject: [PATCH 1/2] Add a server keys feature --- .../common/wrappers/level/KeyedClientLevelManager.java | 4 ++-- .../common/wrappers/level/ServerKeyedClientLevel.java | 10 +++++++--- coreSubProjects | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) 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 cb78384f6..a8742e0df 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 ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey); + IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((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/ServerKeyedClientLevel.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java index 811762b26..cac79e54d 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,24 +2,28 @@ 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 { + /** 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; - public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey) + public ServerKeyedClientLevel(ClientLevel level, String serverKey, String serverLevelKey) { super(level); + this.serverKey = serverKey; this.serverLevelKey = serverLevelKey; } + @Override + public String getServerKey() { return this.serverKey; } @Override public String getServerLevelKey() { return this.serverLevelKey; } diff --git a/coreSubProjects b/coreSubProjects index 674fc30e7..fb5e15a2f 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 674fc30e7729d0dbe5e93b7681c3ab47cc8c813d +Subproject commit fb5e15a2f1df18118888996cdb399c99fb287624 From c84ee721e354383ce30cdb706ee960f035dc3332 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Sat, 16 Aug 2025 21:01:49 +0500 Subject: [PATCH 2/2] Bump protocol version --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index fb5e15a2f..034ec7d65 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit fb5e15a2f1df18118888996cdb399c99fb287624 +Subproject commit 034ec7d656aa2ac9a1d5c00798b506046d11b179