Update dependencies to 1.21.1

.gitignore

@@ -4,3 +4,4 @@
 build/
 libs/
 runs/
+run/

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id("net.neoforged.gradle.userdev") version "7.0.57"
+    id("net.neoforged.moddev") version "2.0.30-beta"
     id("com.matthewprenger.cursegradle") version "1.4.0"
     id("com.diffplug.spotless") version "6.23.3"
     id("com.modrinth.minotaur") version "2.8.7"
@@ -57,13 +57,15 @@ repositories {
     mavenLocal()
 }
 
-dependencies {
-    implementation("net.neoforged:neoforge:${neoforge_version}")
+neoForge {
+    version = project.neoforge_version
+}
 
+dependencies {
     implementation("blusunrize.immersiveengineering:ImmersiveEngineering:${minecraft_version}-${ie_version}")
 
     // We depend on many AE2 internals, such as using their basic cell drive, thus not using classifier = "api"
-    implementation("appeng:appliedenergistics2-neoforge:${ae2_version}")
+    implementation("appeng:appliedenergistics2:${ae2_version}")
 
     runtimeOnly("mekanism:Mekanism:${minecraft_version}-${mekanism_version}:all") {
         exclude(group: "com.blamejared.crafttweaker")
@@ -100,27 +102,37 @@ sourceSets {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
 ////////////////////
 // Minecraft
-runs {
-    configureEach {
-        systemProperty("forge.logging.console.level", "debug")
-        modSource(project.sourceSets.main)
+neoForge {
+    mods {
+        immeng {
+            sourceSet sourceSets.main
+        }
     }
 
-    client {
-    }
+    runs {
+        configureEach {
+            systemProperty("forge.logging.console.level", "debug")
+        }
 
-    server {
-        programArgument '--nogui'
-    }
+        client {
+            client()
+        }
 
-    data {
-        programArguments.addAll "--mod", "immeng", "--all", "--output", file("src/generated/resources/").getAbsolutePath(), "--existing", file("src/main/resources/").getAbsolutePath()
+        server {
+            server()
+            programArgument '--nogui'
+        }
+
+        data {
+            data()
+            programArguments.addAll "--mod", "immeng", "--all", "--output", file("src/generated/resources/").getAbsolutePath(), "--existing", file("src/main/resources/").getAbsolutePath()
+        }
     }
 }
 
@@ -142,7 +154,7 @@ tasks.withType(ProcessResources).configureEach {
     ]
     inputs.properties(replaceProperties)
 
-    filesMatching(["META-INF/mods.toml"]) {
+    filesMatching(["META-INF/neoforge.mods.toml"]) {
         expand replaceProperties
     }
 }

gradle.properties

@@ -1,21 +1,21 @@
-minecraft_version=1.20.4
-neoforge_version=20.4.209
-ie_version=10.0.1-pre.198
-ae2_version=17.10.4-beta
-mekanism_version=10.5.0.22
-jei_version=17.0.0.30
-emi_version=1.1.0
-jade_id=4980188
+minecraft_version=1.21.1
+neoforge_version=21.1.51
+ie_version=11.6.1-181
+ae2_version=19.0.23-beta
+mekanism_version=10.7.7.64
+jei_version=19.18.3.204
+emi_version=1.1.13
+jade_id=5727431
 
 # Dev runtime options
 ## Set to "jei" or "emi" to pick which tooltip mod gets picked at runtime
 ## for the dev environment.
 runtime_itemlist_mod=emi
 
 loader_version_range=[2,)
-neo_version_range=[20.4.209,)
-ae2_version_range=[17.10.4-beta,18.0.0)
-ie_version_range=[10,)
+neo_version_range=[21.1.51,)
+ae2_version_range=[19.0.23-beta,20.0.0)
+ie_version_range=[11,)
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,26 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/generated/resources/data/immeng/advancements/recipes/misc/connector_me.json → src/generated/resources/data/immeng/advancement/recipes/misc/connector_me.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:fluix_crystal"
-            ]
+            "items": "ae2:fluix_crystal"
           }
         ]
       },

src/generated/resources/data/immeng/advancements/recipes/misc/connector_me_relay.json → src/generated/resources/data/immeng/advancement/recipes/misc/connector_me_relay.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:fluix_crystal"
-            ]
+            "items": "ae2:fluix_crystal"
           }
         ]
       },

src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me.json → src/generated/resources/data/immeng/advancement/recipes/misc/wirecoil_me.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:fluix_glass_cable"
-            ]
+            "items": "ae2:fluix_glass_cable"
           }
         ]
       },

src/generated/resources/data/immeng/advancements/recipes/misc/wirecoil_me_dense.json → src/generated/resources/data/immeng/advancement/recipes/misc/wirecoil_me_dense.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:fluix_covered_dense_cable"
-            ]
+            "items": "ae2:fluix_covered_dense_cable"
           }
         ]
       },

src/generated/resources/data/immeng/recipes/connector_me.json → src/generated/resources/data/immeng/recipe/connector_me.json

@@ -16,6 +16,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "immeng:connector_me"
+    "id": "immeng:connector_me"
   }
 }

src/generated/resources/data/immeng/recipes/connector_me_relay.json → src/generated/resources/data/immeng/recipe/connector_me_relay.json

@@ -15,6 +15,6 @@
   ],
   "result": {
     "count": 8,
-    "item": "immeng:connector_me_relay"
+    "id": "immeng:connector_me_relay"
   }
 }

src/generated/resources/data/immeng/recipes/wirecoil_me.json → src/generated/resources/data/immeng/recipe/wirecoil_me.json

@@ -6,7 +6,7 @@
       "item": "ae2:fluix_glass_cable"
     },
     "s": {
-      "tag": "forge:rods/wooden"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [
@@ -16,6 +16,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "immeng:wirecoil_me"
+    "id": "immeng:wirecoil_me"
   }
 }

src/generated/resources/data/immeng/recipes/wirecoil_me_dense.json → src/generated/resources/data/immeng/recipe/wirecoil_me_dense.json

@@ -6,7 +6,7 @@
       "item": "ae2:fluix_covered_dense_cable"
     },
     "s": {
-      "tag": "forge:rods/wooden"
+      "tag": "c:rods/wooden"
     }
   },
   "pattern": [
@@ -16,6 +16,6 @@
   ],
   "result": {
     "count": 4,
-    "item": "immeng:wirecoil_me_dense"
+    "id": "immeng:wirecoil_me_dense"
   }
 }