Update to MDG

Technici4n · Jun 22, 2024 · 10e781d · 10e781d
1 parent 9907958
commit 10e781d
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 175 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'net.neoforged.gradle.userdev'
+    id 'net.neoforged.moddev'
     id 'maven-publish'
     id 'com.diffplug.spotless'
     id 'com.matthewprenger.cursegradle'
@@ -52,9 +52,6 @@ repositories {
 }
 
 dependencies {
-    // To change the versions see the gradle.properties file
-    implementation "net.neoforged:neoforge:${project.neoforge_version}"
-
     if (project.runtime_itemlist_mod == "jei") {
         implementation("mezz.jei:jei-${project.jei_minecraft_version}-neoforge:${project.jei_version}") {
             exclude group: "mezz.jei"
@@ -104,45 +101,48 @@ sourceSets {
     }
 }
 
-minecraft {
-    accessTransformers {
-        file('src/main/resources/META-INF/accesstransformer.cfg')
-    }
-}
+neoForge {
+    version = project.neoforge_version
 
-runs {
-    configureEach {
-        workingDirectory = project.file('run')
-        modSources = [sourceSets.main]
-    }
-    client {
-    }
-    gametestWorld {
-        configure("client")
-        programArguments("--username", "MDDev", "--quickPlaySingleplayer", "GametestWorld")
-    }
-    server {
-    }
-    data {
-        programArguments = [
-                '--mod', 'moderndynamics',
-                '--all',
-                '--output', file('src/generated/resources/').absolutePath,
-                '--existing', file('src/main/resources').absolutePath
-        ]
+    mods {
+        moderndynamics {
+            sourceSet sourceSets.main
+        }
     }
-    // Use to run the tests
-    gametest {
-        configure("gameTestServer")
-        workingDirectory = project.file("build/gametest")
+
+    runs {
+        client {
+            client()
+        }
+        gametestWorld {
+            client()
+            programArguments.addAll("--username", "MDDev", "--quickPlaySingleplayer", "GametestWorld")
+        }
+        server {
+            server()
+        }
+        data {
+            data()
+            programArguments = [
+                    '--mod', 'moderndynamics',
+                    '--all',
+                    '--output', file('src/generated/resources/').absolutePath,
+                    '--existing', file('src/main/resources').absolutePath
+            ]
+        }
+        // Use to run the tests
+        gametest {
+            type = "gameTestServer"
+            gameDirectory = project.file("build/gametest")
+        }
     }
 }
 
 test.dependsOn runGametest
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.

diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,9 @@ org.gradle.jvmargs=-Xmx1G \
 
 org.gradle.caching=true
 org.gradle.parallel=true
+org.gradle.configuration-cache=true
 
-minecraft_version=1.20.4
+minecraft_version=1.21
 
 # Mod Properties
 maven_group = dev.technici4n
@@ -19,25 +20,25 @@ curseforge_project = 552758
 modrinth_project = fMpvLrnF
 
 # Dependencies
-neoforge_version=20.4.235
+neoforge_version=21.0.24-beta
 
 #########################################################
 # Parchment                                             #
 #########################################################
-neogradle.subsystems.parchment.minecraftVersion=1.20.3
-neogradle.subsystems.parchment.mappingsVersion=2023.12.26-nightly-SNAPSHOT
+neoForge.parchment.minecraftVersion=1.20.6
+neoForge.parchment.mappingsVersion=2024.06.16
 
 # In-dev runtime mods
-rei_version=14.0.688
+rei_version=16.0.729
 
-jei_minecraft_version=1.20.4
-jei_version=17.0.0.37
+jei_minecraft_version=1.21
+jei_version=19.0.0.1
 
-emi_minecraft_version=1.20.4
-emi_version=1.1.0
+emi_minecraft_version=1.21
+emi_version=1.1.7
 
 # Set to emi, jei, or rei to pick which tooltip mod gets picked at runtime
 # for the dev environment.
 runtime_itemlist_mod=emi
 
-jade_file_id=5109393
+jade_file_id=5427817
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists