update gradle and version handling

fabric/build.gradle

@@ -92,7 +92,7 @@ processResources {
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": project.version, "homepage": curse_page_fabric, "mcversion": minecraft_version, "fabric_version": fabric_version
     }
 }
 

fabric/src/main/resources/fabric.mod.json

@@ -8,7 +8,7 @@
     "Flemmli97"
   ],
   "contact": {
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/flan",
+    "homepage": "${homepage}",
     "issues": "https://github.com/Flemmli97/Flan/issues",
     "sources": "https://github.com/Flemmli97/Flan"
   },
@@ -25,7 +25,7 @@
     "flan.fabric.mixins.json"
   ],
   "depends": {
-    "fabric": ">=0.57.0",
-    "minecraft": ">=1.19.4"
+    "fabric": ">=${fabric_version}",
+    "minecraft": ">=${mcversion}"
   }
 }

forge/build.gradle

@@ -38,7 +38,7 @@ repositories {
 }
 
 dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
+    forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
@@ -54,8 +54,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
+    def loader_version = (forge_version =~ /([0-9]+)\.([0-9]+)\.([0-9]+)/)[0][1]
     filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
+        expand "version": project.version, "loader_version": loader_version, "homepage": curse_page_forge, "mcversion": minecraft_version, "forge_version": forge_version
     }
 }
 

forge/src/main/resources/META-INF/mods.toml

@@ -1,24 +1,24 @@
 modLoader="javafml"
-loaderVersion="[45,)"
+loaderVersion="[${loader_version},)"
 license="All rights reserved"
 issueTrackerURL="https://github.com/Flemmli97/Flan/issues"
 [[mods]] 
 modId="flan"
 version="${version}"
 displayName="Flan"
-displayURL="https://www.curseforge.com/minecraft/mc-mods/flan-forge"
+displayURL="${homepage}"
 logoFile="icon.png"
 authors="Flemmli97"
 description='''Flan (Forge version): A serverside claiming mod'''
 [[dependencies.flan]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.19.4,)"
+versionRange="[${mcversion},)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.flan]]
 modId="forge"
 mandatory=true
-versionRange="[45.0.22,)"
+versionRange="[${forge_version},)"
 ordering="NONE"
 side="BOTH"

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.19.4
 parchment_version=1.19.3:2023.03.12
 
 # Forge Properties
-forge_version=1.19.4-45.0.59
+forge_version=45.0.59
 # Fabric Properties
 loader_version=0.14.17