1.21.11 by Sheepy-9 by Gjum · Pull Request #114 · CivPlatform/map-sync

Gjum · 2026-03-07T15:09:06Z

No description provided.

This is required by Architectury Loom 1.7+

There are some *changes* changes, such as the removal of the "handleBlockBreakAck" packet handler as the packet no longer contains the block position. It probably doesn't matter though as block updates should be handled by the other packets. Another thing is the TODO now in the Cartography class as I am not certain that the behaviour is the same. May need some testing. Also removed the "xaeros-minimap" dependency as it's not used. There's a problem with the Forge client that I haven't been able to fix. It errors saying that the same package is being exported: "Modules MapSync.dev and generated_a20f2c1 export package gjum.minecraft.mapsync.common.data to module mixin.synthetic". No idea how to fix. Tempted to just switch to NeoForge.

- Packet size 2^15 -> 2^20 / 21 (~1MB) WORKING with VoxelMap

Updated README to include new features and clarify usage instructions.

Gjum · 2026-03-07T15:18:18Z

server/src/server.ts


    /** prevent Out of Memory when client sends a large packet */
-    maxFrameSize = 2 ** 15;
+    maxFrameSize = 2 ** 21;


does this match the packet field? it used to be a 16 integer, not sure what it is now

Received packets were too big and I had a reasoning for them not to match that I don't remember, so it probably should be changed by someone with more knowledge about networking

While it may be somewhat outside the scope of a 1.21.11 update, it's something I aimed to fix with #110

Gjum · 2026-03-07T15:25:06Z

server/package.json

        "format": "prettier -w .",
        "test": "true",
-        "start": "node -r source-map-support/register dist/main.js",
+        "start": "node --security-revert=CVE-2023-46809 -r source-map-support/register dist/main.js",


could you add a comment why this is necessary?
https://www.cve.news/cve-2023-46809/

I believe this is also highly dependent on the version of nodejs: iirc newer versions of nodejs will not revert this regardless of setting. This PR does update what versions of node the CI and docker uses, there's no engine restriction within this package.json itself for those who just clone and run.

It was a quick fix-up in the beginning and got left in due to lack of networking skills

mod/common/src/main/java/gjum/minecraft/mapsync/common/net/SyncClient.java

Protonull · 2026-03-07T18:52:10Z

.vscode/settings.json

Shouldn't add IDE-specific settings files

Sorry, I've been learning how to use git for quite a while now, but I still have fights with it

I recommend using https://gitignore.io/ to create a gitignore file for your operating system and preferred IDEs, then setting this file as your global gitignore: https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreexcludesFile

Protonull · 2026-03-07T18:53:41Z

Many of the changes here also introduce changes to indentation. Maybe add an .editorconfig file?

Protonull · 2026-03-07T19:00:08Z

mod/common/src/main/java/gjum/minecraft/mapsync/common/integration/JourneyMapHelper.java

 	public static boolean isJourneyMapNotAvailable;

 	static {
 		try {
-			Class.forName("journeymap.client.JourneymapClient");
+			Class<?> jmClient = Class.forName("journeymap.client.JourneymapClient");
+			String version = null;
 			try {
-				// check it's a recent version
-				Class.forName("journeymap.client.model.NBTChunkMD");
-				isJourneyMapNotAvailable = false;
-			} catch (NoClassDefFoundError | ClassNotFoundException ignored2) {
-				isJourneyMapNotAvailable = true;
-				System.err.println("Please update JourneyMap to at least 5.8.3");
-			}
+                // Try to get a version field or method
+                try {
+                    version = (String) jmClient.getDeclaredField("FULL_VERSION").get(null);
+                } catch (NoSuchFieldException e) {  }
+            } catch (Exception ignored) {}
+
+			if (version != null) {
+                // Compare version strings as needed, e.g., "6.0.0"
+                if (!Pattern.compile("6\\.\\d+\\.\\d+").matcher(version).find()) {
+                    isJourneyMapNotAvailable = true;
+                    System.err.println("Please update JourneyMap to at least 6.0.0 (found " + version + ")");
+                } else {
+                    isJourneyMapNotAvailable = false;
+                }
+            }


This can be replaced with a call to the modloader to check if journeymap is loaded: the class check for NBTChunkMD seems to be because it was a new class in a new version. That was on 1.18.2. Now this is 1.21.11. Such a check is no longer necessary.

Protonull · 2026-03-07T19:00:40Z

mod/common/src/main/java/gjum/minecraft/mapsync/common/integration/XaerosWorldMapHelper.java

+
+	static {
+		try {
+            // TODO: update when found needed


This was a self note
Forgot to delete after figuring out how to find the right class

Protonull · 2026-03-07T19:02:38Z

mod/common/src/main/java/gjum/minecraft/mapsync/common/net/SyncClient.java

 					ch.pipeline().addLast(
 							new LengthFieldPrepender(4),
-							new LengthFieldBasedFrameDecoder(1 << 15, 0, 4, 0, 4),
+							new LengthFieldBasedFrameDecoder(1 << 20, 0, 4, 0, 4),


You've set the frame size here to be 2^20, but in server.ts it's now 2^21.

Protonull · 2026-03-07T19:06:35Z

mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java

 			InputConstants.Type.KEYSYM,
 			GLFW.GLFW_KEY_COMMA,
-			"category.map-sync"
+            CATEGORY


You'll need to update the lang file. I made the same mistake: https://codeberg.org/netherwart/CivianMods/commit/56aa0e8adc520264428f3a5a79ba073ef9c97fd2

Protonull · 2026-03-07T19:08:37Z

mod/forge/build.gradle

 	runtimeClasspath.extendsFrom common
 	developmentForge.extendsFrom common
+
+	// Weird fix: https://discord.com/channels/792699517631594506/792701725106634783/1272848116864909314


Is this still necessary?

Protonull · 2026-03-07T19:10:09Z

server/src/main.ts

                world: pkt.world,
                chunk_x: req.chunkX,
-                chunk_z: req.chunkX,
+                chunk_z: req.chunkZ,


Caused the whole sync to sync every chunk into a diagonal line hehe

Protonull · 2026-03-07T19:14:38Z

server/pnpm-lock.yaml

Not against anyone using pnpm, but now there are two lockfiles (yarn.lock and pnpm-lock.yaml), which is bad.

I'd support switching to pnpm fully. (Or to bun ...)

Bun would be preferable, but Bun has also completely rejects that CVE revert: you'd need to switch to a different encryption algorithm or bite the bullet and switch to websockets :P (see: #106)

npm just straight up didn't work, so I tried pnpm
Haven't noticed that it got added to version control
At first I wasn't planning on submitting for a pull request, so sorry for it being a bit messy
Learning is a journey :)

mod/gradle.properties

Protonull and others added 25 commits October 16, 2024 07:15

Update Gradle to 8.10.2

ec718a2

This is required by Architectury Loom 1.7+

Use Java 21 in build-mod workflow

cb94c1c

Merge pull request CivPlatform#104 from Protonull/1.21.1

0f6dfe6

versions adjusted + forge disabled

69a0440

Loads on 1.21.11, TODO? ModMenu

a493f26

GUI fix, docker fix, can connect but doesnt work, list command

0b2cd64

- .location() to .registry() was wrong -> .identifier()

fca9418

- Packet size 2^15 -> 2^20 / 21 (~1MB) WORKING with VoxelMap

JourneyMap compat + Testing tools

aadeff8

Basic rendering, TODO: height, (biome)

a9ab2f7

GUI text fixed

ba82abe

Disconnect Button base

4139743

Merging gui text fix

3764b95

Cracked support

d2b4076

Server catchupRequest fixed

40732a2

Server Force-send, client purge added

3fe9c6e

Merge branch '1.21.11' into 1.21.11-xaeros

df7120d

Transparency fix

35fccde

Simplified, Biome fix | chunkborder artifacts

cc8ed4d

Text+Button position+rendering

1499130

Merge branch '1.21.11-GUIFix' into 1.21.11

c4ed5c5

Merge branch '1.21.11-xaeros' into 1.21.11

00214cb

Auth config

228e7ad

README update

1cf398d

Updated README to include new features and clarify usage instructions.

Icon + version updated + author

d45cfed

Gjum commented Mar 7, 2026

View reviewed changes

Gjum merged commit d45cfed into CivPlatform:main Mar 7, 2026
0 of 3 checks passed

Gjum commented Mar 7, 2026

View reviewed changes

mod/common/src/main/java/gjum/minecraft/mapsync/common/net/SyncClient.java Show resolved Hide resolved

Gjum mentioned this pull request Mar 7, 2026

1.21.11 sheepy CI fix #115

Merged

This was referenced Mar 7, 2026

xaero world map integration #13

Closed

Ditch Forge support? #112

Closed

Protonull reviewed Mar 7, 2026

View reviewed changes

Sheepy-9 reviewed Mar 8, 2026

View reviewed changes

mod/gradle.properties Show resolved Hide resolved

Conversation

Gjum commented Mar 7, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Protonull commented Mar 7, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Protonull Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sheepy-9 Mar 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Protonull Mar 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Protonull Mar 7, 2026 •

edited

Loading

Sheepy-9 Mar 8, 2026 •

edited

Loading

Protonull Mar 7, 2026 •

edited

Loading