From f94b6dbaa5ea4c5f142e4663dc46dd6e596cba06 Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Thu, 14 Nov 2024 15:23:57 +0500
Subject: [PATCH 1/3] Replace truncating the hashed seed with encoding it into
 base32

---
 build.gradle                                                  | 3 ++-
 .../common/wrappers/world/ClientLevelWrapper.java             | 4 ++--
 .../common/wrappers/world/ServerLevelWrapper.java             | 2 +-
 coreSubProjects                                               | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index bd7301de9..7fb9a92e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -188,7 +188,8 @@ subprojects { p ->
         {
             // the standalone core jar needs logging shaded otherwise it won't run
             forgeShadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-            forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")   
+            forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+            forgeShadowMe("commons-codec:commons-codec:1.16.0")
         }
         else
         {
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 aa8f6de8a..f14a4ef06 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
@@ -197,10 +197,10 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public String getDimensionName() { return this.level.dimension().location().toString(); }
 	
 	@Override
-	public long getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; }
+	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
 	
 	@Override
-	public String getDhIdentifier() { return this.getHashedSeed() + "@" + this.getDimensionName(); }
+	public String getDhIdentifier() { return this.getHashedSeedEncoded() + "@" + this.getDimensionName(); }
 	
 	@Override
 	public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
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 3c7348ec4..8cd772bf5 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
@@ -97,7 +97,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	public String getDimensionName() { return this.level.dimension().location().toString(); }
 	
 	@Override
-	public long getHashedSeed() { return (int) this.level.getBiomeManager().biomeZoomSeed; }
+	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
 	
 	@Override
 	public String getDhIdentifier() { return this.getDimensionName(); }
diff --git a/coreSubProjects b/coreSubProjects
index 127ec81ad..5448b8890 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 127ec81adeba783cb5a90c56add2422b65ad39b3
+Subproject commit 5448b8890d1d079f56867ec899b392bf4e9866ca

From c232b64f2482606571cc479961ea152c99079d7e Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Thu, 14 Nov 2024 15:52:46 +0500
Subject: [PATCH 2/3] Add a comment to #pluginMessageReceived methods

---
 coreSubProjects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coreSubProjects b/coreSubProjects
index 5448b8890..f92a1ccc2 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 5448b8890d1d079f56867ec899b392bf4e9866ca
+Subproject commit f92a1ccc27cb6ffaca70431a27120a20148dbafa

From 5fe605540de00ee809dbd43c37694f7d51f18ffe Mon Sep 17 00:00:00 2001
From: s809 <43530948+s809@users.noreply.github.com>
Date: Fri, 15 Nov 2024 09:33:10 +0500
Subject: [PATCH 3/3] Replace Apache's base32 with guava

---
 build.gradle    | 1 -
 coreSubProjects | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7fb9a92e7..325ddf3fd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -189,7 +189,6 @@ subprojects { p ->
             // the standalone core jar needs logging shaded otherwise it won't run
             forgeShadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
             forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
-            forgeShadowMe("commons-codec:commons-codec:1.16.0")
         }
         else
         {
diff --git a/coreSubProjects b/coreSubProjects
index f92a1ccc2..f5fc0004d 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit f92a1ccc27cb6ffaca70431a27120a20148dbafa
+Subproject commit f5fc0004d5bea13a9cc29b951e433a1b6115e1bb