Attempted fix for forge not registering registries.

Author: ThePandaOliver

common-testmod/src/main/java/me/pandamods/test/TestMod.java

@@ -24,8 +24,13 @@
 import me.pandamods.test.config.CommonTestConfig;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.MobCategory;
 
 public class TestMod {
 	public static final String MOD_ID = "testmod";
@@ -41,9 +46,13 @@ public class TestMod {
 	public static final DeferredObject<TestRegistry> TEST1 = TEST_REGISTER.register("test1", TestRegistry::new);
 	public static final DeferredObject<TestRegistry> TEST2 = TEST_REGISTER.register("test2", TestRegistry::new);
 
+	public static final DeferredRegister<EntityType<?>> TEST_ENTITY_REGISTER = DeferredRegister.create(MOD_ID, Registries.ENTITY_TYPE);
+	public static final DeferredObject<EntityType<?>> TEST3 = TEST_ENTITY_REGISTER.register("test3", () -> EntityType.Builder.createNothing(MobCategory.MISC).build("test3"));
+
 	public TestMod() {
 		instance = this;
 		TEST_REGISTER.register();
+		TEST_ENTITY_REGISTER.register();
 	}
 
 	public static ResourceLocation resourceLocation(String path) {

common/src/main/java/me/pandamods/pandalib/registry/DeferredObject.java

@@ -58,7 +58,7 @@ public ResourceKey<?> getKey() {
 	}
 
 	public ResourceKey<? extends Registry<?>> getRegistryKey() {
-		return ResourceKey.createRegistryKey(key.location());
+		return ResourceKey.createRegistryKey(key.registry());
 	}
 
 	public Registry<?> getRegistry() {

fabric/src/main/java/me/pandamods/pandalib/fabric/platform/RegistrationHelperImpl.java

@@ -46,7 +46,7 @@ public <T> void registerNewRegistry(Registry<T> registry) {
 		if (BuiltInRegistries.REGISTRY.containsKey(registryName))
 			throw new IllegalStateException("Attempted duplicate registration of registry " + registryName);
 
-		((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
+		((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, registry.registryLifecycle());
 	}
 
 	@Override

forge/src/main/java/me/pandamods/pandalib/forge/PandaLibForge.java

@@ -31,8 +31,8 @@ public class PandaLibForge {
     public PandaLibForge() {
 		IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
 		EventBuses.registerModEventBus(PandaLib.MOD_ID, eventBus);
-
 		new PandaLib();
+
 		if (Services.REGISTRATION instanceof RegistrationHelperImpl helper) {
 			eventBus.addListener(helper::registerEvent);
 			MinecraftForge.EVENT_BUS.addListener(helper::addReloadListenerEvent);

forge/src/main/java/me/pandamods/pandalib/forge/mixin/NewRegistryEventMixin.java renamed to forge/src/main/java/me/pandamods/pandalib/forge/mixin/RegistryManagerMixin.java

@@ -15,15 +15,16 @@
 import me.pandamods.pandalib.forge.platform.RegistrationHelperImpl;
 import me.pandamods.pandalib.platform.Services;
 import net.minecraftforge.registries.NewRegistryEvent;
+import net.minecraftforge.registries.RegistryManager;
 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;
 
-@Mixin(value = NewRegistryEvent.class, remap = false)
-public class NewRegistryEventMixin {
-	@Inject(method = "fill", at = @At(value = "FIELD", target = "Lnet/minecraftforge/registries/NewRegistryEvent;registries:Ljava/util/List;"))
-	public void registerRegistries(CallbackInfo ci) {
+@Mixin(value = RegistryManager.class, remap = false)
+public class RegistryManagerMixin {
+	@Inject(method = "postNewRegistryEvent", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/Registry;keySet()Ljava/util/Set;"))
+	private static void registerRegistries(CallbackInfo ci) {
 		if (Services.REGISTRATION instanceof RegistrationHelperImpl helper) {
 			helper.registerNewRegistries();
 		}

forge/src/main/java/me/pandamods/pandalib/forge/platform/RegistrationHelperImpl.java

@@ -16,6 +16,8 @@
 import me.pandamods.pandalib.platform.services.RegistrationHelper;
 import me.pandamods.pandalib.registry.DeferredObject;
 import net.minecraft.client.Minecraft;
+import net.minecraft.core.Holder;
+import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.core.WritableRegistry;
 import net.minecraft.core.registries.BuiltInRegistries;
@@ -25,7 +27,7 @@
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import net.minecraftforge.event.AddReloadListenerEvent;
-import net.minecraftforge.registries.RegisterEvent;
+import net.minecraftforge.registries.*;
 
 import java.util.*;
 import java.util.function.Supplier;
@@ -62,11 +64,17 @@ public void registerEvent(RegisterEvent event) {
 		pendingRegistries.values().forEach(pending -> pending.register(event));
 	}
 
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
 	public void registerNewRegistries() {
-		for (Registry registry : pendingRegistryTypes) {
-			((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, Lifecycle.stable());
+		if (BuiltInRegistries.REGISTRY instanceof MappedRegistry<?> rootRegistry)
+			rootRegistry.unfreeze();
+
+		for (Registry<?> registry : pendingRegistryTypes) {
+			((WritableRegistry) BuiltInRegistries.REGISTRY).register(registry.key(), registry, registry.registryLifecycle());
 		}
+
+		if (BuiltInRegistries.REGISTRY instanceof MappedRegistry<?> rootRegistry)
+			rootRegistry.freeze();
 	}
 
 	public void addReloadListenerEvent(AddReloadListenerEvent event) {

forge/src/main/resources/pandalib.mixins.json

@@ -6,7 +6,7 @@
 	"client": [
 	],
 	"mixins": [
-		"NewRegistryEventMixin"
+		"RegistryManagerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1