From 53c8bb5d6fc61790b78d91148d400a56f5c35e26 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Mon, 5 Aug 2024 15:14:47 +0100
Subject: [PATCH] chore: updated for forge/fabric version range

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

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 27ead1d3..2307201a 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -77,7 +77,7 @@ processResources {
 	filesMatching("fabric.mod.json") {
 		expand "version": project.version,
 				"archversion": project.architectury_api_version,
-				"fabricapiversion": project.fabric_api_version,
+				"fabricapiversionrange": project.fabric_api_version_range,
 				"mcversion": project.minecraft_version,
 				"ftblibraryversion": project.ftb_library_version,
 				"ftbteamsversion": project.ftb_teams_version
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 32b4f95c..457b5022 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
 	],
 	"accessWidener": "ftbchunks.accesswidener",
 	"depends": {
-		"fabric": "*",
+		"fabric": "${fabricapiversionrange}",
 		"minecraft": "~${mcversion}",
 		"architectury": ">=${archversion}",
 		"ftblibrary": ">=${ftblibraryversion}",
diff --git a/gradle.properties b/gradle.properties
index a969bbb3..5eb91328 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,12 +13,12 @@ minecraft_version=1.21
 
 # Deps
 #forge_version=50.0.9
-neoforge_version=21.0.109-beta
-
-# https://maven.neoforged.net/#/releases/net/neoforged/fancymodloader/loader
+neoforge_version=21.0.157
+neoforge_version_range=[21.0.143,)
 neoforge_loader_version=4
 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
 architectury_api_version=13.0.2
 
 ftb_library_version=2100.1.3
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 12ee8b3b..52bf2d10 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -56,7 +56,7 @@ processResources {
 	filesMatching("META-INF/neoforge.mods.toml") {
 		expand "version": project.version,
 				"archversion": project.architectury_api_version,
-				"neoforgeversion": project.neoforge_version,
+				"neoforgeversionrange": project.neoforge_version_range,
 				"neoforgeloaderversion": project.neoforge_loader_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 edaecf79..f119a57b 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -20,7 +20,7 @@ license = "All Rights Reserved"
 [[dependencies.ftbchunks]]
 modId = "neoforge"
 type = "required"
-versionRange = "[${neoforgeversion},)"
+versionRange = "${neoforgeversionrange}"
 ordering = "NONE"
 side = "BOTH"