From 25f27dcc325f06a36632448f50c853ff23fa2f2c Mon Sep 17 00:00:00 2001
From: Marcel Konrad <mkonrad98@alice-dsl.net>
Date: Thu, 17 Mar 2022 10:56:20 +0100
Subject: [PATCH] Migrate to new registry loading event

---
 .../exopandora/worldhandler/gui/category/Category.java   | 9 ++++-----
 .../exopandora/worldhandler/gui/content/Content.java     | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/exopandora/worldhandler/gui/category/Category.java b/src/main/java/exopandora/worldhandler/gui/category/Category.java
index 9efcc77..fa80918 100644
--- a/src/main/java/exopandora/worldhandler/gui/category/Category.java
+++ b/src/main/java/exopandora/worldhandler/gui/category/Category.java
@@ -15,11 +15,11 @@ import exopandora.worldhandler.usercontent.UsercontentLoader;
 import exopandora.worldhandler.usercontent.model.JsonTab;
 import exopandora.worldhandler.util.RegistryHelper;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.event.RegistryEvent.NewRegistry;
 import net.minecraftforge.event.RegistryEvent.Register;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraftforge.registries.NewRegistryEvent;
 import net.minecraftforge.registries.RegistryBuilder;
 
 public class Category extends ForgeRegistryEntry<Category>
@@ -76,14 +76,13 @@ public class Category extends ForgeRegistryEntry<Category>
 	}
 	
 	@SubscribeEvent
-	public static void createRegistry(NewRegistry event)
+	public static void createRegistry(NewRegistryEvent event)
 	{
-		REGISTRY = new RegistryBuilder<Category>()
+		event.create(new RegistryBuilder<Category>()
 				.setType(Category.class)
 				.setName(new ResourceLocation(Main.MODID + "_category"))
 				.disableSaving()
-				.disableSync()
-				.create();
+				.disableSync(), registry -> REGISTRY = registry);
 	}
 	
 	@SubscribeEvent
diff --git a/src/main/java/exopandora/worldhandler/gui/content/Content.java b/src/main/java/exopandora/worldhandler/gui/content/Content.java
index 5c0d097..616e5e4 100644
--- a/src/main/java/exopandora/worldhandler/gui/content/Content.java
+++ b/src/main/java/exopandora/worldhandler/gui/content/Content.java
@@ -36,11 +36,11 @@ import exopandora.worldhandler.usercontent.UsercontentConfig;
 import exopandora.worldhandler.usercontent.UsercontentLoader;
 import exopandora.worldhandler.util.RegistryHelper;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.event.RegistryEvent.NewRegistry;
 import net.minecraftforge.event.RegistryEvent.Register;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.registries.ForgeRegistryEntry;
 import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraftforge.registries.NewRegistryEvent;
 import net.minecraftforge.registries.RegistryBuilder;
 
 public abstract class Content extends ForgeRegistryEntry<Content> implements IContent
@@ -48,14 +48,13 @@ public abstract class Content extends ForgeRegistryEntry<Content> implements ICo
 	public static IForgeRegistry<Content> REGISTRY;
 	
 	@SubscribeEvent
-	public static void createRegistry(NewRegistry event)
+	public static void createRegistry(NewRegistryEvent event)
 	{
-		REGISTRY = new RegistryBuilder<Content>()
+		event.create(new RegistryBuilder<Content>()
 				.setType(Content.class)
 				.setName(new ResourceLocation(Main.MODID + "_content"))
 				.disableSaving()
-				.disableSync()
-				.create();
+				.disableSync(), registry -> REGISTRY = registry);
 	}
 	
 	@SubscribeEvent