Fix item tab registration

TeamOpenIndustry · Apr 7, 2024 · 192d36c · 192d36c
1 parent 756b1ba
commit 192d36c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/cam72cam/mod/ModCore.java b/src/main/java/cam72cam/mod/ModCore.java
@@ -111,6 +111,7 @@ public ModCore() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::postInit);
         //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::serverStarting);
         //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::serverStarted);
+        CommonEvents.Item.CREATIVE_TAB.register(FMLJavaModLoadingContext.get().getModEventBus());
 
         MinecraftForge.EVENT_BUS.register(this);
     }

diff --git a/src/main/java/cam72cam/mod/event/CommonEvents.java b/src/main/java/cam72cam/mod/event/CommonEvents.java
@@ -2,6 +2,7 @@
 
 import cam72cam.mod.ModCore;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.EntityType;
@@ -20,6 +21,8 @@
 import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegisterEvent;
 import net.minecraftforge.registries.RegisterEvent.RegisterHelper;
@@ -56,7 +59,7 @@ public static final class Tile {
 
     public static final class Item {
         public static final Event<Consumer<RegisterHelper<net.minecraft.world.item.Item>>> REGISTER = new Event<>();
-        public static final Event<Consumer<RegisterHelper<CreativeModeTab>>> CREATIVE_TAB = new Event<>();
+        public static final DeferredRegister<CreativeModeTab> CREATIVE_TAB = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ModCore.MODID);
     }
 
     public static final class Recipe {

diff --git a/src/main/java/cam72cam/mod/item/CreativeTab.java b/src/main/java/cam72cam/mod/item/CreativeTab.java
@@ -3,25 +3,29 @@
 import cam72cam.mod.ModCore;
 import cam72cam.mod.event.ClientEvents;
 import cam72cam.mod.event.CommonEvents;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
+import net.minecraftforge.registries.DeferredRegister;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
 /** Creates/Registers a creative tab for custom items */
+
 public class CreativeTab {
     public CreativeModeTab internal;
 
+
     // TODO expose existing creative tabs as constants to be used by mods
 
     public List<CustomItem> inject = new ArrayList<>();
 
     /** */
     public CreativeTab(String label, Supplier<ItemStack> stack) {
-        CommonEvents.Item.CREATIVE_TAB.subscribe(event -> {
+        CommonEvents.Item.CREATIVE_TAB.register(label, () -> {
             CreativeModeTab.Builder builder = CreativeModeTab.builder();
             builder.title(Component.literal(label));
             builder.icon(() -> stack.get().internal());
@@ -34,7 +38,7 @@ public CreativeTab(String label, Supplier<ItemStack> stack) {
             });
 
             internal = builder.build();
-            event.register(new ResourceLocation(ModCore.MODID, label), internal);
+            return internal;
         });
     }