Merge remote-tracking branch 'origin/ver/6.6.0' into dev/7.0-2

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java

@@ -86,7 +86,7 @@ public abstract class LifecyclePlatform extends ModPlatform {
         boolean succeed = loadConfigPacks();
 
         if(server != null) {
-            BiomeUtil.registerBiomes(server.getRegistryManager().get(RegistryKeys.BIOME));
+            BiomeUtil.registerBiomes(server.getRegistryManager().getOrThrow(RegistryKeys.BIOME));
             server.reloadResources(server.getDataPackManager().getEnabledIds()).exceptionally(throwable -> {
                 LOGGER.warn("Failed to execute reload", throwable);
                 return null;

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/CreateWorldScreenMixin.java

@@ -0,0 +1,27 @@
+package com.dfsek.terra.lifecycle.mixin.lifecycle;
+
+
+import com.dfsek.terra.api.Platform;
+
+import com.dfsek.terra.mod.CommonPlatform;
+
+import com.dfsek.terra.mod.ModPlatform;
+
+import net.minecraft.client.gui.screen.world.CreateWorldScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
+
+
+@Mixin(CreateWorldScreen.class)
+public class CreateWorldScreenMixin {
+    @Inject(method = "onCloseScreen()V", at = @At("HEAD"))
+    public void onClose(CallbackInfo ci) {
+        ModPlatform platform = CommonPlatform.get();
+        platform.getRawConfigRegistry().clear();
+        initialized = false;
+    }
+}

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java

@@ -1,5 +1,8 @@
 package com.dfsek.terra.lifecycle.mixin.lifecycle;
 
+import com.dfsek.terra.mod.CommonPlatform;
+import com.dfsek.terra.mod.ModPlatform;
+
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.resource.ResourcePackManager;
 import net.minecraft.server.MinecraftServer;
@@ -34,6 +37,8 @@ public class MinecraftServerMixin {
 
     @Inject(method = "shutdown()V", at = @At("RETURN"))
     private void injectShutdown(CallbackInfo ci) {
+        ModPlatform platform = CommonPlatform.get();
+        platform.getRawConfigRegistry().clear();
         initialized = false;
     }
 }

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java

@@ -39,8 +39,7 @@ public class RegistryLoaderMixin {
     private static Logger LOGGER;
 
     @Redirect(
-        method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Lnet/minecraft/registry/DynamicRegistryManager;" +
-                 "Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
+        method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
         at = @At(
             value = "INVOKE",
             target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V",

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java

@@ -1,7 +1,8 @@
 package com.dfsek.terra.lifecycle.mixin.lifecycle;
 
-import net.minecraft.registry.DynamicRegistryManager;
+import net.minecraft.registry.CombinedDynamicRegistries;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.ServerDynamicRegistryType;
 import net.minecraft.server.SaveLoading;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -18,13 +19,11 @@ public class SaveLoadingMixin {
                  "Ljava/util/concurrent/CompletableFuture;",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/registry/RegistryLoader;loadFromResource(Lnet/minecraft/resource/ResourceManager;" +
-                     "Lnet/minecraft/registry/DynamicRegistryManager;Ljava/util/List;)" +
-                     "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;"),
+            target = "Lnet/minecraft/server/DataPackContents;reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"),
         index = 1
     )
-    private static DynamicRegistryManager grabManager(DynamicRegistryManager registryManager) {
-        MinecraftUtil.registerFlora(registryManager.get(RegistryKeys.BIOME));
-        return registryManager;
+    private static CombinedDynamicRegistries<ServerDynamicRegistryType> grabManager(CombinedDynamicRegistries<ServerDynamicRegistryType> dynamicRegistries) {
+        MinecraftUtil.registerFlora(dynamicRegistries.getCombinedRegistryManager().getOrThrow(RegistryKeys.BIOME));
+        return dynamicRegistries;
     }
 }

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/BiomeUtil.java

@@ -51,7 +51,7 @@ public final class BiomeUtil {
 
 
         if(pack.getContext().get(PreLoadCompatibilityOptions.class).useVanillaBiomes()) {
-            ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(registry.getEntry(vanilla).orElseThrow());
+            ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(registry.getEntry(registry.get(vanilla)));
         } else {
             VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class);
 

platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json

@@ -1,23 +1,24 @@
 {
-    "required": true,
-    "minVersion": "0.8",
-    "package": "com.dfsek.terra.lifecycle.mixin",
-    "compatibilityLevel": "JAVA_21",
-    "mixins": [
-        "NoiseConfigMixin",
-        "RegistryEntryReferenceInvoker",
-        "RegistryMixin",
-        "SimpleRegistryMixin",
-        "lifecycle.MinecraftServerMixin",
-        "lifecycle.RegistryLoaderMixin",
-        "lifecycle.SaveLoadingMixin"
-    ],
-    "client": [
-    ],
-    "server": [
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    },
-    "refmap": "terra.lifecycle.refmap.json"
+  "required": true,
+  "minVersion": "0.8",
+  "package": "com.dfsek.terra.lifecycle.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "NoiseConfigMixin",
+    "RegistryEntryReferenceInvoker",
+    "RegistryMixin",
+    "SimpleRegistryMixin",
+    "lifecycle.MinecraftServerMixin",
+    "lifecycle.RegistryLoaderMixin",
+    "lifecycle.SaveLoadingMixin"
+  ],
+  "client": [
+      "lifecycle.CreateWorldScreenMixin"
+  ],
+  "server": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "refmap": "terra.lifecycle.refmap.json"
 }