diff --git a/gradle.properties b/gradle.properties
index fc28d42f..77b9883c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
-
 org.gradle.configuration-cache=true
 
 neoForge.parchment.minecraftVersion=1.20.6
 neoForge.parchment.mappingsVersion=2024.05.01
 
+neogradle.subsystems.conventions.runs.create-default-run-per-type=false
+
 # Curseforge
 cf_project=224218
\ No newline at end of file
diff --git a/neoforge-datagen/build.gradle.kts b/neoforge-datagen/build.gradle.kts
index 6122ad79..d50b00ab 100644
--- a/neoforge-datagen/build.gradle.kts
+++ b/neoforge-datagen/build.gradle.kts
@@ -5,43 +5,46 @@ plugins {
     id("eclipse")
     id("idea")
     id("maven-publish")
-    alias(neoforged.plugins.moddev)
+    alias(neoforged.plugins.userdev)
 }
 
 val modId: String = "compactmachines"
-val mainProject: Project = project(":neoforge-main")
-evaluationDependsOn(mainProject.path)
 
 val coreApi = project(":core-api")
+val mainProject: Project = project(":neoforge-main")
 
 project.evaluationDependsOn(coreApi.path)
+project.evaluationDependsOn(mainProject.path)
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
-neoForge {
-    version = neoforged.versions.neoforge
+minecraft {
+    modIdentifier.set(modId)
+}
 
-    this.mods.create(modId) {
-        modSourceSets.add(sourceSets.main)
-        this.dependency(coreApi)
-        this.dependency(mainProject)
-    }
+runs {
+    // applies to all the run configs below
+    configureEach {
+        systemProperty("forge.logging.markers", "") // 'SCAN,REGISTRIES,REGISTRYDUMP'
 
-    this.runs {
-        configureEach {
-            logLevel.set(Level.DEBUG)
-        }
+        // Recommended logging level for the console
+        systemProperty("forge.logging.console.level", "debug")
 
-        create("data") {
-            data()
+        modSource(project.sourceSets.main.get())
+        modSource(mainProject.sourceSets.main.get())
 
-            programArguments.addAll("--mod", modId)
-            programArguments.addAll("--all")
-            programArguments.addAll("--output", mainProject.file("src/generated/resources").absolutePath)
-            programArguments.addAll("--existing", mainProject.file("src/main/resources").absolutePath)
-        }
+        modSource(coreApi.sourceSets.main.get())
+    }
+
+    create("data") {
+        dataGenerator(true)
+
+        programArguments("--mod", "compactmachines")
+        programArguments("--all")
+        programArguments("--output", mainProject.file("src/generated/resources").absolutePath)
+        programArguments("--existing", mainProject.file("src/main/resources").absolutePath)
     }
 }
 
@@ -52,6 +55,8 @@ repositories {
 dependencies {
     compileOnly(coreApi)
     compileOnly(mainProject)
+
+    implementation(neoforged.neoforge)
 }
 
 tasks.compileJava {
diff --git a/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java b/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java
index 133b7861..2c5afcaa 100644
--- a/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java
+++ b/neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java
@@ -12,20 +12,18 @@
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 
 import java.util.Collections;
 import java.util.List;
 
-@Mod(CompactMachines.MOD_ID)
+@EventBusSubscriber(modid = CompactMachines.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class DataGeneration {
 
-    public DataGeneration(IEventBus modBus) {
-        modBus.addListener(DataGeneration::gatherData);
-    }
-
-    private static void gatherData(GatherDataEvent event) {
+    @SubscribeEvent
+    public static void gatherData(GatherDataEvent event) {
         final var fileHelper = event.getExistingFileHelper();
         final var generator = event.getGenerator();
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4f4183ff..6783b7c5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,7 @@ dependencyResolutionManagement {
     versionCatalogs.create("neoforged") {
         version("mdg", "0.1.92")
         version("neoforge", "21.0.14-beta")
+        version("neogradle", "7.0.145")
         version("neoforgeRange") {
             require("[21.0,22)")
             prefer("21.0.2-beta")
@@ -12,6 +13,9 @@ dependencyResolutionManagement {
         plugin("moddev", "net.neoforged.moddev")
             .versionRef("mdg")
 
+        plugin("userdev", "net.neoforged.gradle.userdev")
+            .versionRef("neogradle")
+
         library("neoforge", "net.neoforged", "neoforge")
             .versionRef("neoforge")