From 4ff37cfdad6bf4330065855954128800e919aabc Mon Sep 17 00:00:00 2001
From: coolGi2007 <sasanaps@hotmail.com>
Date: Thu, 27 Jan 2022 11:14:07 +1030
Subject: [PATCH] Fxed forge version

---
 fabric/build.gradle                         | 6 +++---
 fabric/src/main/resources/fabric.mod.json   | 6 +++---
 forge/build.gradle                          | 7 +++++++
 forge/src/main/resources/META-INF/mods.toml | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fabric/build.gradle b/fabric/build.gradle
index 98a7cbe0b..a29807427 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     // modImplementation "curse.maven:starlight-521783:${project.starlight_version_fabric}"
 
     // Sodium
-    modImplementation "maven.modrinth:sodium:${project.sodium_version}"
+    modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}"
     implementation "org.joml:joml:1.10.2"
 	
 	// Lithium
@@ -113,10 +113,10 @@ runClient {
 
 processResources {
     dependsOn(copyAccessWidener)
-    inputs.property "version", project.version
+    inputs.property "version", rootProject.mod_version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": rootProject.mod_version
     }
 }
 
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index dcbbf0e96..820f3d012 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -6,9 +6,9 @@
   "name": "Distant Horizons Fabric",
   "description": "This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.",
   "authors": [
-	  "James Seibel",
-	  "Leonardo Amato",
-	  "Cola",
+    "James Seibel",
+    "Leonardo Amato",
+    "Cola",
     "coolGi2007",
     "Ran"
   ],
diff --git a/forge/build.gradle b/forge/build.gradle
index f1759f9c5..f909ed47b 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -60,6 +60,13 @@ task copyCommonResources(type: Copy) {
 processResources {
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
+
+    // Put all the stuff about the mod
+    inputs.property "version", rootProject.mod_version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": rootProject.mod_version
+    }
 }
 
 shadowJar {
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index fd9a2b784..7688f0805 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -7,7 +7,7 @@ issueTrackerURL="https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues"
 
 [[mods]] #//mandatory
 	modId="lod" #//mandatory
-	version= "${file.jarVersion}" #//mandatory, gets the version number from jar populated by the build.gradle script
+	version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
 	displayName="Distant Horizons" #//mandatory
 	#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 	displayURL="https://www.curseforge.com/minecraft/mc-mods/lod-level-of-detail"