From 014ab262dd02eee8d7f0a9909e0ae9f71799b060 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Tue, 13 Jun 2023 14:46:47 +0100
Subject: [PATCH] build: updates to fabric.mod.json and pack.mcmeta

---
 fabric/build.gradle                       | 6 +++++-
 fabric/src/main/resources/fabric.mod.json | 8 ++++----
 forge/src/main/resources/pack.mcmeta      | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index efbbf54..bc2590c 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -40,7 +40,11 @@ processResources {
 	inputs.property "version", project.version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": project.version,
+				"archversion": project.architectury_version,
+				"fabricapiversion": project.fabric_api_version,
+				"mcversion": project.minecraft_version,
+				"ftblibraryversion": project.ftb_library_version
 	}
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 9b93e42..beaaf13 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -18,10 +18,10 @@
 		]
 	},
 	"depends": {
-		"fabric": "*",
-		"minecraft": "~1.19",
-		"architectury": ">=6.3.49",
-		"ftblibrary": ">=1902.3.16-build.191"
+		"fabric": ">=${fabricapiversion}",
+		"minecraft": "~${mcversion}",
+		"architectury": ">=${archversion}",
+		"ftblibrary": ">=${ftblibraryversion}"
 	},
 	"mixins": [
 		"ftbranks-common.mixins.json"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
index 7e137b7..97115ac 100644
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
 	"pack": {
 		"description": "FTB Ranks Resources",
-		"pack_format": 6
+		"pack_format": 15
 	}
 }