diff --git a/src/main/java/dev/micle/firefly_bush_backport/particle/ModParticles.java b/src/main/java/dev/micle/firefly_bush_backport/particle/ModParticles.java
index 7f1114e..5375dc3 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/particle/ModParticles.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/particle/ModParticles.java
@@ -3,15 +3,15 @@ package dev.micle.firefly_bush_backport.particle;
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.particles.SimpleParticleType;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import net.neoforged.neoforge.registries.DeferredRegister;
 
 public class ModParticles {
-    public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, FireflyBushBackport.MOD_ID);
+    public static final DeferredRegister<ParticleType<?>> PARTICLE_TYPES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, FireflyBushBackport.MOD_ID);
 
-    public static final RegistryObject<SimpleParticleType> FIREFLY = PARTICLE_TYPES.register("firefly",
+    public static final DeferredHolder<ParticleType<?>, SimpleParticleType> FIREFLY = PARTICLE_TYPES.register("firefly",
             () -> new SimpleParticleType(false));
 
     public static void register(IEventBus modEventBus) {
diff --git a/src/main/java/dev/micle/firefly_bush_backport/sound/ModSounds.java b/src/main/java/dev/micle/firefly_bush_backport/sound/ModSounds.java
index a4dcb42..1906655 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/sound/ModSounds.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/sound/ModSounds.java
@@ -1,23 +1,23 @@
 package dev.micle.firefly_bush_backport.sound;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
-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;
 
 public class ModSounds {
-    public static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, FireflyBushBackport.MOD_ID);
+    public static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(BuiltInRegistries.SOUND_EVENT, FireflyBushBackport.MOD_ID);
 
-    public static final RegistryObject<SoundEvent> FIREFLY_BUSH_IDLE = registerSoundEvent("block.firefly_bush.idle");
+    public static final DeferredHolder<SoundEvent, SoundEvent> FIREFLY_BUSH_IDLE = registerSoundEvent("block.firefly_bush.idle");
 
     public static void register(IEventBus modEventBus) {
         SOUND_EVENTS.register(modEventBus);
     }
 
-    private static RegistryObject<SoundEvent> registerSoundEvent(String name) {
+    private static DeferredHolder<SoundEvent, SoundEvent> registerSoundEvent(String name) {
         return SOUND_EVENTS.register(name, () -> SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, name)));
     }
 }
diff --git a/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java b/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java
index 5fdccb9..c3f7186 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/tab/ModCreativeModeTabs.java
@@ -2,17 +2,17 @@ package dev.micle.firefly_bush_backport.tab;
 
 import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.block.ModBlocks;
-import net.minecraft.core.registries.Registries;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.CreativeModeTab;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.RegistryObject;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import net.neoforged.neoforge.registries.DeferredRegister;
 
 public class ModCreativeModeTabs {
-    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, FireflyBushBackport.MOD_ID);
+    public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(BuiltInRegistries.CREATIVE_MODE_TAB, FireflyBushBackport.MOD_ID);
 
-    public static final RegistryObject<CreativeModeTab> MAIN_TAB = CREATIVE_MODE_TABS.register( "main",
+    public static final DeferredHolder<CreativeModeTab, CreativeModeTab> MAIN_TAB = CREATIVE_MODE_TABS.register( "main",
             () -> CreativeModeTab.builder()
                     .title(Component.translatable(String.format("itemGroup.%s.main", FireflyBushBackport.MOD_ID)))
                     .icon(ModBlocks.FIREFLY_BUSH.get().asItem()::getDefaultInstance)