diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java b/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java
index 054df3e..3927308 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java
@@ -1,6 +1,5 @@
 package dev.micle.firefly_bush_backport.data;
 
-import dev.micle.firefly_bush_backport.FireflyBushBackport;
 import dev.micle.firefly_bush_backport.data.client.ModBlockStateProvider;
 import dev.micle.firefly_bush_backport.data.client.ModItemModelProvider;
 import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider;
@@ -8,14 +7,14 @@ import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider;
 import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.DataGenerator;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.data.event.GatherDataEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+import net.neoforged.neoforge.data.event.GatherDataEvent;
 
 import java.util.concurrent.CompletableFuture;
 
-@Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber
 public class DataGenerators {
     @SubscribeEvent
     public static void gatherData(GatherDataEvent event) {
diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java
index d1e883c..f387a99 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java
@@ -5,9 +5,9 @@ import dev.micle.firefly_bush_backport.block.ModBlocks;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
-import net.minecraftforge.client.model.generators.BlockStateProvider;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.registries.RegistryObject;
+import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+import net.neoforged.neoforge.registries.DeferredHolder;
 
 import java.util.Objects;
 
@@ -21,7 +21,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
         crossEmissiveBlock(ModBlocks.FIREFLY_BUSH);
     }
 
-    private void crossEmissiveBlock(RegistryObject<Block> block) {
+    private void crossEmissiveBlock(DeferredHolder<Block, ? extends Block> block) {
         String name = Objects.requireNonNull(block.getId()).getPath();
         simpleBlock(block.get(), models()
                 .withExistingParent(name, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/cross_emissive"))
diff --git a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java
index 2277e06..38da927 100644
--- a/src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java
+++ b/src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java
@@ -5,12 +5,11 @@ import dev.micle.firefly_bush_backport.block.ModBlocks;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
-import net.minecraftforge.client.model.generators.ItemModelBuilder;
-import net.minecraftforge.client.model.generators.ItemModelProvider;
-import net.minecraftforge.client.model.generators.ModelFile;
-import net.minecraftforge.common.data.ExistingFileHelper;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
+import net.neoforged.neoforge.client.model.generators.ItemModelBuilder;
+import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
+import net.neoforged.neoforge.client.model.generators.ModelFile;
+import net.neoforged.neoforge.common.data.ExistingFileHelper;
+import net.neoforged.neoforge.registries.DeferredHolder;
 
 import java.util.Objects;
 
@@ -21,11 +20,11 @@ public class ModItemModelProvider extends ItemModelProvider {
 
     @Override
     protected void registerModels() {
-        ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get).forEach(this::blockItemModel);
+        ModBlocks.BLOCKS.getEntries().stream().map(DeferredHolder::get).forEach(this::blockItemModel);
     }
 
     private void blockItemModel(Block block) {
-        String name = Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(block)).getPath();
+        String name = Objects.requireNonNull(ModBlocks.BLOCKS.getRegistryName()).getPath();
 
         if (block == ModBlocks.FIREFLY_BUSH.get()) {
             builder(getExistingFile(mcLoc("item/generated")), name);