From 8fcedebb920444647d97ccebc49dfd125bf52261 Mon Sep 17 00:00:00 2001
From: Jamalam <james@jamalam.tech>
Date: Thu, 24 Oct 2024 15:33:33 +0100
Subject: [PATCH] fix: processResources on NeoForge now works

---
 neoforge/build.gradle                                   | 8 ++++++--
 neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 68c58e0..64f57af 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -96,12 +96,16 @@ publishing {
 }
 
 processResources {
-    filesMatching("neoforge.mods.toml") {
-        expand "minecraft_version": project.minimum_minecraft_version,
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand "version": project.version,
+                "minecraft_version": project.minimum_minecraft_version,
+                "neoforge_version": libs.versions.neoforge.get(),
                 "architectury_version": libs.versions.architectury.get()
     }
 
+    inputs.property "version", project.version
     inputs.property "minecraft_version", project.minimum_minecraft_version
+    inputs.property "neoforge_version", libs.versions.neoforge.get()
     inputs.property "architectury_version", libs.versions.architectury.get()
 }
 
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index 1019f4f..6f06682 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/jamlib/issues"
 
 [[mods]]
 modId = "jamlib"
-version = "${file.jarVersion}"
+version = "${version}"
 displayName = "JamLib"
 displayURL = "https://github.com/JamCoreModding/jamlib"
 logoFile = "icon.png"
@@ -15,7 +15,7 @@ description = '''The platform-agnostic library used in all of JamCore's mods'''
 [[dependencies.jamlib]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21,)"
+versionRange = "[${neoforge_version},)"
 ordering = "NONE"
 side = "BOTH"