diff --git a/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java b/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java index fc60fdf..a73b6a5 100644 --- a/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java +++ b/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java @@ -24,7 +24,7 @@ public class Proxy implements IProxy { // Common setup public Proxy(IEventBus modEventBus, ModContainer modContainer) { // Initialize setup - Registration.register(); + Registration.register(modEventBus); Config.init(modContainer); NetworkManager.init(); diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java index 045d75d..b3f96f2 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java +++ b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java @@ -3,10 +3,10 @@ package dev.micle.totemofreviving.setup; import dev.micle.totemofreviving.TotemOfReviving; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.neoforge.registries.DeferredHolder; public class ModCreativeModeTabs { - public static RegistryObject MAIN = Registration.CREATIVE_MODE_TABS.register("main", + public static DeferredHolder MAIN = Registration.CREATIVE_MODE_TABS.register("main", () -> CreativeModeTab.builder() .title(Component.translatable(String.format("itemGroup.%s.main", TotemOfReviving.MOD_ID))) .icon(ModItems.STRAW_TOTEM.get()::getDefaultInstance) diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java b/src/main/java/dev/micle/totemofreviving/setup/ModItems.java index 2cdcdc4..4374708 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java +++ b/src/main/java/dev/micle/totemofreviving/setup/ModItems.java @@ -9,18 +9,18 @@ import dev.micle.totemofreviving.item.totem.IronTotemItem; import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; import dev.micle.totemofreviving.item.totem.StrawTotemItem; import net.minecraft.world.item.Item; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.neoforge.registries.DeferredItem; public class ModItems { - public static RegistryObject STRAW_TOTEM = Registration.ITEMS.register(StrawTotemItem.getName(), StrawTotemItem::new); - public static RegistryObject IRON_TOTEM = Registration.ITEMS.register(IronTotemItem.getName(), IronTotemItem::new); - public static RegistryObject DIAMOND_TOTEM = Registration.ITEMS.register(DiamondTotemItem.getName(), DiamondTotemItem::new); - public static RegistryObject NETHERITE_TOTEM = Registration.ITEMS.register(NetheriteTotemItem.getName(), NetheriteTotemItem::new); + public static DeferredItem STRAW_TOTEM = Registration.ITEMS.register(StrawTotemItem.getName(), StrawTotemItem::new); + public static DeferredItem IRON_TOTEM = Registration.ITEMS.register(IronTotemItem.getName(), IronTotemItem::new); + public static DeferredItem DIAMOND_TOTEM = Registration.ITEMS.register(DiamondTotemItem.getName(), DiamondTotemItem::new); + public static DeferredItem NETHERITE_TOTEM = Registration.ITEMS.register(NetheriteTotemItem.getName(), NetheriteTotemItem::new); - public static RegistryObject STRAW_CHARGE = Registration.ITEMS.register(StrawChargeItem.getName(), StrawChargeItem::new); - public static RegistryObject IRON_CHARGE = Registration.ITEMS.register(IronChargeItem.getName(), IronChargeItem::new); - public static RegistryObject DIAMOND_CHARGE = Registration.ITEMS.register(DiamondChargeItem.getName(), DiamondChargeItem::new); - public static RegistryObject NETHERITE_CHARGE = Registration.ITEMS.register(NetheriteChargeItem.getName(), NetheriteChargeItem::new); + public static DeferredItem STRAW_CHARGE = Registration.ITEMS.register(StrawChargeItem.getName(), StrawChargeItem::new); + public static DeferredItem IRON_CHARGE = Registration.ITEMS.register(IronChargeItem.getName(), IronChargeItem::new); + public static DeferredItem DIAMOND_CHARGE = Registration.ITEMS.register(DiamondChargeItem.getName(), DiamondChargeItem::new); + public static DeferredItem NETHERITE_CHARGE = Registration.ITEMS.register(NetheriteChargeItem.getName(), NetheriteChargeItem::new); public static void register() {} } diff --git a/src/main/java/dev/micle/totemofreviving/setup/Registration.java b/src/main/java/dev/micle/totemofreviving/setup/Registration.java index 0940c46..e0ea4b1 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/Registration.java +++ b/src/main/java/dev/micle/totemofreviving/setup/Registration.java @@ -3,23 +3,18 @@ package dev.micle.totemofreviving.setup; import dev.micle.totemofreviving.TotemOfReviving; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; public class Registration { // Initialize variables - public static final DeferredRegister ITEMS = - DeferredRegister.create(ForgeRegistries.ITEMS, TotemOfReviving.MOD_ID); + public static final DeferredRegister.Items ITEMS = + DeferredRegister.createItems(TotemOfReviving.MOD_ID); public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, TotemOfReviving.MOD_ID); - public static void register() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - + public static void register(IEventBus modEventBus) { ITEMS.register(modEventBus); ModItems.register();