From 803d097c7f6aec02945393997d8b513377b92ae5 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Wed, 31 Jul 2024 14:02:09 +0100
Subject: [PATCH] chore: separate dep ver from required dep ver for
 neoforge/fabric

---
 fabric/build.gradle                                     | 5 ++++-
 fabric/src/main/resources/fabric.mod.json               | 8 ++++----
 gradle.properties                                       | 6 ++++--
 neoforge/build.gradle                                   | 5 +++--
 neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 78bba8f..c4ce148 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -37,7 +37,10 @@ processResources {
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": project.version,
+                "archversion": project.architectury_version,
+                "fabricapiversionrange": project.fabric_api_version_range,
+                "mcversion": project.minecraft_version
     }
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index fcd10e2..d96426d 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -22,10 +22,10 @@
     "ftbfiltersystem.mixins.json"
   ],
   "depends": {
-    "fabric": "*",
-    "minecraft": ">=1.20.1",
-    "architectury": ">=9.1.12",
-    "ftblibrary": ">=2100.1.4"
+    "fabric": "${fabricapiversionrange}",
+    "minecraft": "~${mcversion}",
+    "architectury": ">=${archversion}",
+    "ftblibrary": ">=${ftb_library_version}"
   },
   "breaks": {
     "jei": "<19.5.0.40"
diff --git a/gradle.properties b/gradle.properties
index 21c2d25..aaf47c9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,13 +13,15 @@ minecraft_version=1.21
 architectury_version=13.0.2
 
 fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_api_version=0.100.8+1.21
+fabric_api_version_range=0.100.1+1.21
 
 ftb_library_version=2100.1.4
 
 #forge_version=49.0.31
 
-neoforge_version=21.0.133-beta
+neoforge_version=21.0.146
+neoforge_version_range=21.0.143
 # https://maven.neoforged.net/#/releases/net/neoforged/fancymodloader/loader
 neoforge_loader_version=4
 
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 393485e..713f768 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -45,9 +45,10 @@ processResources {
     filesMatching("META-INF/neoforge.mods.toml") {
         expand "version": project.version,
                 "archversion": project.architectury_version,
-                "neoforgeversion": project.neoforge_version,
+                "neoforgeversionrange": project.neoforge_version_range,
                 "neoforgeloaderversion": project.neoforge_loader_version,
-                "mcversion": project.minecraft_version
+                "mcversion": project.minecraft_version,
+                "ftblibraryversion": project.ftb_library_version
     }
 }
 
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index cabe933..58606fa 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -16,7 +16,7 @@ Smart and highly configurable item filtering system with useful GUI configuratio
 [[dependencies.ftbfiltersystem]]
 modId = "neoforge"
 type = "required"
-versionRange = "[${neoforgeversion},)"
+versionRange = "${neoforgeversionrange}"
 ordering = "NONE"
 side = "BOTH"
 
@@ -37,7 +37,7 @@ side = "BOTH"
 [[dependencies.ftbfiltersystem]]
 modId = "ftblibrary"
 type = "required"
-versionRange = "[${ftb_library_version},)"
+versionRange = "[${ftblibraryversion},)"
 ordering = "AFTER"
 side = "BOTH"