From 45b2ac82068c632f6c7203ae2278ca8e75e4ce94 Mon Sep 17 00:00:00 2001
From: Jakob K <bluefireolymp@gmail.com>
Date: Tue, 8 Jun 2021 18:31:02 +0200
Subject: [PATCH] Make minecraft version in fabric.mod.json a property

---
 buildSrc/src/main/kotlin/BuildConstants.kt           | 4 +++-
 buildSrc/src/main/kotlin/mod-build-script.gradle.kts | 4 +++-
 fabrikmc-commands/src/main/resources/fabric.mod.json | 2 +-
 fabrikmc-core/src/main/resources/fabric.mod.json     | 2 +-
 fabrikmc-igui/src/main/resources/fabric.mod.json     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildConstants.kt b/buildSrc/src/main/kotlin/BuildConstants.kt
index 2846aef5..b417a64d 100644
--- a/buildSrc/src/main/kotlin/BuildConstants.kt
+++ b/buildSrc/src/main/kotlin/BuildConstants.kt
@@ -1,5 +1,5 @@
 object BuildConstants {
-    const val fabrikVersion = "0.5.0"
+    const val fabrikVersion = "1.0.0"
     val isSnapshot = fabrikVersion.endsWith("-SNAPSHOT")
     val projectState = if (isSnapshot) "beta" else "release"
 
@@ -8,6 +8,8 @@ object BuildConstants {
 
     const val author = "bluefireoly"
 
+    const val majorMinecraftVersion = "1.17"
+
     // check these values here: https://axay.net/fabric/gradlekts/latest
     const val minecraftVersion = "1.17"
     const val yarnMappingsVersion = "1.17+build.1:v2"
diff --git a/buildSrc/src/main/kotlin/mod-build-script.gradle.kts b/buildSrc/src/main/kotlin/mod-build-script.gradle.kts
index 36530033..f99c08a3 100644
--- a/buildSrc/src/main/kotlin/mod-build-script.gradle.kts
+++ b/buildSrc/src/main/kotlin/mod-build-script.gradle.kts
@@ -3,6 +3,7 @@ import BuildConstants.fabricApiVersion
 import BuildConstants.fabricLanguageKotlinVersion
 import BuildConstants.fabricLoaderVersion
 import BuildConstants.fabrikVersion
+import BuildConstants.majorMinecraftVersion
 import BuildConstants.minecraftVersion
 import BuildConstants.yarnMappingsVersion
 import org.gradle.kotlin.dsl.*
@@ -43,7 +44,8 @@ tasks {
             "id" to project.name,
             "version" to project.version,
             "description" to project.description,
-            "author" to author
+            "author" to author,
+            "minecraftversion" to "${majorMinecraftVersion}.x"
         )
 
         inputs.properties(properties)
diff --git a/fabrikmc-commands/src/main/resources/fabric.mod.json b/fabrikmc-commands/src/main/resources/fabric.mod.json
index 9ef01b85..50e23fa9 100644
--- a/fabrikmc-commands/src/main/resources/fabric.mod.json
+++ b/fabrikmc-commands/src/main/resources/fabric.mod.json
@@ -10,7 +10,7 @@
   "depends": {
     "fabric": "*",
     "fabric-language-kotlin": "*",
-    "minecraft": "1.16.x",
+    "minecraft": "${minecraftversion}",
     "fabrikmc-core": "*"
   }
 }
diff --git a/fabrikmc-core/src/main/resources/fabric.mod.json b/fabrikmc-core/src/main/resources/fabric.mod.json
index a18ac443..b1f2a2c9 100644
--- a/fabrikmc-core/src/main/resources/fabric.mod.json
+++ b/fabrikmc-core/src/main/resources/fabric.mod.json
@@ -10,6 +10,6 @@
   "depends": {
     "fabric": "*",
     "fabric-language-kotlin": "*",
-    "minecraft": "1.16.x"
+    "minecraft": "${minecraftversion}"
   }
 }
diff --git a/fabrikmc-igui/src/main/resources/fabric.mod.json b/fabrikmc-igui/src/main/resources/fabric.mod.json
index 9f33cfa4..4fc09665 100644
--- a/fabrikmc-igui/src/main/resources/fabric.mod.json
+++ b/fabrikmc-igui/src/main/resources/fabric.mod.json
@@ -12,7 +12,7 @@
   "depends": {
     "fabric": "*",
     "fabric-language-kotlin": "*",
-    "minecraft": "1.16.x",
+    "minecraft": "${minecraftversion}",
     "fabrikmc-core": "*"
   }
 }