Merge branch '1.20.4' into 1.20.6

# Conflicts:
#	settings.gradle.kts

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<Level> 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<Level> 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"

settings.gradle.kts

@@ -9,7 +9,7 @@ pluginManagement {
 	}
 }
 gradle.extra.apply {
-	set("mod_version", "2.25")
+	set("mod_version", "2.25.1")
 	set("minecraft_version", "1.20.6")
 	set("parchment_version", "2024.06.16")
     set("worldmap_version_fabric", "1.39.2")