fix: when using mods on servers via BungeeCord, and the JSON files ar…

…e not loaded / saved in between worlds.

gradle.properties

@@ -9,7 +9,7 @@ author = masa
 mod_file_name = malilib-fabric
 
 # Current mod version
-mod_version = 0.20.0
+mod_version = 0.20.2
 
 # Minecraft, Fabric Loader and API and mappings versions
 minecraft_version_out = 1.21

src/main/java/fi/dy/masa/malilib/mixin/MixinMinecraftClient.java

@@ -2,6 +2,7 @@
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -25,6 +26,7 @@ public abstract class MixinMinecraftClient
     @Shadow
     public ClientWorld world;
 
+    @Unique
     private ClientWorld worldBefore;
 
     @Inject(method = "<init>(Lnet/minecraft/client/RunArgs;)V", at = @At("RETURN"))
@@ -72,6 +74,20 @@ private void onLoadWorldPost(ClientWorld worldClientIn, DownloadingTerrainScreen
         }
     }
 
+    @Inject(method = "enterReconfiguration(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("HEAD"))
+    private void onReconfigurationPre(Screen screen, CallbackInfo ci)
+    {
+        this.worldBefore = this.world;
+        ((WorldLoadHandler) WorldLoadHandler.getInstance()).onWorldLoadPre(this.worldBefore, null, (MinecraftClient)(Object) this);
+    }
+
+    @Inject(method = "enterReconfiguration(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("RETURN"))
+    private void onReconfigurationPost(Screen screen, CallbackInfo ci)
+    {
+        ((WorldLoadHandler) WorldLoadHandler.getInstance()).onWorldLoadPost(this.worldBefore, null, (MinecraftClient)(Object) this);
+        this.worldBefore = null;
+    }
+
     @Inject(method = "disconnect(Lnet/minecraft/client/gui/screen/Screen;Z)V", at = @At("HEAD"))
     private void onDisconnectPre(Screen screen, boolean bl, CallbackInfo ci)
     {