From 9e0214acd9873434908e17435e893e5d8f9069a6 Mon Sep 17 00:00:00 2001
From: Username404 <w.iron.zombie@gmail.com>
Date: Fri, 28 Apr 2023 21:05:31 +0200
Subject: [PATCH] Fix versions in fabric.mod.json and mods.toml

Signed-off-by: Username404 <w.iron.zombie@gmail.com>
---
 build.gradle.kts                            | 4 +++-
 fabric/src/main/resources/fabric.mod.json   | 4 ++--
 forge/src/main/resources/META-INF/mods.toml | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b265cd6..49c844e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -234,7 +234,9 @@ allprojects {
                 "mod_group" to this@allprojects.group,
                 "fabric_kotlin" to rootProject.property("fabric_language_kotlin"),
                 "kotlinforforge" to rootProject.property("kotlinforforge"),
-                "clothconfig" to rootProject.property("clothconfig_version")
+                "clothconfig" to rootProject.property("clothconfig_version"),
+                "fabric_loader" to rootProject.property("fabric_loader_version"),
+                "forge_version" to rootProject.property("forge_version").toString().dropLast(2)
             )
             inputs.properties(modProperties)
             filesNotMatching(listOf("*.png")) {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 20d3900..9f71f2f 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -33,11 +33,11 @@
     "snowygui-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.11.0",
+    "fabric-loader": ">=${fabric_loader}",
     "fabric-language-kotlin": ">=${fabric_kotlin}",
     "fabric-resource-loader-v0": "*",
     "fabric-rendering-v1": "*",
-    "minecraft": ">=1.19-alpha.22.16.b"
+    "minecraft": ">=${minecraft_version}"
   },
   "recommends": {
     "cloth-config2": ">=${clothconfig}"
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 40db18b..56f1d8b 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -23,7 +23,7 @@ side = "CLIENT"
 [[dependencies.snowygui]]
 modId = "forge"
 mandatory = true
-versionRange = "[37,)"
+versionRange = "[${forge_version},)"
 ordering = "NONE"
 side = "BOTH"