[WIP] Add Forge 1.21 and 1.20.6

architectury · Jul 3, 2024 · 216995d · 216995d
1 parent be99a10
commit 216995d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/src/app/generator.rs b/src/app/generator.rs
@@ -12,6 +12,7 @@ use miette::{IntoDiagnostic, Result};
 use std::future::Future;
 use std::pin::Pin;
 use std::sync::Arc;
+use version_resolver::minecraft::{JavaVersion, MinecraftVersion};
 use version_resolver::maven::{resolve_latest_version, resolve_matching_version, MavenLibrary};
 
 pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
@@ -66,6 +67,10 @@ pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
         context.put("FORGE_DATA_PACK_FORMAT", data_pack_format);
     }
 
+    if game_version >= MinecraftVersion::Minecraft1_20_6 {
+        context.define("forge_jopt_hack");
+    }
+
     // Constants
     context.put("LOOM_VERSION", crate::versions::LOOM_VERSION);
     context.put("PLUGIN_VERSION", crate::versions::PLUGIN_VERSION);
@@ -128,6 +133,11 @@ pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
                     )));
                 }
                 platforms.push("forge");
+
+                // As of 1.21, Forge uses Mixin 0.8.5 which doesn't have CompatibilityLevel.JAVA_21.
+                if game_version.java_version() == JavaVersion::Java9OrNewer(21) {
+                    context.put("MIXIN_COMPAT_LEVEL", JavaVersion::Java9OrNewer(17).mixin_compat_level());
+                }
             }
 
             if app.subprojects.neoforge {
@@ -139,7 +149,7 @@ pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
                         std::future::ready(Ok(version)),
                     )));
                 }
-                if game_version == version_resolver::minecraft::MinecraftVersion::Minecraft1_20_4 {
+                if game_version == MinecraftVersion::Minecraft1_20_4 {
                     context.put("NEOFORGE_METADATA_FILE_NAME", "mods.toml");
                     files.push(Box::pin(neoforge::mods_toml_files(client.clone())));
                 } else {
@@ -190,7 +200,7 @@ pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
                     std::future::ready(Ok(version)),
                 )));
             }
-            if game_version == version_resolver::minecraft::MinecraftVersion::Minecraft1_20_4 {
+            if game_version == MinecraftVersion::Minecraft1_20_4 {
                 context.put("NEOFORGE_METADATA_FILE_NAME", "mods.toml");
                 files.push(Box::pin(neoforge_only::mods_toml_files(client.clone())));
             } else {
@@ -209,6 +219,11 @@ pub async fn generate(app: &super::GeneratorApp) -> Result<()> {
                 )));
             }
             file_name_parts.push("forge-only".to_owned());
+
+            // As of 1.21, Forge uses Mixin 0.8.5 which doesn't have CompatibilityLevel.JAVA_21.
+            if game_version.java_version() == JavaVersion::Java9OrNewer(21) {
+                context.put("MIXIN_COMPAT_LEVEL", JavaVersion::Java9OrNewer(17).mixin_compat_level());
+            }
         }
     }
 

diff --git a/src/templates/forge/build.gradle b/src/templates/forge/build.gradle
@@ -28,6 +28,15 @@ configurations {
         canBeResolved = true
         canBeConsumed = false
     }
+//% if forge_jopt_hack
+
+    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
+    configureEach {
+        resolutionStrategy {
+            force 'net.sf.jopt-simple:jopt-simple:5.0.4'
+        }
+    }
+//% end
 }
 
 dependencies {

diff --git a/src/templates/forge_only/build.gradle b/src/templates/forge_only/build.gradle
@@ -19,6 +19,17 @@ loom {
         mixinConfig '%MOD_ID%.mixins.json'
     }
 }
+//% if forge_jopt_hack
+
+// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
+configurations {
+    configureEach {
+        resolutionStrategy {
+            force 'net.sf.jopt-simple:jopt-simple:5.0.4'
+        }
+    }
+}
+//% end
 
 repositories {
     // Add repositories to retrieve artifacts from in here.

diff --git a/version_resolver/src/minecraft.rs b/version_resolver/src/minecraft.rs
@@ -125,8 +125,8 @@ impl MinecraftVersion {
             Self::Minecraft1_20_2 => Some("48"),
             Self::Minecraft1_20_4 => Some("49"),
             Self::Minecraft1_20_5 => None,
-            Self::Minecraft1_20_6 => None,
-            Self::Minecraft1_21 => None,
+            Self::Minecraft1_20_6 => Some("50"),
+            Self::Minecraft1_21 => Some("51"),
         }
     }
 
@@ -194,8 +194,8 @@ impl MinecraftVersion {
             Self::Minecraft1_20_2 => Some("18"),
             Self::Minecraft1_20_4 => Some("22"),
             Self::Minecraft1_20_5 => None,
-            Self::Minecraft1_20_6 => None,
-            Self::Minecraft1_21 => None,
+            Self::Minecraft1_20_6 => Some("32"),
+            Self::Minecraft1_21 => Some("34"),
         }
     }