From 70039f5c26624a1a8eea705c182575096611487b Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:39:00 -0800 Subject: [PATCH 1/2] always reset viewed dimension on world unload fixes bug in base mods where viewed dim is not reset on dimension changes --- .../java/xaeroplus/mixin/client/MixinMapProcessor.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/xaeroplus/mixin/client/MixinMapProcessor.java b/common/src/main/java/xaeroplus/mixin/client/MixinMapProcessor.java index aad83808..378539a5 100644 --- a/common/src/main/java/xaeroplus/mixin/client/MixinMapProcessor.java +++ b/common/src/main/java/xaeroplus/mixin/client/MixinMapProcessor.java @@ -58,6 +58,7 @@ public abstract class MixinMapProcessor implements CustomMapProcessor { } @Shadow public abstract String getDimensionName(final ResourceKey id); + @Shadow private MapWorld mapWorld; @Inject(method = "getMainId(ILnet/minecraft/client/multiplayer/ClientPacketListener;)Ljava/lang/String;", at = @At("HEAD"), cancellable = true, @@ -75,6 +76,15 @@ public void getDimensionName(final ResourceKey id, final CallbackInfoRetu } } + @Inject(method = "onWorldUnload", at = @At("HEAD")) + public void resetCustomDimOnWorldUnload(final CallbackInfo ci) { + // Fixes a bug in base mods where if a custom viewed dimension is set, + // and the player changes dimensions, the same custom viewed dimension will persist + if (this.mapWorld != null) { + this.mapWorld.setCustomDimensionId(null); + } + } + @Redirect(method = "run", at = @At( value = "INVOKE", target = "Ljava/lang/Thread;sleep(J)V" From b54bfe68f5fcb38e85a6ca252060b5fde45dd6e9 Mon Sep 17 00:00:00 2001 From: rfresh2 <89827146+rfresh2@users.noreply.github.com> Date: Thu, 2 Jan 2025 15:39:20 -0800 Subject: [PATCH 2/2] bump version --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1baa2c5a..91c079a0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } } gradle.extra.apply { - set("mod_version", "2.25") + set("mod_version", "2.25.1") set("minecraft_version", "1.20.1") set("parchment_version", "2023.09.03") set("worldmap_version_fabric", "1.39.2")