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

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

@@ -20,8 +20,8 @@ public final class LifecycleEntryPoint {
         FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
             ExecutionCoordinator.simpleCoordinator(),
             SenderMapper.create(
-            serverCommandSource -> (CommandSender) serverCommandSource,
-            commandSender -> (ServerCommandSource) commandSender)
+                serverCommandSource -> (CommandSender) serverCommandSource,
+                commandSender -> (ServerCommandSource) commandSender)
         );
 
 

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

@@ -16,6 +16,7 @@ import java.net.Proxy;
 
 import com.dfsek.terra.lifecycle.LifecyclePlatform;
 
+import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin {
@@ -29,4 +30,9 @@ public class MinecraftServerMixin {
                                    WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory, CallbackInfo ci) {
         LifecyclePlatform.setServer((MinecraftServer) (Object) this);
     }
+
+    @Inject(method = "shutdown()V", at = @At("RETURN"))
+    private void injectShutdown(CallbackInfo ci) {
+        initialized = false;
+    }
 }

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

@@ -1,15 +1,13 @@
 package com.dfsek.terra.lifecycle.mixin.lifecycle;
 
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.enchantment.Enchantment;
-import net.minecraft.registry.DynamicRegistryManager;
-import net.minecraft.registry.DynamicRegistryManager.Immutable;
 import net.minecraft.registry.MutableRegistry;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.RegistryLoader;
 import net.minecraft.registry.RegistryLoader.Loader;
+import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.WorldPreset;
@@ -20,7 +18,6 @@ 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.Redirect;
 
 import java.util.List;
@@ -31,30 +28,19 @@ import com.dfsek.terra.lifecycle.LifecyclePlatform;
 import com.dfsek.terra.lifecycle.util.LifecycleUtil;
 import com.dfsek.terra.lifecycle.util.RegistryHack;
 
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import static com.dfsek.terra.lifecycle.util.LifecycleUtil.initialized;
 
 
 @Mixin(RegistryLoader.class)
 public class RegistryLoaderMixin {
-    private static boolean initialized = false;
+
     @Shadow
     @Final
     private static Logger LOGGER;
-//    @Inject(
-//        method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Lnet/minecraft/registry/DynamicRegistryManager;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
-//        at = @At(
-//            value = "INVOKE",
-//            target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V",
-//            ordinal = 1 // we want right after the first forEach
-//            )
-//    )
-//    private static void grabRegiestry(RegistryLoader.RegistryLoadable loadable, DynamicRegistryManager baseRegistryManager,
-//                                      List<RegistryLoader.Entry<?>> entries, CallbackInfoReturnable<Immutable> cir) {
-//        entries.forEach((loader) -> {
-//                Registry<?> registry = loader.registry();
-//    }
+
     @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;Lnet/minecraft/registry/DynamicRegistryManager;" +
+                 "Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;",
         at = @At(
             value = "INVOKE",
             target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V",
@@ -62,20 +48,19 @@ public class RegistryLoaderMixin {
             )
     )
     private static void grabManager(List<RegistryLoader.Loader<?>> instance, Consumer<? super Loader<?>> consumer) {
-        if (!initialized) {
-            extractRegistry(instance, RegistryKeys.BIOME).ifPresent(
-                biomes -> { // this redirect triggers twice, second time only with dimension registry. don't try extraction second time
-                    MutableRegistry<DimensionType> dimensionTypes = extractRegistry(instance, RegistryKeys.DIMENSION_TYPE).orElseThrow();
-                    MutableRegistry<WorldPreset> worldPresets = extractRegistry(instance, RegistryKeys.WORLD_PRESET).orElseThrow();
-                    MutableRegistry<ChunkGeneratorSettings> chunkGeneratorSettings = extractRegistry(instance,
-                        RegistryKeys.CHUNK_GENERATOR_SETTINGS).orElseThrow();
-                    MutableRegistry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists = extractRegistry(instance,
-                        RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST).orElseThrow();
-                    MutableRegistry<Enchantment> enchantments = extractRegistry(instance, RegistryKeys.ENCHANTMENT).orElseThrow();
+        if(!initialized) {
+            MutableRegistry<Biome> biomes = extractRegistry(instance, RegistryKeys.BIOME).orElseThrow();
+            MutableRegistry<DimensionType> dimensionTypes = extractRegistry(instance, RegistryKeys.DIMENSION_TYPE).orElseThrow();
+            MutableRegistry<WorldPreset> worldPresets = extractRegistry(instance, RegistryKeys.WORLD_PRESET).orElseThrow();
+            MutableRegistry<ChunkGeneratorSettings> chunkGeneratorSettings = extractRegistry(instance,
+                RegistryKeys.CHUNK_GENERATOR_SETTINGS).orElseThrow();
+            MutableRegistry<MultiNoiseBiomeSourceParameterList> multiNoiseBiomeSourceParameterLists = extractRegistry(instance,
+                RegistryKeys.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST).orElseThrow();
+            MutableRegistry<Enchantment> enchantments = extractRegistry(instance, RegistryKeys.ENCHANTMENT).orElseThrow();
 
-                    LifecyclePlatform.setRegistries(biomes, dimensionTypes, chunkGeneratorSettings, multiNoiseBiomeSourceParameterLists, enchantments);
-                    LifecycleUtil.initialize(biomes, worldPresets);
-                });
+            LifecyclePlatform.setRegistries(biomes, dimensionTypes, chunkGeneratorSettings, multiNoiseBiomeSourceParameterLists,
+                enchantments);
+            LifecycleUtil.initialize(biomes, worldPresets);
             initialized = true;
         }
         instance.forEach(consumer);

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

@@ -13,10 +13,14 @@ import com.dfsek.terra.mod.util.MinecraftUtil;
 @Mixin(SaveLoading.class)
 public class SaveLoadingMixin {
     @ModifyArg(
-        method = "load(Lnet/minecraft/server/SaveLoading$ServerConfig;Lnet/minecraft/server/SaveLoading$LoadContextSupplier;Lnet/minecraft/server/SaveLoading$SaveApplierFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;",
+        method = "load(Lnet/minecraft/server/SaveLoading$ServerConfig;Lnet/minecraft/server/SaveLoading$LoadContextSupplier;" +
+                 "Lnet/minecraft/server/SaveLoading$SaveApplierFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)" +
+                 "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/registry/RegistryLoader;loadFromResource(Lnet/minecraft/resource/ResourceManager;" +
+                     "Lnet/minecraft/registry/DynamicRegistryManager;Ljava/util/List;)" +
+                     "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;"),
         index = 1
     )
     private static DynamicRegistryManager grabManager(DynamicRegistryManager registryManager) {

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

@@ -12,6 +12,7 @@ import com.dfsek.terra.mod.CommonPlatform;
 
 
 public final class LifecycleUtil {
+    public static boolean initialized = false;
     private LifecycleUtil() {
 
     }