sync 1.4.1 to 1.21.1

common/src/main/java/com/iafenvoy/resourceworld/MixinCache.java

@@ -1,10 +1,16 @@
 package com.iafenvoy.resourceworld;
 
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+
 public final class MixinCache {
     @Nullable
     public static RegistryKey<World> CURRENT_TICKING_WORLD;
+    public static final List<Consumer<MinecraftServer>> WORLD_CHANGE_CALLBACKS = new CopyOnWriteArrayList<>();
 }

common/src/main/java/com/iafenvoy/resourceworld/accessor/MinecraftServerAccessor.java

@@ -1,14 +1,11 @@
 package com.iafenvoy.resourceworld.accessor;
 
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import java.util.Map;
-
 public interface MinecraftServerAccessor {
     boolean resource_world$createWorld(RegistryKey<World> key, Identifier worldOption);
 
-    Map<RegistryKey<World>, ServerWorld> resource_world$getWorlds();
+    void resource_world$removeWorld(RegistryKey<World> key);
 }

common/src/main/java/com/iafenvoy/resourceworld/data/ResourceWorldHelper.java

@@ -70,7 +70,7 @@ public static void deleteWorld(MinecraftServer server, ServerWorld world) {
         WorldConfig.remove(world.getRegistryKey());
         CompletableFuture.runAsync(() -> {
             unloadAndDelete(world);
-            server.execute(() -> ((MinecraftServerAccessor) server).resource_world$getWorlds().remove(world.getRegistryKey()));
+            server.execute(() -> ((MinecraftServerAccessor) server).resource_world$removeWorld(world.getRegistryKey()));
         });
     }
 
@@ -128,7 +128,7 @@ private static void unloadAndDelete(ServerWorld world) {
 
     private static void unloadWorld(ServerWorld world) {
         try {
-            ((MinecraftServerAccessor) world.getServer()).resource_world$getWorlds().remove(world.getRegistryKey());
+            ((MinecraftServerAccessor) world.getServer()).resource_world$removeWorld(world.getRegistryKey());
         } catch (Exception e) {
             printError("Failed to close world.", world.getRegistryKey(), e);
         }

common/src/main/java/com/iafenvoy/resourceworld/mixin/MinecraftServerMixin.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.iafenvoy.resourceworld.ResourceWorld;
+import com.iafenvoy.resourceworld.config.WorldConfig;
 import com.iafenvoy.resourceworld.accessor.MinecraftServerAccessor;
 import com.iafenvoy.resourceworld.config.WorldConfig;
 import net.minecraft.registry.*;
@@ -16,7 +17,6 @@
 import net.minecraft.world.World;
 import net.minecraft.world.biome.source.BiomeAccess;
 import net.minecraft.world.border.WorldBorder;
-import net.minecraft.world.border.WorldBorderListener;
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.gen.GeneratorOptions;
 import net.minecraft.world.level.ServerWorldProperties;
@@ -73,11 +73,6 @@ private void onServerStop(CallbackInfo ci) {
         WorldConfig.stop();
     }
 
-    @Override
-    public Map<RegistryKey<World>, ServerWorld> resource_world$getWorlds() {
-        return this.worlds;
-    }
-
     @SuppressWarnings("all")
     @Override
     public boolean resource_world$createWorld(RegistryKey<World> key, Identifier worldOption) {
@@ -93,13 +88,19 @@ private void onServerStop(CallbackInfo ci) {
             WorldBorder worldBorder = serverWorld.getWorldBorder();
             RandomSequencesState randomSequencesState = serverWorld.getRandomSequences();
             UnmodifiableLevelProperties unmodifiableLevelProperties = new UnmodifiableLevelProperties(this.saveProperties, serverWorldProperties);
-            ServerWorld serverWorld2 = new ServerWorld((MinecraftServer) (Object) this, this.workerExecutor, this.session, unmodifiableLevelProperties, key, registry.get(worldOption), WorldGenerationProgressTracker.create(16), bl, m, ImmutableList.of(), false, randomSequencesState);
-            worldBorder.addListener(new WorldBorderListener.WorldBorderSyncer(serverWorld2.getWorldBorder()));
+            ServerWorld serverWorld2 = new ServerWorld((MinecraftServer) (Object) this, this.workerExecutor, this.session, unmodifiableLevelProperties, key, registry.get(worldOption), new WorldGenerationProgressTracker(16), bl, m, ImmutableList.of(), false, randomSequencesState);
             this.worlds.put(key, serverWorld2);
+            MixinCache.WORLD_CHANGE_CALLBACKS.forEach(x -> x.accept((MinecraftServer) (Object) this));
             return true;
         } catch (Exception e) {
             ResourceWorld.LOGGER.error("Failed to create world", e);
             return false;
         }
     }
+
+    @Override
+    public void resource_world$removeWorld(RegistryKey<World> key) {
+        this.worlds.remove(key);
+        MixinCache.WORLD_CHANGE_CALLBACKS.forEach(x -> x.accept((MinecraftServer) (Object) this));
+    }
 }

common/src/main/resources/resource_world.mixins.json

@@ -9,7 +9,6 @@
     "CommandManagerMixin",
     "DifficultyCommandMixin",
     "GameRuleCommandMixin",
-    "LevelPropertiesMixin",
     "MinecraftServerMixin",
     "CommonPlayerSpawnInfoMixin",
     "ServerWorldMixin",

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 # Mod properties
-mod_version=1.4
+mod_version=1.4.1
 maven_group=com.iafenvoy.resourceworld
 archives_name=resource_world
 enabled_platforms=fabric,neoforge