From 52005d0b19d13002a756277eca8dfa3e158949f9 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Tue, 24 Jan 2023 23:46:15 +1030
Subject: [PATCH] Added a proper fix for when forge is attempting to be run on
 a different version than intended

---
 build.gradle                                |  5 +++++
 forge/build.gradle                          |  2 +-
 forge/src/main/resources/META-INF/mods.toml | 14 +++++++-------
 gradle.properties                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e033b6ec..aff4c4277 100644
--- a/build.gradle
+++ b/build.gradle
@@ -351,6 +351,10 @@ allprojects { p ->
     }
      */
 
+    // Fix forge version numbering system as it is weird
+    def compatible_forgemc_versions = "${compatible_minecraft_versions}".replaceAll("\"", "").replaceAll("]", ",)")
+//    System.out.println(compatible_forgemc_versions)
+
     // Put stuff from gradle.properties into the mod info
     processResources {
         def resourceTargets = ["fabric.mod.json", "quilt.mod.json", "META-INF/mods.toml"] // Location of where to inject the properties
@@ -366,6 +370,7 @@ allprojects { p ->
                 discord                      : mod_discord,
                 minecraft_version            : minecraft_version,
                 compatible_minecraft_versions: compatible_minecraft_versions,
+                compatible_forgemc_versions  : compatible_forgemc_versions,
                 java_version                 : java_version
         ]
         // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
diff --git a/forge/build.gradle b/forge/build.gradle
index fb88005dc..2ca65285b 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         maven { url = "https://maven.minecraftforge.net" }
-        maven { url = 'https://maven.parchmentmc.org' }
+        maven { url = "https://maven.parchmentmc.org" }
         maven { url = "https://repo.spongepowered.org/repository/maven-public/" }
         mavenCentral()
     }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 1a28469a2..94268a477 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -24,10 +24,10 @@ issueTrackerURL="${issues}"
 	#// Allow any version to be present (or not) on the server
 	acceptableRemoteVersions="*"
 
-# TODO: Add this for versioning in the build script
-#[[dependencies.lod]]
-#	modId="minecraft"
-#	mandatory=true
-#	versionRange="[1.18.2,)"
-#	ordering="NONE"
-#	side="BOTH"
\ No newline at end of file
+
+[[dependencies.lod]]
+	modId="minecraft"
+	mandatory=true
+	versionRange="${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
+	ordering="NONE"
+	side="BOTH"
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index a3821cc4f..ce910082f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2022.1.19
+manifold_version=2022.1.5
 toml_version=3.6.4
 nightconfig_version=3.6.6
 flatlaf_version=2.3
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb8790..070cb702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists