From f1c9e1c757d1724cd3bf75c8c2c7fcc7a912e55f Mon Sep 17 00:00:00 2001
From: Sebastian Hartte <shartte@users.noreply.github.com>
Date: Sat, 11 Jan 2025 10:19:49 +0100
Subject: [PATCH] Bump to MDG 2

---
 build.gradle    | 16 ++++------------
 settings.gradle |  8 ++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index c519aac85d6..24d84861c2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,19 +16,11 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-buildscript {
-    dependencies {
-        // Fix for the shadow plugin using outdated ASM
-        classpath 'org.ow2.asm:asm:9.5'
-        classpath 'org.ow2.asm:asm-commons:9.5'
-    }
-}
-
 plugins {
     id "net.neoforged.moddev"
     id "maven-publish"
     id "com.diffplug.spotless"
-    id 'io.github.goooler.shadow'
+    id 'com.gradleup.shadow'
     id "de.undercouch.download"
 }
 
@@ -183,9 +175,6 @@ neoForge {
             gameDirectory = project.file('run')
             systemProperties = commonSystemProperties
             // property "mixin.debug.export", "true"
-
-            additionalRuntimeClasspathConfiguration.extendsFrom configurations.shaded
-            additionalRuntimeClasspathConfiguration.extendsFrom configurations.guideExportOnly
         }
         client {
             client()
@@ -246,6 +235,9 @@ neoForge {
     }
 }
 
+configurations.additionalRuntimeClasspath.extendsFrom configurations.shaded
+configurations.additionalRuntimeClasspath.extendsFrom configurations.guideExportOnly
+
 //////////////
 // Artifacts
 Map<String, String> expansionVariables = [
diff --git a/settings.gradle b/settings.gradle
index ce1dc652b18..90972135a50 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,17 +4,17 @@ import org.gradle.api.initialization.resolve.RulesMode
 pluginManagement {
     plugins {
         id 'com.diffplug.spotless' version '6.25.0'
-        id 'io.github.goooler.shadow' version '8.1.7'
+        id 'com.gradleup.shadow' version '8.3.5'
         id 'de.undercouch.download' version '5.6.0'
         // https://projects.neoforged.net/neoforged/ModDevGradle
-        id 'net.neoforged.moddev' version '1.0.13'
-        id 'net.neoforged.moddev.repositories' version '1.0.13'
+        id 'net.neoforged.moddev' version '2.0.74'
+        id 'net.neoforged.moddev.repositories' version '2.0.74'
     }
 }
 
 plugins {
     id 'net.neoforged.moddev.repositories'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
 dependencyResolutionManagement {