MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Migrate to new registry loading event

Browse Source
This commit is contained in:
Marcel Konrad
2022-03-17 10:56:20 +01:00
parent a38e3849a2
commit 25f27dcc32
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/exopandora/worldhandler/gui/category/Category.java
View File

@@ -15,11 +15,11 @@ import exopandora.worldhandler.usercontent.UsercontentLoader;
import exopandora.worldhandler.usercontent.model.JsonTab; import exopandora.worldhandler.usercontent.model.JsonTab;
import exopandora.worldhandler.util.RegistryHelper; import exopandora.worldhandler.util.RegistryHelper;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.event.RegistryEvent.NewRegistry;
import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.event.RegistryEvent.Register;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.ForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.NewRegistryEvent;
import net.minecraftforge.registries.RegistryBuilder; import net.minecraftforge.registries.RegistryBuilder;
public class Category extends ForgeRegistryEntry<Category> public class Category extends ForgeRegistryEntry<Category>
@@ -76,14 +76,13 @@ public class Category extends ForgeRegistryEntry<Category>
} }
@SubscribeEvent @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) .setType(Category.class)
.setName(new ResourceLocation(Main.MODID + "_category")) .setName(new ResourceLocation(Main.MODID + "_category"))
.disableSaving() .disableSaving()
.disableSync() .disableSync(), registry -> REGISTRY = registry);
.create();
} }
@SubscribeEvent @SubscribeEvent

9
src/main/java/exopandora/worldhandler/gui/content/Content.java
View File

@@ -36,11 +36,11 @@ import exopandora.worldhandler.usercontent.UsercontentConfig;
import exopandora.worldhandler.usercontent.UsercontentLoader; import exopandora.worldhandler.usercontent.UsercontentLoader;
import exopandora.worldhandler.util.RegistryHelper; import exopandora.worldhandler.util.RegistryHelper;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.event.RegistryEvent.NewRegistry;
import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.event.RegistryEvent.Register;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.ForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.NewRegistryEvent;
import net.minecraftforge.registries.RegistryBuilder; import net.minecraftforge.registries.RegistryBuilder;
public abstract class Content extends ForgeRegistryEntry<Content> implements IContent 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; public static IForgeRegistry<Content> REGISTRY;
@SubscribeEvent @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) .setType(Content.class)
.setName(new ResourceLocation(Main.MODID + "_content")) .setName(new ResourceLocation(Main.MODID + "_content"))
.disableSaving() .disableSaving()
.disableSync() .disableSync(), registry -> REGISTRY = registry);
.create();
} }
@SubscribeEvent @SubscribeEvent