Update Forge/NeoForge to MC 1.21

4 files changed, 8 insertions, 9 deletions

diff --git a/gradle.properties b/gradle.properties
index 1c3cd0d..afa7c6c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.jvmargs=-Xmx2G
-org.gradle.parallel=true
+org.gradle.parallel=false
 
 # thanks, forge
 org.gradle.daemon=false
\ No newline at end of file
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index 591fd09..79c99b0 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -9,7 +9,7 @@ tasks.withType(JavaCompile) {
 }
 
 minecraft {
-    mappings channel: 'official', version: '1.20.6'
+    mappings channel: 'official', version: '1.21'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 }
 
@@ -19,7 +19,7 @@ configurations {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.20.6-50.1.3'
+    minecraft 'net.minecraftforge:forge:1.21-51.0.8'
     shade project(':spark-common')
 }
 
diff --git a/spark-neoforge/build.gradle b/spark-neoforge/build.gradle
index 5b60e29..dc0514e 100644
--- a/spark-neoforge/build.gradle
+++ b/spark-neoforge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'io.github.goooler.shadow' version '8.1.7'
-    id 'net.neoforged.gradle.userdev' version '7.0.105'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -26,7 +26,7 @@ configurations {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:20.6.1-beta"
+    implementation "net.neoforged:neoforge:21.0.10-beta"
     shade project(':spark-common')
 }
 
diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
index ea0141e..18d88c3 100644
--- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
+++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
@@ -21,8 +21,7 @@
 package me.lucko.spark.neoforge;
 
 import me.lucko.spark.common.platform.PlatformInfo;
-import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
-import net.neoforged.neoforge.internal.versions.neoform.NeoFormVersion;
+import net.neoforged.fml.loading.FMLLoader;
 
 public class NeoForgePlatformInfo implements PlatformInfo {
     private final Type type;
@@ -43,11 +42,11 @@ public class NeoForgePlatformInfo implements PlatformInfo {
 
     @Override
     public String getVersion() {
-        return NeoForgeVersion.getVersion();
+        return FMLLoader.versionInfo().neoForgeVersion();
     }
 
     @Override
     public String getMinecraftVersion() {
-        return NeoFormVersion.getMCVersion();
+        return FMLLoader.versionInfo().mcVersion();
     }
 }