From 836aab8ccce5b3d8ac9ea51cdd0172d847a19557 Mon Sep 17 00:00:00 2001
From: Thom van den Akker <thodor20@gmail.com>
Date: Mon, 11 Nov 2024 20:16:57 +0100
Subject: [PATCH 1/5] Allow automatic generation of mods.toml and dependencies
 management

---
 .idea/gradle.xml                              |   1 +
 build.gradle                                  |   1 +
 gradle/libs.versions.toml                     |   7 +-
 .../common/extensions/ModExtension.java       |  40 +-
 modules/dependencies/build.gradle             |  29 ++
 .../dependencies/DependenciesPlugin.java      |  18 +
 .../DependenciesProjectPlugin.java            |  20 +
 .../extensions/DependenciesExtension.java     |  83 ++++
 .../publishing/MavenPublishingExtension.java  |   3 +-
 modules/neogradle/build.gradle                |   1 +
 .../extensions/NeoGradleExtension.java        |   7 +
 .../neogradle/NeoGradleProjectPlugin.java     |  65 ++-
 .../neogradle/model/ModsTomlDependency.java   |  15 +
 .../neogradle/model/ParsedBasicModInfo.java   |  11 +
 .../neogradle/model/ResolvedDependency.java   |  45 +++
 .../neogradle/tasks/GenerateModsTomlTask.java | 376 ++++++++++++++++++
 settings.gradle                               |   2 +
 .../ldtteam/tableau/TableauProjectPlugin.java |   2 +
 18 files changed, 715 insertions(+), 11 deletions(-)
 create mode 100644 modules/dependencies/build.gradle
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
 create mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ModsTomlDependency.java
 create mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
 create mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
 create mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5873365..8486499 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
             <option value="$PROJECT_DIR$/modules/common" />
             <option value="$PROJECT_DIR$/modules/crowdin" />
             <option value="$PROJECT_DIR$/modules/curseforge" />
+            <option value="$PROJECT_DIR$/modules/dependencies" />
             <option value="$PROJECT_DIR$/modules/git" />
             <option value="$PROJECT_DIR$/modules/jarjar" />
             <option value="$PROJECT_DIR$/modules/java" />
diff --git a/build.gradle b/build.gradle
index 8ec11f6..7b32944 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ plugins {
 }
 
 dependencies {
+    api(project(':dependencies'))
     api(project(':changelog'))
     api(project(':maven-publishing'))
     api(project(':resource-processing'))
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9a4957e..799c16d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,6 +6,8 @@ sonarqube = "5.+"
 shadow = "8.+"
 jetbrainsAnnotations = "+"
 curseForgeGradle = "1.+"
+fancyModLoader = "5.+"
+secureJarHandler = "3.+"
 
 [libraries]
 neogradle-userdev = { module = "net.neoforged.gradle:userdev", version.ref = "neogradle" }
@@ -15,6 +17,8 @@ sonarqube = { module = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin",
 shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" }
 curseForgeGradle = { module = "net.darkhax.curseforgegradle:CurseForgeGradle", version.ref = "curseForgeGradle" }
+fancyModLoader = { module = "net.neoforged.fancymodloader:loader", version.ref = "fancyModLoader" }
+secureJarHandler = { module = "cpw.mods:securejarhandler", version.ref = "secureJarHandler" }
 
 [bundles]
 neogradle = ["neogradle-userdev"]
@@ -22,4 +26,5 @@ crowdin = ["crowdin", "gradle-download"]
 sonarqube = ["sonarqube"]
 shadow = ["shadow"]
 jetbrainsAnnotations = ["jetbrainsAnnotations"]
-curseForgeGradle = ["curseForgeGradle"]
\ No newline at end of file
+curseForgeGradle = ["curseForgeGradle"]
+fancyModLoader = ["fancyModLoader", "secureJarHandler"]
\ No newline at end of file
diff --git a/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java b/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
index 2175e1d..6081b19 100644
--- a/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
+++ b/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
@@ -3,10 +3,10 @@
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 
 import javax.inject.Inject;
+import java.net.URI;
 
 /**
  * Mod extension, handles the project configuration for the mod.
@@ -53,15 +53,30 @@ public void versioning(final Action<Versioning> action) {
         action.execute(versioning);
     }
 
+    /**
+     * @return The minecraft version.
+     */
+    public abstract Property<String> getMinecraftVersion();
+
     /**
      * @return The mod id.
      */
     public abstract Property<String> getModId();
 
     /**
-     * @return The minecraft version.
+     * @return The mod display name.
      */
-    public abstract Property<String> getMinecraftVersion();
+    public abstract Property<String> getModName();
+
+    /**
+     * @return The mod description.
+     */
+    public abstract Property<String> getModDescription();
+
+    /**
+     * @return The mod logo.
+     */
+    public abstract Property<String> getModLogo();
 
     /**
      * @return The mod publisher.
@@ -69,9 +84,24 @@ public void versioning(final Action<Versioning> action) {
     public abstract Property<String> getPublisher();
 
     /**
-     * @return The mod url, is the location where documentation and support can be found.
+     * @return The website for the mod.
+     */
+    public abstract Property<URI> getDisplayUrl();
+
+    /**
+     * @return The repository url, where the source can be found.
+     */
+    public abstract Property<URI> getRepositoryUrl();
+
+    /**
+     * @return The issue tracker url, where issues may be filed for the mod.
+     */
+    public abstract Property<URI> getIssueTrackerUrl();
+
+    /**
+     * @return The license used for the mod.
      */
-    public abstract Property<String> getUrl();
+    public abstract Property<String> getLicense();
 
     /**
      * Mod versioning configuration.
diff --git a/modules/dependencies/build.gradle b/modules/dependencies/build.gradle
new file mode 100644
index 0000000..b1ad90c
--- /dev/null
+++ b/modules/dependencies/build.gradle
@@ -0,0 +1,29 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Gradle plugin project to get you started.
+ * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.10/userguide/custom_plugins.html in the Gradle documentation.
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+plugins {
+    // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins
+    id 'java-gradle-plugin'
+}
+
+dependencies {
+    api project(':scripting')
+    api project(':sourceset-management')
+
+    api libs.bundles.fancyModLoader
+}
+
+gradlePlugin {
+    // Define the plugin
+    plugins {
+        "dependencies" {
+            id = 'com.ldtteam.tableau.dependencies'
+            implementationClass = 'com.ldtteam.tableau.dependencies.DependenciesPlugin'
+        }
+    }
+}
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
new file mode 100644
index 0000000..a909c71
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
@@ -0,0 +1,18 @@
+/*
+ * This source file was generated by the Gradle 'init' task
+ */
+package com.ldtteam.tableau.dependencies;
+
+import org.gradle.api.Project;
+import org.gradle.api.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+public class DependenciesPlugin implements Plugin<Object> {
+
+    @Override
+    public void apply(@NotNull Object target) {
+        if (target instanceof Project project) {
+            project.getPlugins().apply(DependenciesProjectPlugin.class);
+        }
+    }
+}
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
new file mode 100644
index 0000000..d74f310
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
@@ -0,0 +1,20 @@
+/*
+ * This source file was generated by the Gradle 'init' task
+ */
+package com.ldtteam.tableau.dependencies;
+
+import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
+import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
+import org.gradle.api.Project;
+import org.gradle.api.Plugin;
+import org.gradle.api.plugins.JavaLibraryPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class DependenciesProjectPlugin implements Plugin<Project> {
+
+    @Override
+    public void apply(@NotNull Project target) {
+        target.getPlugins().apply(JavaLibraryPlugin.class);
+        TableauScriptingExtension.register(target, DependenciesExtension.EXTENSION_NAME, DependenciesExtension.class, target);
+    }
+}
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
new file mode 100644
index 0000000..d2d53d0
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
@@ -0,0 +1,83 @@
+package com.ldtteam.tableau.dependencies.extensions;
+
+import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.dsl.Dependencies;
+import org.gradle.api.artifacts.dsl.DependencyCollector;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+
+import javax.inject.Inject;
+
+/**
+ * The Dependencies extension for the Tableau project.
+ * <p>
+ * Provides a way to register mod dependencies as project and Neogradle dependencies.
+ */
+public abstract class DependenciesExtension implements Dependencies
+{
+
+    /**
+     * The name of the extension.
+     */
+    public static final String EXTENSION_NAME = "modDependencies";
+    private final Project project;
+
+    @Inject
+    public DependenciesExtension(final Project project)
+    {
+        this.project = project;
+
+        final SourceSet mainSourceSet = project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        final Configuration apiConfiguration = project.getConfigurations().getByName(mainSourceSet.getApiConfigurationName());
+
+        apiConfiguration.fromDependencyCollector(getRequired());
+        apiConfiguration.fromDependencyCollector(getOptional());
+    }
+
+    /**
+     * Gets the dependencies extension for a given project.
+     *
+     * @param project The project.
+     * @return The git extension.
+     */
+    public static DependenciesExtension get(final Project project)
+    {
+        return TableauScriptingExtension.get(project, DependenciesExtension.class);
+    }
+
+    /**
+     * Get the required dependencies.
+     */
+    public abstract DependencyCollector getRequired();
+
+    /**
+     * Get the optional dependencies.
+     */
+    public abstract DependencyCollector getOptional();
+
+    /**
+     * Get the configuration for the required dependencies.
+     *
+     * @return The configuration instance.
+     */
+    public Configuration getRequiredConfiguration()
+    {
+        final Configuration configuration = project.getConfigurations().detachedConfiguration();
+        configuration.fromDependencyCollector(getRequired());
+        return configuration;
+    }
+
+    /**
+     * Get the configuration for the optional dependencies.
+     *
+     * @return The configuration instance.
+     */
+    public Configuration getOptionalConfiguration()
+    {
+        final Configuration configuration = project.getConfigurations().detachedConfiguration();
+        configuration.fromDependencyCollector(getOptional());
+        return configuration;
+    }
+}
diff --git a/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java b/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
index 43d3ab7..40c0b4e 100644
--- a/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
+++ b/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
@@ -14,6 +14,7 @@
 import org.gradle.internal.instrumentation.api.annotations.ToBeReplacedByLazyProperty;
 
 import javax.inject.Inject;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -161,7 +162,7 @@ void configure(MavenPom pom) {
 
         final ModExtension mod = ModExtension.get(project);
 
-        pom.getUrl().set(mod.getUrl());
+        pom.getUrl().set(mod.getRepositoryUrl().map(URI::toString));
 
         pom.organization(organization -> {
             organization.getName().set(mod.getPublisher());
diff --git a/modules/neogradle/build.gradle b/modules/neogradle/build.gradle
index a339a76..094dc11 100644
--- a/modules/neogradle/build.gradle
+++ b/modules/neogradle/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     api project(':common')
     api project(':resource-processing')
     api project(':sourceset-management')
+    api project(':dependencies')
 
     api libs.bundles.neogradle
 }
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
index bb65ca2..34a258a 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
@@ -43,6 +43,8 @@ public NeoGradleExtension(final Project project) {
         final VersioningExtension versioning = VersioningExtension.get(project);
         final ModExtension modExtension = ModExtension.get(project);
 
+        getAutoGenerateModsToml().convention(true);
+
         getPrimaryJarClassifier().convention("universal");
         getNeoForgeVersion().convention(
             modExtension.getMinecraftVersion().flatMap(enabled -> versioning.getMinecraft().getMinecraftVersion().map(version -> {
@@ -99,6 +101,11 @@ public void interfaceInjection(Object file) {
      */
     public abstract Property<String> getNeoForgeVersion();
 
+    /**
+     * @return Whether to automatically generate a neoforge.mods.toml during build.
+     */
+    public abstract Property<Boolean> getAutoGenerateModsToml();
+
     /**
      * @return The classifier for the primary jar.
      */
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
index 036214c..23d5cbe 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -6,14 +6,15 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 import com.ldtteam.tableau.common.extensions.ModExtension;
+import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
 import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
 import com.ldtteam.tableau.extensions.NeoGradleSourceSetConfigurationExtension;
+import com.ldtteam.tableau.neogradle.tasks.GenerateModsTomlTask;
+import com.ldtteam.tableau.neogradle.model.ResolvedDependency;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
-import net.neoforged.gradle.common.extensions.MinecraftExtension;
-import net.neoforged.gradle.common.util.ProjectUtils;
 import net.neoforged.gradle.dsl.common.extensions.AccessTransformers;
 import net.neoforged.gradle.dsl.common.extensions.InterfaceInjections;
 import net.neoforged.gradle.dsl.common.extensions.Minecraft;
@@ -23,13 +24,16 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Rule;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.*;
+import org.gradle.language.jvm.tasks.ProcessResources;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class NeoGradleProjectPlugin implements Plugin<Project> {
@@ -46,6 +50,7 @@ public void apply(@NotNull Project target) {
         configureResourceProcessing(target);
         configureAccessTransformers(target);
         configureInterfaceInjections(target);
+        configureModsTomlGeneration(target);
     }
 
     /**
@@ -295,4 +300,56 @@ private void configureInterfaceInjections(final Project project) {
 
         //TODO: Consider how and when to expose the interface injections as artifacts.
     }
+
+    /**
+     * Configures the automatic mods toml generation for the given project.
+     */
+    private void configureModsTomlGeneration(final Project project) {
+        final ModExtension mod = ModExtension.get(project);
+        final NeoGradleExtension neogradle = NeoGradleExtension.get(project);
+        final DependenciesExtension dependencies = DependenciesExtension.get(project);
+
+        final TaskProvider<GenerateModsTomlTask> generationTask = project.getTasks().register("generateModsToml", GenerateModsTomlTask.class, (task) -> {
+            task.getNeoforgeVersion().set(neogradle.getNeoForgeVersion());
+            task.getMinecraftVersion().set(mod.getMinecraftVersion());
+            task.getModId().set(mod.getModId());
+            task.getModName().set(mod.getModName());
+            task.getModDescription().set(mod.getModDescription());
+            task.getModLogo().set(mod.getModLogo());
+            task.getModVersion().set(project.getVersion().toString());
+            task.getPublisher().set(mod.getPublisher());
+            task.getDisplayUrl().set(mod.getDisplayUrl());
+            task.getIssueTrackerUrl().set(mod.getIssueTrackerUrl());
+            task.getLicense().set(mod.getLicense());
+
+            final Configuration requiredConfiguration = dependencies.getRequiredConfiguration();
+            final Configuration optionalConfiguration = dependencies.getOptionalConfiguration();
+            task.getRequiredDependencies().set(resolveDependencies(requiredConfiguration));
+            task.getOptionalDependencies().set(resolveDependencies(optionalConfiguration));
+            task.getRequiredResolvedComponents().set(requiredConfiguration.getIncoming().getResolutionResult().getRootComponent());
+            task.getOptionalResolvedComponents().set(optionalConfiguration.getIncoming().getResolutionResult().getRootComponent());
+        });
+
+        if (neogradle.getAutoGenerateModsToml().get()) {
+            project.getTasks().named("processResources", ProcessResources.class).configure(task -> {
+                task.from(generationTask.get().getOutputFile(), (it) -> {
+                    it.into("META-INF");
+                });
+            });
+        }
+    }
+
+    /**
+     * Find all the resolved dependencies.
+     *
+     * @param configuration The configuration to look for dependencies in.
+     * @return The set provider.
+     */
+    private Provider<Set<ResolvedDependency>> resolveDependencies(final Configuration configuration)
+    {
+        return configuration.getIncoming()
+                 .getArtifacts()
+                 .getResolvedArtifacts()
+                 .map(m -> m.stream().map(m2 -> new ResolvedDependency(m2.getId().getComponentIdentifier().getDisplayName(), m2.getFile())).collect(Collectors.toSet()));
+    }
 }
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ModsTomlDependency.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ModsTomlDependency.java
new file mode 100644
index 0000000..b428b0f
--- /dev/null
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ModsTomlDependency.java
@@ -0,0 +1,15 @@
+package com.ldtteam.tableau.neogradle.model;
+
+import net.neoforged.neoforgespi.language.IModInfo.Ordering;
+
+/**
+ * A container class for holding a dependency that can be written to the neoforge.mods.toml file.
+ *
+ * @param modId        The mod identifier.
+ * @param versionRange The version range for the mod.
+ * @param required     If the dependency is required or optional.
+ * @param ordering     How the dependency should be ordered compared to the current mod.
+ */
+public record ModsTomlDependency(String modId, String versionRange, boolean required, Ordering ordering)
+{
+}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
new file mode 100644
index 0000000..35ff220
--- /dev/null
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
@@ -0,0 +1,11 @@
+package com.ldtteam.tableau.neogradle.model;
+
+/**
+ * Basic mod information parsed directly from the jar.
+ *
+ * @param modId   The mod identifier.
+ * @param version The version of the mod.
+ */
+public record ParsedBasicModInfo(String modId, String version)
+{
+}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
new file mode 100644
index 0000000..11d7a00
--- /dev/null
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
@@ -0,0 +1,45 @@
+package com.ldtteam.tableau.neogradle.model;
+
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.PathSensitive;
+import org.gradle.api.tasks.PathSensitivity;
+
+import java.io.File;
+
+/**
+ * Dependency information container, contains the dependency identifier and the original jar file.
+ */
+@SuppressWarnings("ClassCanBeRecord") // Because of Gradle configuration cache this file cannot be converted to a record due to missing getters.
+public class ResolvedDependency
+{
+    private final String id;
+
+    private final File file;
+
+    /**
+     * Default constructor.
+     *
+     * @param id   The dependency identifier.
+     * @param file The jar file.
+     */
+    public ResolvedDependency(final String id, final File file)
+    {
+        this.id = id;
+        this.file = file;
+    }
+
+    @Input
+    public String getId()
+    {
+        return id;
+    }
+
+    @InputFile
+    @PathSensitive(PathSensitivity.NONE)
+    public File getFile()
+    {
+        return file;
+    }
+}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
new file mode 100644
index 0000000..487e347
--- /dev/null
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
@@ -0,0 +1,376 @@
+package com.ldtteam.tableau.neogradle.tasks;
+
+import com.electronwill.nightconfig.core.UnmodifiableCommentedConfig;
+import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.toml.TomlFormat;
+import com.ldtteam.tableau.neogradle.model.ModsTomlDependency;
+import com.ldtteam.tableau.neogradle.model.ParsedBasicModInfo;
+import com.ldtteam.tableau.neogradle.model.ResolvedDependency;
+import net.neoforged.fml.loading.moddiscovery.NightConfigWrapper;
+import net.neoforged.neoforgespi.language.IConfigurable;
+import net.neoforged.neoforgespi.language.IModInfo.Ordering;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.VersionConstraint;
+import org.gradle.api.artifacts.component.ModuleComponentSelector;
+import org.gradle.api.artifacts.result.ResolvedComponentResult;
+import org.gradle.api.artifacts.result.ResolvedDependencyResult;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.SetProperty;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.OutputFile;
+import org.gradle.api.tasks.TaskAction;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.*;
+import java.util.*;
+
+/**
+ * Task for automatically generating the neoforge.mods.toml based on input data.
+ */
+public abstract class GenerateModsTomlTask extends DefaultTask
+{
+    public GenerateModsTomlTask()
+    {
+        setGroup("neogradle");
+        setDescription("Generate the neoforge.mods.toml file");
+
+        final Provider<RegularFile> outputFile = getProject().getLayout().getBuildDirectory().dir(getName()).map(dir -> dir.file("neoforge.mods.toml"));
+        getOutputFile().convention(outputFile);
+        getOutputs().file(outputFile);
+    }
+
+    @TaskAction
+    public void generateModsToml() throws IOException
+    {
+        final File modsTomlFile = getOutputFile().get().getAsFile();
+        if (modsTomlFile.exists())
+        {
+            if (!modsTomlFile.delete())
+            {
+                getLogger().warn("Could not delete old neoforge.mods.toml, will keep using old file.");
+                return;
+            }
+        }
+
+        try (final BufferedWriter writer = Files.newBufferedWriter(modsTomlFile.toPath(), StandardOpenOption.CREATE_NEW))
+        {
+            writeHeader(writer);
+            writeLine(writer, "modLoader=\"javafml\"");
+            writeLine(writer, String.format("loaderVersion=\"[%d,)\"", 4));
+            writeLine(writer, String.format("license=\"%s\"", getLicense().get()));
+            writeLine(writer, String.format("issueTrackerURL=\"%s\"", getIssueTrackerUrl().get()));
+            writeLine(writer, "");
+            writeLine(writer, "[[mods]]");
+            writeLine(writer, String.format("modId=\"%s\"", getModId().get()));
+            writeLine(writer, String.format("version=\"%s\"", getModVersion().get()));
+            writeLine(writer, String.format("displayName=\"%s\"", getModName().get()));
+            writeLine(writer, String.format("description='''%s'''", getModDescription().get()));
+            writeLine(writer, String.format("logoFile=\"%s\"", getModLogo().get()));
+            writeLine(writer, String.format("authors=\"%s\"", getPublisher().get()));
+            writeLine(writer, String.format("displayURL=\"%s\"", getDisplayUrl().get()));
+            writeLine(writer, "");
+
+            final String mcVersion = getMinecraftVersion().get();
+            final DefaultArtifactVersion artifactVersion = new DefaultArtifactVersion(mcVersion);
+            final String nextMcMajorVersion = String.format("%s.%s", artifactVersion.getMajorVersion(), artifactVersion.getMinorVersion() + 1);
+
+            writeDependency(writer, new ModsTomlDependency("neoforge", String.format("[%s,)", getNeoforgeVersion().get()), true, Ordering.NONE));
+            writeDependency(writer, new ModsTomlDependency("minecraft", String.format("[%s,%s)", mcVersion, nextMcMajorVersion), true, Ordering.NONE));
+            writeDependencies(writer, getRequiredResolvedComponents().get(), getRequiredDependencies().get());
+            writeDependencies(writer, getOptionalResolvedComponents().get(), getOptionalDependencies().get());
+        }
+    }
+
+    /**
+     * Write the list of dependencies to the output of the neoforge.mods.toml.
+     *
+     * @param writer       The buffered writer.
+     * @param component    The resolved component result.
+     * @param dependencies The set of dependencies.
+     * @throws IOException If an exception is thrown during writing.
+     */
+    private void writeDependencies(final BufferedWriter writer, final ResolvedComponentResult component, final Set<ResolvedDependency> dependencies) throws IOException
+    {
+        for (final ResolvedDependency dependency : dependencies)
+        {
+            final List<ParsedBasicModInfo> modInfos = getModInfos(dependency.getFile());
+            for (final ParsedBasicModInfo modInfo : modInfos)
+            {
+                final ResolvedDependencyResult dep = resolveDependency(component, dependency.getId());
+                if (dep != null)
+                {
+                    getLogger().warn(dep.toString());
+                    final String versionRange = getVersionRange(dep);
+                    if (versionRange == null)
+                    {
+                        continue;
+                    }
+                    getLogger().warn(versionRange);
+
+                    writeDependency(writer, new ModsTomlDependency(modInfo.modId(), versionRange, true, Ordering.AFTER));
+                }
+            }
+        }
+    }
+
+    /**
+     * Write the header to the output of the neoforge.mods.toml.
+     *
+     * @param writer The buffered writer.
+     * @throws IOException If an exception is thrown during writing.
+     */
+    private void writeHeader(final BufferedWriter writer) throws IOException
+    {
+        writeLine(writer, "# This file is automatically generated by Tableau.");
+        writeLine(writer, "# If anything is wrong with this file and Tableau has no option to fix this,");
+        writeLine(writer, "# you may disable automatic generation by writing:");
+        writeLine(writer, "# ```");
+        writeLine(writer, "# tableau {");
+        writeLine(writer, "#     neogradle {");
+        writeLine(writer, "#         autoGenerateModsToml = false");
+        writeLine(writer, "#     }");
+        writeLine(writer, "# }");
+        writeLine(writer, "# ```");
+        writeLine(writer, "# When you do this, you have to supply all the configuration manually.");
+        writeLine(writer, "");
+    }
+
+    /**
+     * Write a dependency block to the neoforge.mods.toml.
+     *
+     * @param writer The buffered writer.
+     * @throws IOException If an exception is thrown during writing.
+     */
+    private void writeDependency(final BufferedWriter writer, final ModsTomlDependency dependency) throws IOException
+    {
+        writeLine(writer, String.format("[[dependencies.%s]]", getModId().get()));
+        writeLine(writer, String.format("\tmodId=\"%s\"", dependency.modId()));
+        writeLine(writer, String.format("\ttype=\"%s\"", dependency.required() ? "required" : "optional"));
+        writeLine(writer, String.format("\tversionRange=\"%s\"", dependency.versionRange()));
+        writeLine(writer, String.format("\tordering=\"%s\"", dependency.ordering()));
+        writeLine(writer, "\tside=\"BOTH\"");
+    }
+
+    /**
+     * Internal line write method.
+     */
+    private void writeLine(final BufferedWriter writer, final String content) throws IOException
+    {
+        writer.write(content);
+        writer.newLine();
+    }
+
+    /**
+     * Extract the version range of a resolved dependency.
+     *
+     * @param dependency The input dependency.
+     * @return The version range or null if the version range could not be determined.
+     */
+    @Nullable
+    private String getVersionRange(final ResolvedDependencyResult dependency)
+    {
+        if (dependency.getRequested() instanceof ModuleComponentSelector componentSelector)
+        {
+            final VersionConstraint versionConstraint = componentSelector.getVersionConstraint();
+            if (!StringUtils.isBlank(versionConstraint.getStrictVersion()))
+            {
+                return versionConstraint.getStrictVersion();
+            }
+            else if (!StringUtils.isBlank(versionConstraint.getRequiredVersion()))
+            {
+                return versionConstraint.getRequiredVersion();
+            }
+            else if (!StringUtils.isBlank(versionConstraint.getPreferredVersion()))
+            {
+                return versionConstraint.getPreferredVersion();
+            }
+        }
+        else
+        {
+            final ModuleVersionIdentifier moduleVersion = dependency.getSelected().getModuleVersion();
+            if (moduleVersion != null)
+            {
+                return moduleVersion.getVersion();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Get a list of mod information classes for the given jar file.
+     *
+     * @param file The input jar file.
+     * @return The list of mod info instances, or an empty list if no mods were found in the jar.
+     */
+    @NotNull
+    private List<ParsedBasicModInfo> getModInfos(final File file)
+    {
+        try (final FileSystem fileSystem = FileSystems.newFileSystem(file.toPath()))
+        {
+            final Path path = fileSystem.getPath("META-INF/neoforge.mods.toml");
+            if (!Files.exists(path))
+            {
+                return List.of();
+            }
+
+            final FileConfig fileConfig = FileConfig.builder(path).build();
+            fileConfig.load();
+            fileConfig.close();
+            final TomlFormat format = TomlFormat.instance();
+            final UnmodifiableCommentedConfig unmodifiableConfig = format.createParser().parse(format.createWriter().writeToString(fileConfig)).unmodifiable();
+            final NightConfigWrapper configWrapper = new NightConfigWrapper(unmodifiableConfig);
+
+            final List<ParsedBasicModInfo> modInfos = new ArrayList<>();
+            for (final IConfigurable config : configWrapper.getConfigList("mods"))
+            {
+                final Optional<String> modId = config.getConfigElement("modId");
+                final Optional<String> modVersion = config.getConfigElement("version");
+                if (modId.isPresent() && modVersion.isPresent())
+                {
+                    getLogger().lifecycle("Obtained the mod info for jar \"{}\", found mod with modId \"{}\"", file.getName(), modId.get());
+                    modInfos.add(new ParsedBasicModInfo(modId.get(), modVersion.get()));
+                }
+            }
+            return Collections.unmodifiableList(modInfos);
+        }
+        catch (Exception ex)
+        {
+            if (getLogger().isDebugEnabled())
+            {
+                getLogger().lifecycle("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file. Reason:", file.getName(), ex);
+            }
+            else
+            {
+                getLogger().lifecycle("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file.", file.getName());
+            }
+            return List.of();
+        }
+    }
+
+    /**
+     * Attempt to resolve a dependency from the resolved components.
+     *
+     * @param component  The resolved component result.
+     * @param identifier The dependency identifier.
+     * @return The resolved dependency, if found, else null.
+     */
+    @Nullable
+    private ResolvedDependencyResult resolveDependency(final ResolvedComponentResult component, final String identifier)
+    {
+        return component.getDependencies()
+                 .stream()
+                 .filter(f -> f instanceof ResolvedDependencyResult)
+                 .map(ResolvedDependencyResult.class::cast)
+                 .filter(m -> m.getSelected().getId().getDisplayName().equals(identifier))
+                 .findFirst()
+                 .orElse(null);
+    }
+
+    /**
+     * @return The Neoforge version.
+     */
+    @Input
+    public abstract Property<String> getNeoforgeVersion();
+
+    /**
+     * @return The Minecraft version.
+     */
+    @Input
+    public abstract Property<String> getMinecraftVersion();
+
+    /**
+     * @return The mod id.
+     */
+    @Input
+    public abstract Property<String> getModId();
+
+    /**
+     * @return The mod display name.
+     */
+    @Input
+    public abstract Property<String> getModName();
+
+    /**
+     * @return The mod description.
+     */
+    @Input
+    public abstract Property<String> getModDescription();
+
+    /**
+     * @return The mod logo.
+     */
+    @Input
+    public abstract Property<String> getModLogo();
+
+    /**
+     * @return The version of the mod.
+     */
+    @Input
+    public abstract Property<String> getModVersion();
+
+    /**
+     * @return The mod publisher.
+     */
+    @Input
+    public abstract Property<String> getPublisher();
+
+    /**
+     * @return The website for the mod.
+     */
+    @Input
+    public abstract Property<URI> getDisplayUrl();
+
+    /**
+     * @return The issue tracker url, where issues may be filed for the mod.
+     */
+    @Input
+    public abstract Property<URI> getIssueTrackerUrl();
+
+    /**
+     * @return The license used for the mod.
+     */
+    @Input
+    public abstract Property<String> getLicense();
+
+    /**
+     * @return The required mod dependencies.
+     */
+    @Nested
+    public abstract SetProperty<ResolvedDependency> getRequiredDependencies();
+
+    /**
+     * @return The optional mod dependencies.
+     */
+    @Nested
+    public abstract SetProperty<ResolvedDependency> getOptionalDependencies();
+
+    /**
+     * @return The resolved dependency components for the required configuration.
+     */
+    @Input
+    public abstract Property<ResolvedComponentResult> getRequiredResolvedComponents();
+
+    /**
+     * @return The resolved dependency components for the optional configuration.
+     */
+    @Input
+    public abstract Property<ResolvedComponentResult> getOptionalResolvedComponents();
+
+    /**
+     * @return The destination file for the mods toml.
+     */
+    @OutputFile
+    public abstract RegularFileProperty getOutputFile();
+}
diff --git a/settings.gradle b/settings.gradle
index 9ec87e6..7dcbd2c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -58,3 +58,5 @@ include('changelog')
 project(':changelog').projectDir = file('modules/changelog')
 include('bootstrap')
 project(':bootstrap').projectDir = file('bootstrap')
+include('dependencies')
+project(':dependencies').projectDir = file('modules/dependencies')
diff --git a/src/main/java/com/ldtteam/tableau/TableauProjectPlugin.java b/src/main/java/com/ldtteam/tableau/TableauProjectPlugin.java
index b6a75a4..fce8872 100644
--- a/src/main/java/com/ldtteam/tableau/TableauProjectPlugin.java
+++ b/src/main/java/com/ldtteam/tableau/TableauProjectPlugin.java
@@ -4,6 +4,7 @@
 import com.ldtteam.tableau.common.CommonPlugin;
 import com.ldtteam.tableau.crowdin.CrowdinPlugin;
 import com.ldtteam.tableau.curseforge.CurseForgePlugin;
+import com.ldtteam.tableau.dependencies.DependenciesPlugin;
 import com.ldtteam.tableau.extensions.ModuleFeatures;
 import com.ldtteam.tableau.features.FeaturePluginManager;
 import com.ldtteam.tableau.git.GitPlugin;
@@ -34,6 +35,7 @@ public void apply(@NotNull Project target) {
         target.getPlugins().apply(CommonPlugin.class);
         target.getPlugins().apply(JavaPlugin.class);
         target.getPlugins().apply(SourcesetManagementPlugin.class);
+        target.getPlugins().apply(DependenciesPlugin.class);
         target.getPlugins().apply(ResourceProcessingPlugin.class);
         target.getPlugins().apply(NeoGradlePlugin.class);
         target.getPlugins().apply(JetbrainsAnnotationsPlugin.class);

From f37ac7cfff1ede4cfb199a32f7a6848cf42fad4f Mon Sep 17 00:00:00 2001
From: Thom van den Akker <thodor20@gmail.com>
Date: Wed, 20 Nov 2024 21:59:21 +0100
Subject: [PATCH 2/5] Update task code to move dependency resolving outside of
 task

---
 .../neogradle/NeoGradleProjectPlugin.java     | 60 +++++++++---
 .../neogradle/model/CombinedDependency.java   | 16 ++++
 .../neogradle/model/ResolvedDependency.java   | 31 ++++--
 .../neogradle/tasks/GenerateModsTomlTask.java | 95 +------------------
 4 files changed, 88 insertions(+), 114 deletions(-)
 create mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java

diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
index 23d5cbe..057365c 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -10,11 +10,13 @@
 import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
 import com.ldtteam.tableau.extensions.NeoGradleSourceSetConfigurationExtension;
+import com.ldtteam.tableau.neogradle.model.CombinedDependency;
 import com.ldtteam.tableau.neogradle.tasks.GenerateModsTomlTask;
 import com.ldtteam.tableau.neogradle.model.ResolvedDependency;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
+import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension.SourceSetConfiguration;
 import net.neoforged.gradle.dsl.common.extensions.AccessTransformers;
 import net.neoforged.gradle.dsl.common.extensions.InterfaceInjections;
 import net.neoforged.gradle.dsl.common.extensions.Minecraft;
@@ -24,6 +26,11 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Rule;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentSelector;
+import org.gradle.api.artifacts.result.DependencyResult;
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
+import org.gradle.api.internal.provider.BiProvider;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.*;
 import org.gradle.language.jvm.tasks.ProcessResources;
@@ -32,8 +39,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class NeoGradleProjectPlugin implements Plugin<Project> {
@@ -95,7 +100,7 @@ public void apply(@NotNull String domainObjectName) {
 
                 //Check if the source set is marked to be included in the libraries.
                 if (domainObjectName.equals("library")) {
-                    final SourceSetExtension.SourceSetConfiguration mainSourceSetConfig = sourceSetExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+                    final SourceSetConfiguration mainSourceSetConfig = sourceSetExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
                     final NeoGradleSourceSetConfigurationExtension extension = NeoGradleSourceSetConfigurationExtension.get(mainSourceSetConfig);
                     final SourceSet mainSourceSet = target.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
 
@@ -122,7 +127,7 @@ public void apply(@NotNull String domainObjectName) {
                 //We know that a source set configuration exists for the given source set name.
                 //So we also know a neogradle extension exists for the source set configuration.
                 //And we know that the source set itself will exist.
-                final SourceSetExtension.SourceSetConfiguration sourceSetConfig = sourceSetExtension.getSourceSets().getByName(sourceSetName);
+                final SourceSetConfiguration sourceSetConfig = sourceSetExtension.getSourceSets().getByName(sourceSetName);
                 final NeoGradleSourceSetConfigurationExtension extension = NeoGradleSourceSetConfigurationExtension.get(sourceSetConfig);
                 final SourceSet sourceSet = target.getExtensions().getByType(SourceSetContainer.class).getByName(sourceSetName);
 
@@ -322,12 +327,8 @@ private void configureModsTomlGeneration(final Project project) {
             task.getIssueTrackerUrl().set(mod.getIssueTrackerUrl());
             task.getLicense().set(mod.getLicense());
 
-            final Configuration requiredConfiguration = dependencies.getRequiredConfiguration();
-            final Configuration optionalConfiguration = dependencies.getOptionalConfiguration();
-            task.getRequiredDependencies().set(resolveDependencies(requiredConfiguration));
-            task.getOptionalDependencies().set(resolveDependencies(optionalConfiguration));
-            task.getRequiredResolvedComponents().set(requiredConfiguration.getIncoming().getResolutionResult().getRootComponent());
-            task.getOptionalResolvedComponents().set(optionalConfiguration.getIncoming().getResolutionResult().getRootComponent());
+            task.getRequiredDependencies().set(resolveDependencies(dependencies.getRequiredConfiguration()));
+            task.getOptionalDependencies().set(resolveDependencies(dependencies.getOptionalConfiguration()));
         });
 
         if (neogradle.getAutoGenerateModsToml().get()) {
@@ -345,11 +346,40 @@ private void configureModsTomlGeneration(final Project project) {
      * @param configuration The configuration to look for dependencies in.
      * @return The set provider.
      */
-    private Provider<Set<ResolvedDependency>> resolveDependencies(final Configuration configuration)
+    private Provider<List<ResolvedDependency>> resolveDependencies(final Configuration configuration)
     {
-        return configuration.getIncoming()
-                 .getArtifacts()
-                 .getResolvedArtifacts()
-                 .map(m -> m.stream().map(m2 -> new ResolvedDependency(m2.getId().getComponentIdentifier().getDisplayName(), m2.getFile())).collect(Collectors.toSet()));
+        return new BiProvider<>(CombinedDependency.class,
+          configuration.getIncoming().getArtifacts().getResolvedArtifacts(),
+          configuration.getIncoming().getResolutionResult().getRootComponent(),
+          CombinedDependency::new).map(dependency -> dependency.artifacts()
+                                                       .stream()
+                                                       .map(resolvedArtifact -> new ResolvedDependency(dependency.component()
+                                                                                                         .getDependencies()
+                                                                                                         .stream()
+                                                                                                         .map(DependencyResult::getRequested)
+                                                                                                         .filter(f -> f instanceof ModuleComponentSelector)
+                                                                                                         .map(ModuleComponentSelector.class::cast)
+                                                                                                         .filter(f -> componentMatches(f, resolvedArtifact))
+                                                                                                         .map(m -> m.getVersionConstraint().getRequiredVersion())
+                                                                                                         .findFirst()
+                                                                                                         .orElse(null), resolvedArtifact.getFile()))
+                                                       .filter(f -> f.getVersionRange() != null)
+                                                       .toList());
+    }
+
+    /**
+     * Check whether the given component selector matches the provided resolved artifact.
+     *
+     * @param selector The input component selector.
+     * @param artifact The resolved artifact.
+     * @return True if the artifact identifier matches the component selector.
+     */
+    private static boolean componentMatches(final ModuleComponentSelector selector, final ResolvedArtifactResult artifact)
+    {
+        if (artifact.getId().getComponentIdentifier() instanceof ModuleComponentIdentifier artifactIdentifier)
+        {
+            return selector.getModuleIdentifier().equals(artifactIdentifier.getModuleIdentifier());
+        }
+        return false;
     }
 }
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java
new file mode 100644
index 0000000..a565cf6
--- /dev/null
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java
@@ -0,0 +1,16 @@
+package com.ldtteam.tableau.neogradle.model;
+
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
+import org.gradle.api.artifacts.result.ResolvedComponentResult;
+
+import java.util.Set;
+
+/**
+ * Container class for combining the set of resolved artifacts and the resolved component result, turning them into a single provider.
+ *
+ * @param artifacts The set of the resolved artifacts.
+ * @param component The resolved component result.
+ */
+public record CombinedDependency(Set<ResolvedArtifactResult> artifacts, ResolvedComponentResult component)
+{
+}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
index 11d7a00..3b375d7 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
@@ -1,6 +1,5 @@
 package com.ldtteam.tableau.neogradle.model;
 
-import org.gradle.api.artifacts.component.ComponentIdentifier;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.PathSensitive;
@@ -14,28 +13,44 @@
 @SuppressWarnings("ClassCanBeRecord") // Because of Gradle configuration cache this file cannot be converted to a record due to missing getters.
 public class ResolvedDependency
 {
-    private final String id;
+    /**
+     * The version range of the dependency.
+     */
+    private final String versionRange;
 
+    /**
+     * The jar file.
+     */
     private final File file;
 
     /**
      * Default constructor.
      *
-     * @param id   The dependency identifier.
-     * @param file The jar file.
+     * @param versionRange The version range of the dependency.
+     * @param file         The jar file.
      */
-    public ResolvedDependency(final String id, final File file)
+    public ResolvedDependency(final String versionRange, final File file)
     {
-        this.id = id;
+        this.versionRange = versionRange;
         this.file = file;
     }
 
+    /**
+     * Get the version range of the dependency.
+     *
+     * @return the maven version range.
+     */
     @Input
-    public String getId()
+    public String getVersionRange()
     {
-        return id;
+        return versionRange;
     }
 
+    /**
+     * Get the jar file.
+     *
+     * @return the file in classpath where the jar is located.
+     */
     @InputFile
     @PathSensitive(PathSensitivity.NONE)
     public File getFile()
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
index 487e347..936a29d 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
@@ -9,14 +9,8 @@
 import net.neoforged.fml.loading.moddiscovery.NightConfigWrapper;
 import net.neoforged.neoforgespi.language.IConfigurable;
 import net.neoforged.neoforgespi.language.IModInfo.Ordering;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.gradle.api.DefaultTask;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.VersionConstraint;
-import org.gradle.api.artifacts.component.ModuleComponentSelector;
-import org.gradle.api.artifacts.result.ResolvedComponentResult;
-import org.gradle.api.artifacts.result.ResolvedDependencyResult;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
@@ -27,7 +21,6 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -88,8 +81,8 @@ public void generateModsToml() throws IOException
 
             writeDependency(writer, new ModsTomlDependency("neoforge", String.format("[%s,)", getNeoforgeVersion().get()), true, Ordering.NONE));
             writeDependency(writer, new ModsTomlDependency("minecraft", String.format("[%s,%s)", mcVersion, nextMcMajorVersion), true, Ordering.NONE));
-            writeDependencies(writer, getRequiredResolvedComponents().get(), getRequiredDependencies().get());
-            writeDependencies(writer, getOptionalResolvedComponents().get(), getOptionalDependencies().get());
+            writeDependencies(writer, getRequiredDependencies().get());
+            writeDependencies(writer, getOptionalDependencies().get());
         }
     }
 
@@ -97,30 +90,17 @@ public void generateModsToml() throws IOException
      * Write the list of dependencies to the output of the neoforge.mods.toml.
      *
      * @param writer       The buffered writer.
-     * @param component    The resolved component result.
      * @param dependencies The set of dependencies.
      * @throws IOException If an exception is thrown during writing.
      */
-    private void writeDependencies(final BufferedWriter writer, final ResolvedComponentResult component, final Set<ResolvedDependency> dependencies) throws IOException
+    private void writeDependencies(final BufferedWriter writer, final Set<ResolvedDependency> dependencies) throws IOException
     {
         for (final ResolvedDependency dependency : dependencies)
         {
             final List<ParsedBasicModInfo> modInfos = getModInfos(dependency.getFile());
             for (final ParsedBasicModInfo modInfo : modInfos)
             {
-                final ResolvedDependencyResult dep = resolveDependency(component, dependency.getId());
-                if (dep != null)
-                {
-                    getLogger().warn(dep.toString());
-                    final String versionRange = getVersionRange(dep);
-                    if (versionRange == null)
-                    {
-                        continue;
-                    }
-                    getLogger().warn(versionRange);
-
-                    writeDependency(writer, new ModsTomlDependency(modInfo.modId(), versionRange, true, Ordering.AFTER));
-                }
+                writeDependency(writer, new ModsTomlDependency(modInfo.modId(), dependency.getVersionRange(), true, Ordering.AFTER));
             }
         }
     }
@@ -172,42 +152,6 @@ private void writeLine(final BufferedWriter writer, final String content) throws
         writer.newLine();
     }
 
-    /**
-     * Extract the version range of a resolved dependency.
-     *
-     * @param dependency The input dependency.
-     * @return The version range or null if the version range could not be determined.
-     */
-    @Nullable
-    private String getVersionRange(final ResolvedDependencyResult dependency)
-    {
-        if (dependency.getRequested() instanceof ModuleComponentSelector componentSelector)
-        {
-            final VersionConstraint versionConstraint = componentSelector.getVersionConstraint();
-            if (!StringUtils.isBlank(versionConstraint.getStrictVersion()))
-            {
-                return versionConstraint.getStrictVersion();
-            }
-            else if (!StringUtils.isBlank(versionConstraint.getRequiredVersion()))
-            {
-                return versionConstraint.getRequiredVersion();
-            }
-            else if (!StringUtils.isBlank(versionConstraint.getPreferredVersion()))
-            {
-                return versionConstraint.getPreferredVersion();
-            }
-        }
-        else
-        {
-            final ModuleVersionIdentifier moduleVersion = dependency.getSelected().getModuleVersion();
-            if (moduleVersion != null)
-            {
-                return moduleVersion.getVersion();
-            }
-        }
-        return null;
-    }
-
     /**
      * Get a list of mod information classes for the given jar file.
      *
@@ -259,25 +203,6 @@ private List<ParsedBasicModInfo> getModInfos(final File file)
         }
     }
 
-    /**
-     * Attempt to resolve a dependency from the resolved components.
-     *
-     * @param component  The resolved component result.
-     * @param identifier The dependency identifier.
-     * @return The resolved dependency, if found, else null.
-     */
-    @Nullable
-    private ResolvedDependencyResult resolveDependency(final ResolvedComponentResult component, final String identifier)
-    {
-        return component.getDependencies()
-                 .stream()
-                 .filter(f -> f instanceof ResolvedDependencyResult)
-                 .map(ResolvedDependencyResult.class::cast)
-                 .filter(m -> m.getSelected().getId().getDisplayName().equals(identifier))
-                 .findFirst()
-                 .orElse(null);
-    }
-
     /**
      * @return The Neoforge version.
      */
@@ -356,18 +281,6 @@ private ResolvedDependencyResult resolveDependency(final ResolvedComponentResult
     @Nested
     public abstract SetProperty<ResolvedDependency> getOptionalDependencies();
 
-    /**
-     * @return The resolved dependency components for the required configuration.
-     */
-    @Input
-    public abstract Property<ResolvedComponentResult> getRequiredResolvedComponents();
-
-    /**
-     * @return The resolved dependency components for the optional configuration.
-     */
-    @Input
-    public abstract Property<ResolvedComponentResult> getOptionalResolvedComponents();
-
     /**
      * @return The destination file for the mods toml.
      */

From bee26722481a9baa5172e593b74b9e89fb293dbe Mon Sep 17 00:00:00 2001
From: Thom van den Akker <thodor20@gmail.com>
Date: Wed, 20 Nov 2024 22:32:31 +0100
Subject: [PATCH 3/5] Fix javadoc issue + remove JDK specific IDEA settings

---
 .idea/.gitignore                              |  1 +
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                |  8 -------
 .../extensions/CurseForgeExtension.java       | 22 +++++++++----------
 4 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 .idea/misc.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 13566b8..ddc3775 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,6 +1,7 @@
 # Default ignored files
 /shelf/
 /workspace.xml
+/misc.xml
 # Editor-based HTTP Client requests
 /httpRequests/
 # Datasource local storage ignored files
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 96847eb..8486499 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 596538b..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
index c51baa3..4475a11 100644
--- a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
+++ b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
@@ -1,6 +1,5 @@
 package com.ldtteam.tableau.curseforge.extensions;
 
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import net.darkhax.curseforgegradle.Constants;
@@ -136,18 +135,19 @@ public Relationships(MapProperty<String, String> relationships) {
         /**
          * The relationships of the project on CurseForge.
          * <p>
-         *     The key is is the slug of the project in the relationship and the value is the kind of relationship.
-         *     As values you can use:
-         *     <ul>
-         *         <li>embeddedLibrary</li>
-         *         <li>incompatible</li>
-         *         <li>optionalDependency</li>
-         *         <li>requiredDependency</li>
-         *         <li>tool</li>
-         *     </ul>
+         * The key is the slug of the project in the relationship and the value is the kind of relationship.
+         * Possible values you can use:
          * </p>
+         * <ul>
+         *     <li>embeddedLibrary</li>
+         *     <li>incompatible</li>
+         *     <li>optionalDependency</li>
+         *     <li>requiredDependency</li>
+         *     <li>tool</li>
+         * </ul>
          */
-        public MapProperty<String, String> getRelationships() {
+        public MapProperty<String, String> getRelationships()
+        {
             return this.relationships;
         }
 

From bc52f93d9e7e9072b7b4a9000184161fcc2d340e Mon Sep 17 00:00:00 2001
From: Thom van den Akker <thodor20@gmail.com>
Date: Thu, 28 Nov 2024 22:31:36 +0100
Subject: [PATCH 4/5] Updates to dependencies block, changed curse block, added
 all documentation and javadoc

---
 examples/basic/build.gradle                   |   4 +-
 examples/maven-publish/build.gradle           |   4 +-
 gradle/libs.versions.toml                     |   4 +-
 .../common/extensions/ModExtension.java       |  15 +-
 .../curseforge/CurseForgeProjectPlugin.java   |   8 +-
 .../extensions/CurseForgeExtension.java       |  24 +--
 .../dependencies/DependenciesPlugin.java      |  16 +-
 .../DependenciesProjectPlugin.java            |  14 +-
 .../extensions/DependenciesExtension.java     |  91 +++++++++--
 .../model/CombinedDependencyData.java}        |   4 +-
 .../dependencies/model/ModDependency.java     |  11 ++
 .../model/ResolvedDependencyData.java         |  12 ++
 .../dependencies/util/DependencyResolver.java | 138 ++++++++++++++++
 .../tableau/jarjar/JarJarProjectPlugin.java   |   2 +-
 .../jarjar/extensions/JarJarExtension.java    |   2 +-
 .../publishing/MavenPublishingExtension.java  |   5 +-
 .../neogradle/NeoGradleProjectPlugin.java     |  61 +------
 .../extensions/NeoGradleExtension.java        |   4 +-
 .../NeoGradleResourceProcessingExtension.java |   2 +-
 ...GradleSourceSetConfigurationExtension.java |   2 +-
 .../neogradle/model/ParsedBasicModInfo.java   |  11 --
 .../neogradle/model/ResolvedDependency.java   |  60 -------
 .../neogradle/tasks/GenerateModsTomlTask.java | 150 +++++++-----------
 .../shadowing/ShadowingProjectPlugin.java     |   2 +-
 .../03-guides/01-neoforge-configuration.mdx   |  44 +++++
 .../03-guides/02-managing-dependencies.mdx    | 117 ++++++++++++++
 ...rce-sets.mdx => 03-custom-source-sets.mdx} |   0
 ...forge.mdx => 04-publish-to-curseforge.mdx} |   9 +-
 ...o-maven.mdx => 05-publishing-to-maven.mdx} |   0
 ...urces.mdx => 06-interpolate-resources.mdx} |   0
 website/docs/03-guides/index.mdx              |   3 +-
 31 files changed, 532 insertions(+), 287 deletions(-)
 rename modules/{neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java => dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/CombinedDependencyData.java} (71%)
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ModDependency.java
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ResolvedDependencyData.java
 create mode 100644 modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/util/DependencyResolver.java
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{ => neogradle}/extensions/NeoGradleExtension.java (97%)
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{ => neogradle}/extensions/NeoGradleResourceProcessingExtension.java (99%)
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{ => neogradle}/extensions/NeoGradleSourceSetConfigurationExtension.java (97%)
 delete mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
 delete mode 100644 modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
 create mode 100644 website/docs/03-guides/02-managing-dependencies.mdx
 rename website/docs/03-guides/{02-custom-source-sets.mdx => 03-custom-source-sets.mdx} (100%)
 rename website/docs/03-guides/{03-publish-to-curseforge.mdx => 04-publish-to-curseforge.mdx} (92%)
 rename website/docs/03-guides/{04-publishing-to-maven.mdx => 05-publishing-to-maven.mdx} (100%)
 rename website/docs/03-guides/{05-interpolate-resources.mdx => 06-interpolate-resources.mdx} (100%)

diff --git a/examples/basic/build.gradle b/examples/basic/build.gradle
index c58532f..f568859 100644
--- a/examples/basic/build.gradle
+++ b/examples/basic/build.gradle
@@ -5,6 +5,6 @@ tableau {
         group = 'com.example' // Use your own group here.
         minecraftVersion = '1.21.3' // Or any other minecraft version.
         publisher = 'SomePublisher' // Use your own name here.
-        url = 'https://github.com/someorg/modid' // Use your own URL here.
+        repositoryUrl = uri('https://github.com/someorg/modid') // Use your own URL here.
     }
-}
\ No newline at end of file
+}
diff --git a/examples/maven-publish/build.gradle b/examples/maven-publish/build.gradle
index e663b9c..9a2a3f1 100644
--- a/examples/maven-publish/build.gradle
+++ b/examples/maven-publish/build.gradle
@@ -5,7 +5,7 @@ tableau {
         group = 'com.example' // Use your own group here.
         minecraftVersion = '1.21.3' // Or any other minecraft version.
         publisher = 'SomePublisher' // Use your own name here.
-        url = 'https://github.com/someorg/modid' // Use your own URL here.
+        repositoryUrl = uri('https://github.com/someorg/modid') // Use your own URL here.
     }
 
     maven {
@@ -14,4 +14,4 @@ tableau {
             usingGit()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 799c16d..72e6a11 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,10 +21,10 @@ fancyModLoader = { module = "net.neoforged.fancymodloader:loader", version.ref =
 secureJarHandler = { module = "cpw.mods:securejarhandler", version.ref = "secureJarHandler" }
 
 [bundles]
-neogradle = ["neogradle-userdev"]
+neogradle = ["neogradle-userdev", "fancyModLoader"]
 crowdin = ["crowdin", "gradle-download"]
 sonarqube = ["sonarqube"]
 shadow = ["shadow"]
 jetbrainsAnnotations = ["jetbrainsAnnotations"]
 curseForgeGradle = ["curseForgeGradle"]
-fancyModLoader = ["fancyModLoader", "secureJarHandler"]
\ No newline at end of file
+fancyModLoader = ["fancyModLoader", "secureJarHandler"]
diff --git a/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java b/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
index dae7aa3..91ccfcf 100644
--- a/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
+++ b/modules/common/src/main/java/com/ldtteam/tableau/common/extensions/ModExtension.java
@@ -90,21 +90,22 @@ public void versioning(final Action<Versioning> action) {
     public abstract Property<String> getMinecraftVersion();
 
     /**
-     * @return The mod id.
-     */
-    public abstract Property<String> getModId();
-
-    /**
+     * The mod display name.
+     *
      * @return The mod display name.
      */
     public abstract Property<String> getModName();
 
     /**
+     * The full mod description.
+     *
      * @return The mod description.
      */
     public abstract Property<String> getModDescription();
 
     /**
+     * The mod logo file.
+     *
      * @return The mod logo.
      */
     public abstract Property<String> getModLogo();
@@ -131,11 +132,15 @@ public void versioning(final Action<Versioning> action) {
     public abstract Property<URI> getRepositoryUrl();
 
     /**
+     * The url of the website where the issue tracker can be found for the project.
+     *
      * @return The issue tracker url, where issues may be filed for the mod.
      */
     public abstract Property<URI> getIssueTrackerUrl();
 
     /**
+     * The license for the mod.
+     *
      * @return The license used for the mod.
      */
     public abstract Property<String> getLicense();
diff --git a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/CurseForgeProjectPlugin.java b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/CurseForgeProjectPlugin.java
index af6349e..5266572 100644
--- a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/CurseForgeProjectPlugin.java
+++ b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/CurseForgeProjectPlugin.java
@@ -5,7 +5,7 @@
 
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.curseforge.extensions.CurseForgeExtension;
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
 import com.ldtteam.tableau.jarjar.JarJarPlugin;
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
@@ -14,11 +14,9 @@
 import net.darkhax.curseforgegradle.Constants;
 import net.darkhax.curseforgegradle.TaskPublishCurseForge;
 import net.darkhax.curseforgegradle.UploadArtifact;
-import org.gradle.api.GradleException;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.Project;
 import org.gradle.api.Plugin;
-import org.gradle.api.internal.project.IProjectFactory;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.tasks.Jar;
@@ -70,6 +68,7 @@ private void configureUploadTask(final Project project) {
         final TaskProvider<? extends Jar> mainJar = getMainJar(project);
         final CurseForgeExtension curse = CurseForgeExtension.get(project);
         final SourceSetExtension sourceSets = SourceSetExtension.get(project);
+        final DependenciesExtension dependencies = DependenciesExtension.get(project);
         final ModExtension mod = ModExtension.get(project);
 
         if (!curse.getId().isPresent()) {
@@ -118,6 +117,9 @@ private void configureUploadTask(final Project project) {
                 }
             });
 
+            dependencies.getAllRequiredDependencies().get().forEach(dep -> artifact.addRelation(dep.modId(), Constants.RELATION_REQUIRED));
+            dependencies.getAllOptionalDependencies().get().forEach(dep -> artifact.addRelation(dep.modId(), Constants.RELATION_OPTIONAL));
+
             curse.getRelationships().get().forEach((slug, relationship) -> {
                 if (!Constants.VALID_RELATION_TYPES.contains(relationship)) {
                     throw new InvalidUserDataException("Invalid relationship type: %s for project: %s".formatted(relationship, slug));
diff --git a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
index e35945a..15a9826 100644
--- a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
+++ b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
@@ -1,6 +1,6 @@
 package com.ldtteam.tableau.curseforge.extensions;
 
-import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import net.darkhax.curseforgegradle.Constants;
 import org.gradle.api.Action;
@@ -143,8 +143,6 @@ public String toString() {
      *     <ul>
      *         <li>embeddedLibrary</li>
      *         <li>incompatible</li>
-     *         <li>optionalDependency</li>
-     *         <li>requiredDependency</li>
      *         <li>tool</li>
      *     </ul>
      * @return the relationships this project has with others
@@ -193,8 +191,6 @@ public Relationships(MapProperty<String, String> relationships) {
          * <ul>
          *     <li>embeddedLibrary</li>
          *     <li>incompatible</li>
-         *     <li>optionalDependency</li>
-         *     <li>requiredDependency</li>
          *     <li>tool</li>
          * </ul>
          * @return the relationships this project has with other published projects on CurseForge.
@@ -230,23 +226,5 @@ public void embedded(String slug) {
         public void incompatible(String slug) {
             getRelationships().put(slug, Constants.RELATION_INCOMPATIBLE);
         }
-
-        /**
-         * Marks the given project as an optional dependency.
-         *
-         * @param slug the slug of the project
-         */
-        public void optional(String slug) {
-            getRelationships().put(slug, Constants.RELATION_OPTIONAL);
-        }
-
-        /**
-         * Marks the given project as a required dependency.
-         *
-         * @param slug the slug of the project
-         */
-        public void required(String slug) {
-            getRelationships().put(slug, Constants.RELATION_REQUIRED);
-        }
     }
 }
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
index a909c71..288fca6 100644
--- a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesPlugin.java
@@ -3,12 +3,26 @@
  */
 package com.ldtteam.tableau.dependencies;
 
-import org.gradle.api.Project;
 import org.gradle.api.Plugin;
+import org.gradle.api.Project;
 import org.jetbrains.annotations.NotNull;
 
+import javax.inject.Inject;
+
+/**
+ * The root plugin for the Dependencies module.
+ * <p>
+ * Can be applied to any {@link org.gradle.api.plugins.PluginAware} but will only interact with {@link Project projects}
+ */
 public class DependenciesPlugin implements Plugin<Object> {
 
+    /**
+     * Creates a new plugin instance.
+     */
+    @Inject
+    public DependenciesPlugin() {
+    }
+
     @Override
     public void apply(@NotNull Object target) {
         if (target instanceof Project project) {
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
index d74f310..7ac8c56 100644
--- a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/DependenciesProjectPlugin.java
@@ -5,13 +5,25 @@
 
 import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
-import org.gradle.api.Project;
 import org.gradle.api.Plugin;
+import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import javax.inject.Inject;
+
+/**
+ * Defines the Dependencies module plugin for {@link Project projects}
+ */
 public class DependenciesProjectPlugin implements Plugin<Project> {
 
+    /**
+     * Creates a new plugin instance.
+     */
+    @Inject
+    public DependenciesProjectPlugin() {
+    }
+
     @Override
     public void apply(@NotNull Project target) {
         target.getPlugins().apply(JavaLibraryPlugin.class);
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
index d2d53d0..742cfe9 100644
--- a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/extensions/DependenciesExtension.java
@@ -1,32 +1,46 @@
 package com.ldtteam.tableau.dependencies.extensions;
 
+import com.ldtteam.tableau.dependencies.model.ModDependency;
+import com.ldtteam.tableau.dependencies.util.DependencyResolver;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.dsl.Dependencies;
 import org.gradle.api.artifacts.dsl.DependencyCollector;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 
 import javax.inject.Inject;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * The Dependencies extension for the Tableau project.
  * <p>
  * Provides a way to register mod dependencies as project and Neogradle dependencies.
  */
-public abstract class DependenciesExtension implements Dependencies
-{
+public abstract class DependenciesExtension implements Dependencies {
 
     /**
      * The name of the extension.
      */
     public static final String EXTENSION_NAME = "modDependencies";
+
+    /**
+     * The project this extension is added to.
+     */
     private final Project project;
 
+    /**
+     * Creates a new extension for the given project.
+     *
+     * @param project The project to create the extension for.
+     */
     @Inject
-    public DependenciesExtension(final Project project)
-    {
+    public DependenciesExtension(final Project project) {
         this.project = project;
 
         final SourceSet mainSourceSet = project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME);
@@ -42,28 +56,64 @@ public DependenciesExtension(final Project project)
      * @param project The project.
      * @return The git extension.
      */
-    public static DependenciesExtension get(final Project project)
-    {
+    public static DependenciesExtension get(final Project project) {
         return TableauScriptingExtension.get(project, DependenciesExtension.class);
     }
 
     /**
      * Get the required dependencies.
+     *
+     * @return The dependency collector for required mods.
      */
     public abstract DependencyCollector getRequired();
 
+    /**
+     * Get the required runtime dependencies.
+     *
+     * @return A set property containing all the required runtime mods.
+     */
+    public abstract SetProperty<ModDependency> getRequiredRuntimeMods();
+
+    /**
+     * Add a required runtime dependency.
+     *
+     * @param modId        The mod id for the dependency.
+     * @param versionRange The version range for the dependency.
+     */
+    public void requiredRuntime(final String modId, final String versionRange) {
+        getRequiredRuntimeMods().add(new ModDependency(modId, versionRange, true));
+    }
+
     /**
      * Get the optional dependencies.
+     *
+     * @return The dependency collector for optional mods.
      */
     public abstract DependencyCollector getOptional();
 
+    /**
+     * Get the optional runtime dependencies.
+     *
+     * @return A set property containing all the optional runtime mods.
+     */
+    public abstract SetProperty<ModDependency> getOptionalRuntimeMods();
+
+    /**
+     * Add an optional runtime dependency.
+     *
+     * @param modId        The mod id for the dependency.
+     * @param versionRange The version range for the dependency.
+     */
+    public void optionalRuntime(final String modId, final String versionRange) {
+        getOptionalRuntimeMods().add(new ModDependency(modId, versionRange, true));
+    }
+
     /**
      * Get the configuration for the required dependencies.
      *
      * @return The configuration instance.
      */
-    public Configuration getRequiredConfiguration()
-    {
+    public Configuration getRequiredConfiguration() {
         final Configuration configuration = project.getConfigurations().detachedConfiguration();
         configuration.fromDependencyCollector(getRequired());
         return configuration;
@@ -74,10 +124,31 @@ public Configuration getRequiredConfiguration()
      *
      * @return The configuration instance.
      */
-    public Configuration getOptionalConfiguration()
-    {
+    public Configuration getOptionalConfiguration() {
         final Configuration configuration = project.getConfigurations().detachedConfiguration();
         configuration.fromDependencyCollector(getOptional());
         return configuration;
     }
+
+    /**
+     * Get all the required dependencies, combined {@link DependenciesExtension#getRequired()} and {@link DependenciesExtension#getRequiredRuntimeMods()}.
+     *
+     * @return The combined set of dependencies.
+     */
+    public Provider<Set<ModDependency>> getAllRequiredDependencies() {
+        final Provider<Set<ModDependency>> requiredDependencies = DependencyResolver.resolveDependencies(getRequiredConfiguration(), true);
+
+        return requiredDependencies.zip(getRequiredRuntimeMods(), (a, b) -> Stream.concat(a.stream(), b.stream()).collect(Collectors.toSet()));
+    }
+
+    /**
+     * Get all the optional dependencies, combined {@link DependenciesExtension#getOptional()} and {@link DependenciesExtension#getOptionalRuntimeMods()}.
+     *
+     * @return The combined set of dependencies.
+     */
+    public Provider<Set<ModDependency>> getAllOptionalDependencies() {
+        final Provider<Set<ModDependency>> optionalDependencies = DependencyResolver.resolveDependencies(getOptionalConfiguration(), false);
+
+        return optionalDependencies.zip(getOptionalRuntimeMods(), (a, b) -> Stream.concat(a.stream(), b.stream()).collect(Collectors.toSet()));
+    }
 }
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/CombinedDependencyData.java
similarity index 71%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java
rename to modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/CombinedDependencyData.java
index a565cf6..110dda9 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/CombinedDependency.java
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/CombinedDependencyData.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.neogradle.model;
+package com.ldtteam.tableau.dependencies.model;
 
 import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.artifacts.result.ResolvedComponentResult;
@@ -11,6 +11,6 @@
  * @param artifacts The set of the resolved artifacts.
  * @param component The resolved component result.
  */
-public record CombinedDependency(Set<ResolvedArtifactResult> artifacts, ResolvedComponentResult component)
+public record CombinedDependencyData(Set<ResolvedArtifactResult> artifacts, ResolvedComponentResult component)
 {
 }
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ModDependency.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ModDependency.java
new file mode 100644
index 0000000..a65c049
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ModDependency.java
@@ -0,0 +1,11 @@
+package com.ldtteam.tableau.dependencies.model;
+
+/**
+ * A container class for holding a runtime dependency that can be used by other modules.
+ *
+ * @param modId        The mod identifier.
+ * @param versionRange The version range for the mod.
+ * @param required     If the dependency is required or optional.
+ */
+public record ModDependency(String modId, String versionRange, boolean required) {
+}
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ResolvedDependencyData.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ResolvedDependencyData.java
new file mode 100644
index 0000000..ff9558a
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/model/ResolvedDependencyData.java
@@ -0,0 +1,12 @@
+package com.ldtteam.tableau.dependencies.model;
+
+import java.io.File;
+
+/**
+ * Dependency information container, contains the dependency identifier and the original jar file.
+ *
+ * @param versionRange The version range of the dependency.
+ * @param file         The jar file.
+ */
+public record ResolvedDependencyData(String versionRange, File file) {
+}
diff --git a/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/util/DependencyResolver.java b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/util/DependencyResolver.java
new file mode 100644
index 0000000..74d0539
--- /dev/null
+++ b/modules/dependencies/src/main/java/com/ldtteam/tableau/dependencies/util/DependencyResolver.java
@@ -0,0 +1,138 @@
+package com.ldtteam.tableau.dependencies.util;
+
+import com.electronwill.nightconfig.core.UnmodifiableCommentedConfig;
+import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.toml.TomlFormat;
+import com.ldtteam.tableau.dependencies.model.CombinedDependencyData;
+import com.ldtteam.tableau.dependencies.model.ModDependency;
+import com.ldtteam.tableau.dependencies.model.ResolvedDependencyData;
+import net.neoforged.fml.loading.moddiscovery.NightConfigWrapper;
+import net.neoforged.neoforgespi.language.IConfigurable;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentSelector;
+import org.gradle.api.artifacts.result.DependencyResult;
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
+import org.gradle.api.artifacts.result.ResolvedComponentResult;
+import org.gradle.api.provider.Provider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Utility class for helping resolving dependencies data.
+ */
+public class DependencyResolver {
+
+    /**
+     * Logger instance.
+     */
+    private static final Logger LOGGER = LoggerFactory.getLogger(DependencyResolver.class);
+
+    /**
+     * Utility class, not meant to be instantiated.
+     */
+    private DependencyResolver() {
+    }
+
+    /**
+     * Find all the resolved dependencies.
+     *
+     * @param configuration The configuration to look for dependencies in.
+     * @param required      Whether this dependency is required or not.
+     * @return The set provider.
+     */
+    public static Provider<Set<ModDependency>> resolveDependencies(final Configuration configuration, final boolean required) {
+        final Provider<CombinedDependencyData> combinedDependencyData = configuration.getIncoming().getArtifacts().getResolvedArtifacts()
+                .zip(configuration.getIncoming().getResolutionResult().getRootComponent(), CombinedDependencyData::new);
+
+        final Provider<Set<ResolvedDependencyData>> resolvedDependencies = combinedDependencyData.map(dependency -> dependency.artifacts().stream()
+                .map(artifact -> resolveDependency(artifact, dependency.component()))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet()));
+
+        return resolvedDependencies.map(m -> m.stream()
+                .flatMap(fm -> getModInfos(fm, required).stream())
+                .collect(Collectors.toSet()));
+    }
+
+    @Nullable
+    private static ResolvedDependencyData resolveDependency(final ResolvedArtifactResult resolvedArtifact, final ResolvedComponentResult component) {
+        final String versionRange = component.getDependencies().stream()
+                .map(DependencyResult::getRequested)
+                .filter(f -> f instanceof ModuleComponentSelector)
+                .map(ModuleComponentSelector.class::cast)
+                .filter(f -> componentMatches(f, resolvedArtifact))
+                .map(m -> m.getVersionConstraint().getRequiredVersion())
+                .findFirst()
+                .orElse(null);
+        if (versionRange == null) {
+            return null;
+        }
+
+        return new ResolvedDependencyData(versionRange, resolvedArtifact.getFile());
+    }
+
+    /**
+     * Check whether the given component selector matches the provided resolved artifact.
+     *
+     * @param selector The input component selector.
+     * @param artifact The resolved artifact.
+     * @return True if the artifact identifier matches the component selector.
+     */
+    private static boolean componentMatches(final ModuleComponentSelector selector, final ResolvedArtifactResult artifact) {
+        if (artifact.getId().getComponentIdentifier() instanceof ModuleComponentIdentifier artifactIdentifier) {
+            return selector.getModuleIdentifier().equals(artifactIdentifier.getModuleIdentifier());
+        }
+        return false;
+    }
+
+    /**
+     * Get a list of mod information classes for the given jar file.
+     *
+     * @param data     The input dependency data.
+     * @param required Whether this dependency is required or not.
+     * @return The list of mod info instances, or an empty list if no mods were found in the jar.
+     */
+    @NotNull
+    private static List<ModDependency> getModInfos(final ResolvedDependencyData data, final boolean required) {
+        try (final FileSystem fileSystem = FileSystems.newFileSystem(data.file().toPath())) {
+            final Path path = fileSystem.getPath("META-INF/neoforge.mods.toml");
+            if (!Files.exists(path)) {
+                return List.of();
+            }
+
+            final FileConfig fileConfig = FileConfig.builder(path).build();
+            fileConfig.load();
+            fileConfig.close();
+            final TomlFormat format = TomlFormat.instance();
+            final UnmodifiableCommentedConfig unmodifiableConfig = format.createParser().parse(format.createWriter().writeToString(fileConfig)).unmodifiable();
+            final NightConfigWrapper configWrapper = new NightConfigWrapper(unmodifiableConfig);
+
+            final List<ModDependency> modInfos = new ArrayList<>();
+            for (final IConfigurable config : configWrapper.getConfigList("mods")) {
+                final Optional<String> modId = config.getConfigElement("modId");
+                if (modId.isPresent()) {
+                    LOGGER.info("Obtained the mod info for jar \"{}\", found mod with modId \"{}\"", data.file().getName(), modId.get());
+                    modInfos.add(new ModDependency(modId.get(), data.versionRange(), required));
+                }
+            }
+            return Collections.unmodifiableList(modInfos);
+        } catch (Exception ex) {
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.warn("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file. Reason:", data.file().getName(), ex);
+            } else {
+                LOGGER.warn("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file.", data.file().getName());
+            }
+            return List.of();
+        }
+    }
+}
diff --git a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
index a7f806a..f31d5ee 100644
--- a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
+++ b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
@@ -3,7 +3,7 @@
  */
 package com.ldtteam.tableau.jarjar;
 
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.jarjar.extensions.JarJarExtension;
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
diff --git a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
index 8e4bb36..b8fe0ec 100644
--- a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
+++ b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
@@ -1,6 +1,6 @@
 package com.ldtteam.tableau.jarjar.extensions;
 
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
 import org.gradle.api.Project;
 import org.gradle.api.provider.Property;
 
diff --git a/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java b/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
index 4fe109e..35b3535 100644
--- a/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
+++ b/modules/maven-publishing/src/main/java/com/ldtteam/tableau/maven/publishing/MavenPublishingExtension.java
@@ -15,10 +15,7 @@
 
 import javax.inject.Inject;
 import java.net.URI;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 /**
  * Extension that configures the Maven publishing plugin.
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
index 6f0b659..1eb2715 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -7,12 +7,10 @@
 import com.google.common.collect.Multimap;
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
-import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
-import com.ldtteam.tableau.extensions.NeoGradleSourceSetConfigurationExtension;
-import com.ldtteam.tableau.neogradle.model.CombinedDependency;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleResourceProcessingExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleSourceSetConfigurationExtension;
 import com.ldtteam.tableau.neogradle.tasks.GenerateModsTomlTask;
-import com.ldtteam.tableau.neogradle.model.ResolvedDependency;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
@@ -26,12 +24,6 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Rule;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
-import org.gradle.api.artifacts.component.ModuleComponentSelector;
-import org.gradle.api.artifacts.result.DependencyResult;
-import org.gradle.api.artifacts.result.ResolvedArtifactResult;
-import org.gradle.api.internal.provider.BiProvider;
-import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.*;
 import org.gradle.language.jvm.tasks.ProcessResources;
 import org.jetbrains.annotations.NotNull;
@@ -356,8 +348,8 @@ private void configureModsTomlGeneration(final Project project) {
             task.getIssueTrackerUrl().set(mod.getIssueTrackerUrl());
             task.getLicense().set(mod.getLicense());
 
-            task.getRequiredDependencies().set(resolveDependencies(dependencies.getRequiredConfiguration()));
-            task.getOptionalDependencies().set(resolveDependencies(dependencies.getOptionalConfiguration()));
+            task.getRequiredDependencies().set(dependencies.getAllRequiredDependencies());
+            task.getOptionalDependencies().set(dependencies.getAllOptionalDependencies());
         });
 
         if (neogradle.getAutoGenerateModsToml().get()) {
@@ -368,47 +360,4 @@ private void configureModsTomlGeneration(final Project project) {
             });
         }
     }
-
-    /**
-     * Find all the resolved dependencies.
-     *
-     * @param configuration The configuration to look for dependencies in.
-     * @return The set provider.
-     */
-    private Provider<List<ResolvedDependency>> resolveDependencies(final Configuration configuration)
-    {
-        return new BiProvider<>(CombinedDependency.class,
-          configuration.getIncoming().getArtifacts().getResolvedArtifacts(),
-          configuration.getIncoming().getResolutionResult().getRootComponent(),
-          CombinedDependency::new).map(dependency -> dependency.artifacts()
-                                                       .stream()
-                                                       .map(resolvedArtifact -> new ResolvedDependency(dependency.component()
-                                                                                                         .getDependencies()
-                                                                                                         .stream()
-                                                                                                         .map(DependencyResult::getRequested)
-                                                                                                         .filter(f -> f instanceof ModuleComponentSelector)
-                                                                                                         .map(ModuleComponentSelector.class::cast)
-                                                                                                         .filter(f -> componentMatches(f, resolvedArtifact))
-                                                                                                         .map(m -> m.getVersionConstraint().getRequiredVersion())
-                                                                                                         .findFirst()
-                                                                                                         .orElse(null), resolvedArtifact.getFile()))
-                                                       .filter(f -> f.getVersionRange() != null)
-                                                       .toList());
-    }
-
-    /**
-     * Check whether the given component selector matches the provided resolved artifact.
-     *
-     * @param selector The input component selector.
-     * @param artifact The resolved artifact.
-     * @return True if the artifact identifier matches the component selector.
-     */
-    private static boolean componentMatches(final ModuleComponentSelector selector, final ResolvedArtifactResult artifact)
-    {
-        if (artifact.getId().getComponentIdentifier() instanceof ModuleComponentIdentifier artifactIdentifier)
-        {
-            return selector.getModuleIdentifier().equals(artifactIdentifier.getModuleIdentifier());
-        }
-        return false;
-    }
 }
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java
similarity index 97%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java
index fab1135..58a6a9d 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.extensions;
+package com.ldtteam.tableau.neogradle.extensions;
 
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.common.extensions.VersioningExtension;
@@ -124,6 +124,8 @@ public void interfaceInjection(Object file) {
     public abstract Property<String> getNeoForgeVersion();
 
     /**
+     * Whether to automatically build the neoforge.mods.toml or not.
+     *
      * @return Whether to automatically generate a neoforge.mods.toml during build.
      */
     public abstract Property<Boolean> getAutoGenerateModsToml();
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java
similarity index 99%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java
index b4acbeb..3bad818 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.extensions;
+package com.ldtteam.tableau.neogradle.extensions;
 
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java
similarity index 97%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java
index f73f808..d50b485 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.extensions;
+package com.ldtteam.tableau.neogradle.extensions;
 
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
 import org.gradle.api.Project;
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
deleted file mode 100644
index 35ff220..0000000
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ParsedBasicModInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.ldtteam.tableau.neogradle.model;
-
-/**
- * Basic mod information parsed directly from the jar.
- *
- * @param modId   The mod identifier.
- * @param version The version of the mod.
- */
-public record ParsedBasicModInfo(String modId, String version)
-{
-}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
deleted file mode 100644
index 3b375d7..0000000
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/model/ResolvedDependency.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ldtteam.tableau.neogradle.model;
-
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
-
-import java.io.File;
-
-/**
- * Dependency information container, contains the dependency identifier and the original jar file.
- */
-@SuppressWarnings("ClassCanBeRecord") // Because of Gradle configuration cache this file cannot be converted to a record due to missing getters.
-public class ResolvedDependency
-{
-    /**
-     * The version range of the dependency.
-     */
-    private final String versionRange;
-
-    /**
-     * The jar file.
-     */
-    private final File file;
-
-    /**
-     * Default constructor.
-     *
-     * @param versionRange The version range of the dependency.
-     * @param file         The jar file.
-     */
-    public ResolvedDependency(final String versionRange, final File file)
-    {
-        this.versionRange = versionRange;
-        this.file = file;
-    }
-
-    /**
-     * Get the version range of the dependency.
-     *
-     * @return the maven version range.
-     */
-    @Input
-    public String getVersionRange()
-    {
-        return versionRange;
-    }
-
-    /**
-     * Get the jar file.
-     *
-     * @return the file in classpath where the jar is located.
-     */
-    @InputFile
-    @PathSensitive(PathSensitivity.NONE)
-    public File getFile()
-    {
-        return file;
-    }
-}
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
index 936a29d..dac3c61 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/tasks/GenerateModsTomlTask.java
@@ -1,13 +1,7 @@
 package com.ldtteam.tableau.neogradle.tasks;
 
-import com.electronwill.nightconfig.core.UnmodifiableCommentedConfig;
-import com.electronwill.nightconfig.core.file.FileConfig;
-import com.electronwill.nightconfig.toml.TomlFormat;
+import com.ldtteam.tableau.dependencies.model.ModDependency;
 import com.ldtteam.tableau.neogradle.model.ModsTomlDependency;
-import com.ldtteam.tableau.neogradle.model.ParsedBasicModInfo;
-import com.ldtteam.tableau.neogradle.model.ResolvedDependency;
-import net.neoforged.fml.loading.moddiscovery.NightConfigWrapper;
-import net.neoforged.neoforgespi.language.IConfigurable;
 import net.neoforged.neoforgespi.language.IModInfo.Ordering;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.gradle.api.DefaultTask;
@@ -20,22 +14,24 @@
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.file.*;
-import java.util.*;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.util.Set;
 
 /**
  * Task for automatically generating the neoforge.mods.toml based on input data.
  */
-public abstract class GenerateModsTomlTask extends DefaultTask
-{
-    public GenerateModsTomlTask()
-    {
+public abstract class GenerateModsTomlTask extends DefaultTask {
+
+    /**
+     * Creates a new task instance.
+     */
+    public GenerateModsTomlTask() {
         setGroup("neogradle");
         setDescription("Generate the neoforge.mods.toml file");
 
@@ -44,21 +40,22 @@ public GenerateModsTomlTask()
         getOutputs().file(outputFile);
     }
 
+    /**
+     * Executes the task and generates the neoforge.mods.toml file.
+     *
+     * @throws IOException when a failure occurs during the attempt to write the text to the file.
+     */
     @TaskAction
-    public void generateModsToml() throws IOException
-    {
+    public void generateModsToml() throws IOException {
         final File modsTomlFile = getOutputFile().get().getAsFile();
-        if (modsTomlFile.exists())
-        {
-            if (!modsTomlFile.delete())
-            {
+        if (modsTomlFile.exists()) {
+            if (!modsTomlFile.delete()) {
                 getLogger().warn("Could not delete old neoforge.mods.toml, will keep using old file.");
                 return;
             }
         }
 
-        try (final BufferedWriter writer = Files.newBufferedWriter(modsTomlFile.toPath(), StandardOpenOption.CREATE_NEW))
-        {
+        try (final BufferedWriter writer = Files.newBufferedWriter(modsTomlFile.toPath(), StandardOpenOption.CREATE_NEW)) {
             writeHeader(writer);
             writeLine(writer, "modLoader=\"javafml\"");
             writeLine(writer, String.format("loaderVersion=\"[%d,)\"", 4));
@@ -81,27 +78,22 @@ public void generateModsToml() throws IOException
 
             writeDependency(writer, new ModsTomlDependency("neoforge", String.format("[%s,)", getNeoforgeVersion().get()), true, Ordering.NONE));
             writeDependency(writer, new ModsTomlDependency("minecraft", String.format("[%s,%s)", mcVersion, nextMcMajorVersion), true, Ordering.NONE));
-            writeDependencies(writer, getRequiredDependencies().get());
-            writeDependencies(writer, getOptionalDependencies().get());
+            writeDependencies(writer, getRequiredDependencies().get(), true);
+            writeDependencies(writer, getOptionalDependencies().get(), false);
         }
     }
 
     /**
-     * Write the list of dependencies to the output of the neoforge.mods.toml.
+     * Write the list of dependencies to the output of the neoforge.mods.toml from runtime dependencies.
      *
      * @param writer       The buffered writer.
      * @param dependencies The set of dependencies.
+     * @param required     Whether these are required or optional dependencies.
      * @throws IOException If an exception is thrown during writing.
      */
-    private void writeDependencies(final BufferedWriter writer, final Set<ResolvedDependency> dependencies) throws IOException
-    {
-        for (final ResolvedDependency dependency : dependencies)
-        {
-            final List<ParsedBasicModInfo> modInfos = getModInfos(dependency.getFile());
-            for (final ParsedBasicModInfo modInfo : modInfos)
-            {
-                writeDependency(writer, new ModsTomlDependency(modInfo.modId(), dependency.getVersionRange(), true, Ordering.AFTER));
-            }
+    private void writeDependencies(final BufferedWriter writer, final Set<ModDependency> dependencies, final boolean required) throws IOException {
+        for (final ModDependency dependency : dependencies) {
+            writeDependency(writer, new ModsTomlDependency(dependency.modId(), dependency.versionRange(), required, Ordering.AFTER));
         }
     }
 
@@ -111,8 +103,7 @@ private void writeDependencies(final BufferedWriter writer, final Set<ResolvedDe
      * @param writer The buffered writer.
      * @throws IOException If an exception is thrown during writing.
      */
-    private void writeHeader(final BufferedWriter writer) throws IOException
-    {
+    private void writeHeader(final BufferedWriter writer) throws IOException {
         writeLine(writer, "# This file is automatically generated by Tableau.");
         writeLine(writer, "# If anything is wrong with this file and Tableau has no option to fix this,");
         writeLine(writer, "# you may disable automatic generation by writing:");
@@ -133,8 +124,7 @@ private void writeHeader(final BufferedWriter writer) throws IOException
      * @param writer The buffered writer.
      * @throws IOException If an exception is thrown during writing.
      */
-    private void writeDependency(final BufferedWriter writer, final ModsTomlDependency dependency) throws IOException
-    {
+    private void writeDependency(final BufferedWriter writer, final ModsTomlDependency dependency) throws IOException {
         writeLine(writer, String.format("[[dependencies.%s]]", getModId().get()));
         writeLine(writer, String.format("\tmodId=\"%s\"", dependency.modId()));
         writeLine(writer, String.format("\ttype=\"%s\"", dependency.required() ? "required" : "optional"));
@@ -146,142 +136,118 @@ private void writeDependency(final BufferedWriter writer, final ModsTomlDependen
     /**
      * Internal line write method.
      */
-    private void writeLine(final BufferedWriter writer, final String content) throws IOException
-    {
+    private void writeLine(final BufferedWriter writer, final String content) throws IOException {
         writer.write(content);
         writer.newLine();
     }
 
     /**
-     * Get a list of mod information classes for the given jar file.
+     * Get the Neoforge version.
      *
-     * @param file The input jar file.
-     * @return The list of mod info instances, or an empty list if no mods were found in the jar.
-     */
-    @NotNull
-    private List<ParsedBasicModInfo> getModInfos(final File file)
-    {
-        try (final FileSystem fileSystem = FileSystems.newFileSystem(file.toPath()))
-        {
-            final Path path = fileSystem.getPath("META-INF/neoforge.mods.toml");
-            if (!Files.exists(path))
-            {
-                return List.of();
-            }
-
-            final FileConfig fileConfig = FileConfig.builder(path).build();
-            fileConfig.load();
-            fileConfig.close();
-            final TomlFormat format = TomlFormat.instance();
-            final UnmodifiableCommentedConfig unmodifiableConfig = format.createParser().parse(format.createWriter().writeToString(fileConfig)).unmodifiable();
-            final NightConfigWrapper configWrapper = new NightConfigWrapper(unmodifiableConfig);
-
-            final List<ParsedBasicModInfo> modInfos = new ArrayList<>();
-            for (final IConfigurable config : configWrapper.getConfigList("mods"))
-            {
-                final Optional<String> modId = config.getConfigElement("modId");
-                final Optional<String> modVersion = config.getConfigElement("version");
-                if (modId.isPresent() && modVersion.isPresent())
-                {
-                    getLogger().lifecycle("Obtained the mod info for jar \"{}\", found mod with modId \"{}\"", file.getName(), modId.get());
-                    modInfos.add(new ParsedBasicModInfo(modId.get(), modVersion.get()));
-                }
-            }
-            return Collections.unmodifiableList(modInfos);
-        }
-        catch (Exception ex)
-        {
-            if (getLogger().isDebugEnabled())
-            {
-                getLogger().lifecycle("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file. Reason:", file.getName(), ex);
-            }
-            else
-            {
-                getLogger().lifecycle("Failure obtaining the mod info for jar \"{}\", the provided jar doesn't seem to be a Neoforge mod file.", file.getName());
-            }
-            return List.of();
-        }
-    }
-
-    /**
      * @return The Neoforge version.
      */
     @Input
     public abstract Property<String> getNeoforgeVersion();
 
     /**
+     * Get the Minecraft version.
+     *
      * @return The Minecraft version.
      */
     @Input
     public abstract Property<String> getMinecraftVersion();
 
     /**
+     * Get the mod id.
+     *
      * @return The mod id.
      */
     @Input
     public abstract Property<String> getModId();
 
     /**
+     * Get the mod display name.
+     *
      * @return The mod display name.
      */
     @Input
     public abstract Property<String> getModName();
 
     /**
+     * Get the mod description.
+     *
      * @return The mod description.
      */
     @Input
     public abstract Property<String> getModDescription();
 
     /**
+     * Get the mod logo.
+     *
      * @return The mod logo.
      */
     @Input
     public abstract Property<String> getModLogo();
 
     /**
+     * Get the version of the mod.
+     *
      * @return The version of the mod.
      */
     @Input
     public abstract Property<String> getModVersion();
 
     /**
+     * Get the mod publisher.
+     *
      * @return The mod publisher.
      */
     @Input
     public abstract Property<String> getPublisher();
 
     /**
+     * Get the website for the mod.
+     *
      * @return The website for the mod.
      */
     @Input
     public abstract Property<URI> getDisplayUrl();
 
     /**
+     * Get the issue tracker url, where issues may be filed for the mod.
+     *
      * @return The issue tracker url, where issues may be filed for the mod.
      */
     @Input
     public abstract Property<URI> getIssueTrackerUrl();
 
     /**
+     * Get the license used for the mod.
+     *
      * @return The license used for the mod.
      */
     @Input
     public abstract Property<String> getLicense();
 
     /**
+     * Get the required mod dependencies.
+     *
      * @return The required mod dependencies.
      */
     @Nested
-    public abstract SetProperty<ResolvedDependency> getRequiredDependencies();
+    public abstract SetProperty<ModDependency> getRequiredDependencies();
 
     /**
+     * Get the optional mod dependencies.
+     *
      * @return The optional mod dependencies.
      */
     @Nested
-    public abstract SetProperty<ResolvedDependency> getOptionalDependencies();
+    public abstract SetProperty<ModDependency> getOptionalDependencies();
 
     /**
+     * Get the destination file for the mods toml.
+     *
      * @return The destination file for the mods toml.
      */
     @OutputFile
diff --git a/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java b/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
index 04a4e21..4e42fb0 100644
--- a/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
+++ b/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
@@ -6,7 +6,7 @@
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin;
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar;
-import com.ldtteam.tableau.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import com.ldtteam.tableau.shadowing.extensions.ShadowingExtension;
diff --git a/website/docs/03-guides/01-neoforge-configuration.mdx b/website/docs/03-guides/01-neoforge-configuration.mdx
index 5045ecd..ad75f75 100644
--- a/website/docs/03-guides/01-neoforge-configuration.mdx
+++ b/website/docs/03-guides/01-neoforge-configuration.mdx
@@ -15,6 +15,7 @@ We will cover the following topics:
 - Creating a library instead of a mod
 - Using a random player name
 - Setting the primary jars classifier
+- Creating the neoforge.mods.toml file
 
 :::info
 All sections of this guide will happen in the `neogradle` block of the Tableau DSL.
@@ -243,3 +244,46 @@ tableau {
 ```
 </TabItem>
 </Tabs>
+
+## Creating the neoforge.mods.toml
+
+The `neoforge.mods.toml` file is required for Neoforge to locate important information regarding your mod, like the mod identifier, name, logo, etc.
+
+Tableau can automatically generate this file with zero additional effort required from the developers.
+All you have to do is merely fill in the required fields in the `mod` extension for Tableau and the rest is history.
+
+You may opt out of this generation in case you need to manage it yourself for any reason, in this case you can add:
+
+<Tabs groupId="gradle-code">
+    <TabItem value="groovy" label="Groovy">
+        ```groovy title="build.gradle"
+        tableau {
+            neogradle {
+                autoGenerateModsToml = false
+            }
+        }
+        ```
+    </TabItem>
+    <TabItem value="kotlin" label="Kotlin">
+        ```kotlin title="build.gradle.kts"
+        tableau {
+            neogradle {
+                autoGenerateModsToml.set(false)
+            }
+        }
+        ```
+    </TabItem>
+</Tabs>
+
+After that you can manually add the `neoforge.mods.toml` in your `resources/META-INF` folder.
+After which you can use [resource interpolation](interpolate-resources) to fill the file with the correct data.
+
+### Automatic dependency management
+
+The `neoforge.mods.toml` dependencies section can be automatically generated if you are using the [mod dependencies](managing-dependencies) block,
+all mod dependencies defined here will automatically be added to the `neoforge.mods.toml` as well, next to the default information that is already provided.
+
+:::warning
+This feature uses FML to take a look inside the jar file when it's downloaded by Gradle. When a mod does not properly provide a `neoforge.mods.toml` file in their JAR
+Tableau will be unable to register this as a valid mod dependency, and the dependency will not be added to the `neoforge.mods.toml`.
+:::
diff --git a/website/docs/03-guides/02-managing-dependencies.mdx b/website/docs/03-guides/02-managing-dependencies.mdx
new file mode 100644
index 0000000..410942f
--- /dev/null
+++ b/website/docs/03-guides/02-managing-dependencies.mdx
@@ -0,0 +1,117 @@
+---
+sidebar_label: Managing dependencies
+title: Managing dependencies
+slug: managing-dependencies
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+Tableau has automatic dependency management that works just like regular Gradle dependency management.
+You can define a mod dependencies block that Gradle will use to automatically resolve mod dependencies,
+but these dependencies will also be used for other use-cases from other modules.
+
+Whilst this dependencies block is a regular dependency collector, it's meant specifically for putting mod dependencies here.
+Nothing prevents you from putting other dependencies here, like regular `implementation` dependencies, however we recommend
+you put these in the default `dependencies` block, as you normally would.
+
+## Dependency management
+
+In order to start defining the dependencies you have to define the dependencies block:
+
+<Tabs groupId="gradle-code">
+    <TabItem value="groovy" label="Groovy">
+        ```groovy title="build.gradle"
+        tableau {
+            modDependencies {
+                // Fill in your mod dependencies
+            }
+        }
+        ```
+    </TabItem>
+    <TabItem value="kotlin" label="Kotlin">
+        ```kotlin title="build.gradle.kts"
+        tableau {
+            modDependencies {
+                // Fill in your mod dependencies
+            }
+        }
+        ```
+    </TabItem>
+</Tabs>
+
+The dependencies block supports two types of dependencies: `required` and `optional` dependencies.
+Both of these are defined the same way as any other dependency in Gradle, meaning you can do:
+
+<Tabs groupId="gradle-code">
+    <TabItem value="groovy" label="Groovy">
+        ```groovy title="build.gradle"
+        tableau {
+            modDependencies {
+                required 'com.ldtteam:structurize:[1.0.755-1.21.1-snapshot,)'
+                // Or
+                optional 'com.ldtteam:structurize:[1.0.755-1.21.1-snapshot,)'
+            }
+        }
+        ```
+    </TabItem>
+    <TabItem value="kotlin" label="Kotlin">
+        ```kotlin title="build.gradle.kts"
+        tableau {
+            modDependencies {
+                required("com.ldtteam:structurize:[1.0.755-1.21.1-snapshot,)")
+                // Or
+                optional("com.ldtteam:structurize:[1.0.755-1.21.1-snapshot,)")
+            }
+        }
+        ```
+    </TabItem>
+</Tabs>
+
+## Runtime dependencies
+
+The above way of defining dependencies doesn't always work, some mods split their code in an API mod, and the mod itself.
+Examples of this are mods like [JEI](https://github.com/mezz/JustEnoughItems/wiki) or [JourneyMap](https://bitbucket.org/TeamJM/journeymap-api/src/master/docs/howto.md).
+
+If you attempt to define these as a required or optional mod you will get the API package as a dependency,
+though other modules like the `neoforge.mods.toml` will incorrectly register these API packages as dependencies, instead of the actual mod.
+
+For these scenarios you can add runtime dependencies into the mod dependencies block.
+These use a slightly different API as these are not compile dependencies,
+these dependencies are only meant to be registered in the `neoforge.mods.toml` and/or Curseforge.
+You then provide the API package as a separate `compileOnly` dependency.
+
+<Tabs groupId="gradle-code">
+    <TabItem value="groovy" label="Groovy">
+        ```groovy title="build.gradle"
+        dependencies {
+            compileOnly 'mezz.jei:jei-1.21.1-neoforge-api:[19.19.6.235,)'
+        }
+
+        tableau {
+            modDependencies {
+                requiredRuntime 'jei', '[19.19.6.235,)'
+                // Or
+                optionalRuntime 'jei', '[19.19.6.235,)'
+            }
+        }
+        ```
+    </TabItem>
+    <TabItem value="kotlin" label="Kotlin">
+        ```kotlin title="build.gradle.kts"
+        dependencies {
+            compileOnly("mezz.jei:jei-1.21.1-neoforge-api:[19.19.6.235,)")
+        }
+
+        tableau {
+            modDependencies {
+                requiredRuntime("jei", "[19.19.6.235,)")
+                // Or
+                optionalRuntime("jei", "[19.19.6.235,)")
+            }
+        }
+        ```
+    </TabItem>
+</Tabs>
+
+This way you can still use all Tableau its features that rely on mod dependencies without having to resort to manually configuring them.
diff --git a/website/docs/03-guides/02-custom-source-sets.mdx b/website/docs/03-guides/03-custom-source-sets.mdx
similarity index 100%
rename from website/docs/03-guides/02-custom-source-sets.mdx
rename to website/docs/03-guides/03-custom-source-sets.mdx
diff --git a/website/docs/03-guides/03-publish-to-curseforge.mdx b/website/docs/03-guides/04-publish-to-curseforge.mdx
similarity index 92%
rename from website/docs/03-guides/03-publish-to-curseforge.mdx
rename to website/docs/03-guides/04-publish-to-curseforge.mdx
index 241fb2e..dfd9a81 100644
--- a/website/docs/03-guides/03-publish-to-curseforge.mdx
+++ b/website/docs/03-guides/04-publish-to-curseforge.mdx
@@ -207,10 +207,11 @@ If your mod has a relationship with another project you can configure these rela
 Available relationships are:
 - `embeddedLibrary` -> This project is a library that is embedded in your project. Users do not need to download this library separately.
 - `incompatible` -> This project is incompatible with your project. Users should not use these projects together.
-- `optionalDependency` -> This project is an optional dependency of your project. Users can use this project with your project, but it is not required.
-- `requiredDependency` -> This project is a required dependency of your project. Users need to download this project separately.
 - `tool` -> This project is a tool that is used by your project. Users can download this project separately.
 
+There are two more types of relationships: `requiredDependency` and `optionalDependency`, however these are not manually configurable here.
+These are provided through the [mod dependencies](managing-dependencies) block.
+
 To configure these relationships, you can use the `relationships` property of the CurseForge module:
 
 <Tabs groupId="gradle-code">
@@ -221,8 +222,6 @@ tableau {
         relationships {
             embeddedLibrary("MyLibrary") // This project is a library that is embedded in your project
             incompatible("IncompatibleMod") // This project is incompatible with your project
-            optionalDependency("OptionalMod") // This project is an optional dependency of your project
-            requiredDependency("RequiredMod") // This project is a required dependency of your project
             tool("ToolMod") // This project is a tool that is used by your project
         }
     }
@@ -236,8 +235,6 @@ tableau {
         relationships {
             embeddedLibrary("MyLibrary") // This project is a library that is embedded in your project
             incompatible("IncompatibleMod") // This project is incompatible with your project
-            optionalDependency("OptionalMod") // This project is an optional dependency of your project
-            requiredDependency("RequiredMod") // This project is a required dependency of your project
             tool("ToolMod") // This project is a tool that is used by your project
         }
     }
diff --git a/website/docs/03-guides/04-publishing-to-maven.mdx b/website/docs/03-guides/05-publishing-to-maven.mdx
similarity index 100%
rename from website/docs/03-guides/04-publishing-to-maven.mdx
rename to website/docs/03-guides/05-publishing-to-maven.mdx
diff --git a/website/docs/03-guides/05-interpolate-resources.mdx b/website/docs/03-guides/06-interpolate-resources.mdx
similarity index 100%
rename from website/docs/03-guides/05-interpolate-resources.mdx
rename to website/docs/03-guides/06-interpolate-resources.mdx
diff --git a/website/docs/03-guides/index.mdx b/website/docs/03-guides/index.mdx
index 603630a..86f5394 100644
--- a/website/docs/03-guides/index.mdx
+++ b/website/docs/03-guides/index.mdx
@@ -11,8 +11,9 @@ Examples of these are:
 - Publishing your mod to CurseForge
 - Publishing your mod to a Maven repository
 - Interpolate your resources
+- Creating the neoforge.mods.toml file
 
 :::info
 Any of the guides in this section assume that you have at least performed the [Getting started](../02-getting-started.mdx) guide and have imported your project at least once into an IDE, to validate that you set it up right.
 This will not guide you through setting up Tableau and bootstrap it.
-:::
\ No newline at end of file
+:::

From 2dec214e906d112cf8d7ab82006658d2c40c2650 Mon Sep 17 00:00:00 2001
From: Thom van den Akker <thodor20@gmail.com>
Date: Thu, 28 Nov 2024 22:43:51 +0100
Subject: [PATCH 5/5] Undo

---
 .../tableau/curseforge/extensions/CurseForgeExtension.java  | 2 +-
 .../com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java     | 2 +-
 .../ldtteam/tableau/jarjar/extensions/JarJarExtension.java  | 2 +-
 .../{neogradle => }/extensions/NeoGradleExtension.java      | 2 +-
 .../extensions/NeoGradleResourceProcessingExtension.java    | 2 +-
 .../NeoGradleSourceSetConfigurationExtension.java           | 2 +-
 .../ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java   | 6 +++---
 .../ldtteam/tableau/shadowing/ShadowingProjectPlugin.java   | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{neogradle => }/extensions/NeoGradleExtension.java (99%)
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{neogradle => }/extensions/NeoGradleResourceProcessingExtension.java (99%)
 rename modules/neogradle/src/main/java/com/ldtteam/tableau/{neogradle => }/extensions/NeoGradleSourceSetConfigurationExtension.java (97%)

diff --git a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
index 15a9826..2811b4d 100644
--- a/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
+++ b/modules/curseforge/src/main/java/com/ldtteam/tableau/curseforge/extensions/CurseForgeExtension.java
@@ -1,6 +1,6 @@
 package com.ldtteam.tableau.curseforge.extensions;
 
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleResourceProcessingExtension;
+import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import net.darkhax.curseforgegradle.Constants;
 import org.gradle.api.Action;
diff --git a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
index f31d5ee..a7f806a 100644
--- a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
+++ b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/JarJarProjectPlugin.java
@@ -3,7 +3,7 @@
  */
 package com.ldtteam.tableau.jarjar;
 
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.jarjar.extensions.JarJarExtension;
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
diff --git a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
index b8fe0ec..8e4bb36 100644
--- a/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
+++ b/modules/jarjar/src/main/java/com/ldtteam/tableau/jarjar/extensions/JarJarExtension.java
@@ -1,6 +1,6 @@
 package com.ldtteam.tableau.jarjar.extensions;
 
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import org.gradle.api.Project;
 import org.gradle.api.provider.Property;
 
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
similarity index 99%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
index 58a6a9d..4449818 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.neogradle.extensions;
+package com.ldtteam.tableau.extensions;
 
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.common.extensions.VersioningExtension;
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java
similarity index 99%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java
index 3bad818..b4acbeb 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleResourceProcessingExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleResourceProcessingExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.neogradle.extensions;
+package com.ldtteam.tableau.extensions;
 
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java
similarity index 97%
rename from modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java
rename to modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java
index d50b485..f73f808 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/extensions/NeoGradleSourceSetConfigurationExtension.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/extensions/NeoGradleSourceSetConfigurationExtension.java
@@ -1,4 +1,4 @@
-package com.ldtteam.tableau.neogradle.extensions;
+package com.ldtteam.tableau.extensions;
 
 import com.ldtteam.tableau.sourceset.management.extensions.SourceSetExtension;
 import org.gradle.api.Project;
diff --git a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
index 1eb2715..4d8aa59 100644
--- a/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
+++ b/modules/neogradle/src/main/java/com/ldtteam/tableau/neogradle/NeoGradleProjectPlugin.java
@@ -7,9 +7,9 @@
 import com.google.common.collect.Multimap;
 import com.ldtteam.tableau.common.extensions.ModExtension;
 import com.ldtteam.tableau.dependencies.extensions.DependenciesExtension;
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleResourceProcessingExtension;
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleSourceSetConfigurationExtension;
+import com.ldtteam.tableau.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.extensions.NeoGradleResourceProcessingExtension;
+import com.ldtteam.tableau.extensions.NeoGradleSourceSetConfigurationExtension;
 import com.ldtteam.tableau.neogradle.tasks.GenerateModsTomlTask;
 import com.ldtteam.tableau.resource.processing.extensions.ResourceProcessingExtension;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
diff --git a/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java b/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
index 4e42fb0..04a4e21 100644
--- a/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
+++ b/modules/shadowing/src/main/java/com/ldtteam/tableau/shadowing/ShadowingProjectPlugin.java
@@ -6,7 +6,7 @@
 import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin;
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar;
-import com.ldtteam.tableau.neogradle.extensions.NeoGradleExtension;
+import com.ldtteam.tableau.extensions.NeoGradleExtension;
 import com.ldtteam.tableau.neogradle.NeoGradlePlugin;
 import com.ldtteam.tableau.scripting.extensions.TableauScriptingExtension;
 import com.ldtteam.tableau.shadowing.extensions.ShadowingExtension;