diff --git a/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java b/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java index 2ab4c4b..d4289d9 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java +++ b/src/main/java/dev/micle/firefly_bush_backport/block/ModBlocks.java @@ -9,17 +9,16 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; import java.util.function.Supplier; public class ModBlocks { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, FireflyBushBackport.MOD_ID); + public static final DeferredRegister BLOCKS = DeferredRegister.createBlocks(FireflyBushBackport.MOD_ID); - public static RegistryObject FIREFLY_BUSH = registerBlock("firefly_bush", + public static DeferredHolder FIREFLY_BUSH = registerBlock("firefly_bush", () -> new FireflyBushBlock(BlockBehaviour.Properties.of() .mapColor(MapColor.PLANT) .ignitedByLava() @@ -34,12 +33,12 @@ public class ModBlocks { BLOCKS.register(modEventBus); } - private static RegistryObject registerBlockItem(String name, RegistryObject block) { + private static DeferredHolder registerBlockItem(String name, DeferredHolder block) { return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties())); } - private static RegistryObject registerBlock(String name, Supplier block) { - RegistryObject ret = BLOCKS.register(name, block); + private static DeferredHolder registerBlock(String name, Supplier block) { + DeferredHolder ret = BLOCKS.register(name, block); registerBlockItem(name, ret); return ret; } diff --git a/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java b/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java index 2904912..c474dc5 100644 --- a/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java +++ b/src/main/java/dev/micle/firefly_bush_backport/item/ModItems.java @@ -2,12 +2,11 @@ package dev.micle.firefly_bush_backport.item; import dev.micle.firefly_bush_backport.FireflyBushBackport; import net.minecraft.world.item.Item; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; public class ModItems { - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, FireflyBushBackport.MOD_ID); + public static final DeferredRegister ITEMS = DeferredRegister.createItems(FireflyBushBackport.MOD_ID); public static void register(IEventBus modEventBus) { ITEMS.register(modEventBus);