Another fix to registration flow

Hopefully this is the last one...

Author: Su5eD

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BootstrapMixin.java

@@ -16,28 +16,13 @@
 
 package dev.su5ed.sinytra.connector.mod.mixin.registries;
 
-import net.minecraft.core.MappedRegistry;
-import net.minecraft.core.Registry;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.Bootstrap;
 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.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Bootstrap.class)
 public abstract class BootstrapMixin {
-    @Inject(method = "bootStrap", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/registries/BuiltInRegistries;bootStrap()V", shift = At.Shift.AFTER))
-    private static void initialize(CallbackInfo ci) {
-        // Unfreeze registries
-        // We let the get frozen first as some forge mods may rely on registering their contents in the BuiltInRegistries.freeze() method
-        ((MappedRegistry<?>) BuiltInRegistries.REGISTRY).unfreeze();
-        for (Registry<?> registry : BuiltInRegistries.REGISTRY) {
-            ((MappedRegistry<?>) registry).unfreeze();
-        }
-    }
-
     @Redirect(method = "bootStrap", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/registries/GameData;vanillaSnapshot()V", remap = false))
     private static void skipVanillaSnapshot() {
         // Don't lock registries just yet

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/registries/BuiltInRegistriesMixin.java

@@ -1,23 +1,15 @@
 package dev.su5ed.sinytra.connector.mod.mixin.registries;
 
+import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import org.spongepowered.asm.mixin.Mixin;
-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;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(BuiltInRegistries.class)
-public class BuiltInRegistriesMixin {
-    @Unique
-    private static boolean hasInitialised = false;
-
-    @Inject(method = "createContents", at = @At("HEAD"), cancellable = true)
-    private static void init(CallbackInfo ci) {
-        if (hasInitialised) {
-            ci.cancel();
-        }
-
-        hasInitialised = true;
+public abstract class BuiltInRegistriesMixin {
+    @Redirect(method = "freeze", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/Registry;freeze()Lnet/minecraft/core/Registry;"))
+    private static Registry<?> init(Registry<?> instance) {
+        return instance;
     }
 }