From 0f863b4364d5069907d5b0043bf63783d9e216ca Mon Sep 17 00:00:00 2001
From: "Josiah (Gaming32) Glosson" <soujournme@gmail.com>
Date: Thu, 7 Dec 2023 16:11:07 -0600
Subject: [PATCH] Change 1.20.3/1.20.4 version to build on 1.20.4

---
 build.gradle.kts                      | 8 ++++----
 settings.gradle.kts                   | 4 ++--
 src/main/resources/META-INF/mods.toml | 8 +++++++-
 src/main/resources/fabric.mod.json    | 4 +++-
 version.gradle.kts                    | 8 ++++----
 versions/mainProject                  | 2 +-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 70a4341..45518ca 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,8 +8,8 @@ repositories {
 }
 
 preprocess {
-    val fabric12003 = createNode("1.20.3-fabric", 1_20_03, "yarn")
-    val neoforge12003 = createNode("1.20.3-neoforge", 1_20_03, "yarn")
+    val fabric12004 = createNode("1.20.4-fabric", 1_20_04, "yarn")
+    val neoforge12004 = createNode("1.20.4-neoforge", 1_20_04, "yarn")
     val fabric12002 = createNode("1.20.2-fabric", 1_20_02, "yarn")
     val neoforge12002 = createNode("1.20.2-neoforge", 1_20_02, "yarn")
     val fabric12001 = createNode("1.20.1-fabric", 1_20_01, "yarn")
@@ -26,8 +26,8 @@ preprocess {
     val forge11605 = createNode("1.16.5-forge", 1_16_05, "srg")
     val fabric11601 = createNode("1.16.1-fabric", 1_16_01, "yarn")
 
-    fabric12003.link(neoforge12003)
-    neoforge12003.link(neoforge12002)
+    fabric12004.link(neoforge12004)
+    neoforge12004.link(neoforge12002)
     neoforge12002.link(fabric12002)
     fabric12002.link(fabric12001)
     fabric12001.link(forge12001)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3b39224..b7d5fc9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -37,8 +37,8 @@ listOf(
     "1.20.1-fabric",
     "1.20.2-neoforge",
     "1.20.2-fabric",
-    "1.20.3-neoforge",
-    "1.20.3-fabric",
+    "1.20.4-neoforge",
+    "1.20.4-fabric",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 019f73e..0517f59 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -36,6 +36,12 @@ side = "BOTH"
 [[dependencies.world_host]]
 modId = "minecraft"
 mandatory = true
-versionRange = "$mc_version"
+##if MC == 1.20.1
+#?? versionRange = "[1.20,1.20.2)"
+##elseif MC == 1.20.4
+versionRange = "[1.20.3,1.20.5)"
+##else
+#?? versionRange = "$mc_version"
+##endif
 ordering = "NONE"
 side = "BOTH"
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index af3322f..d8088c8 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -32,8 +32,10 @@
     //?? "minecraft": ">=1.19.4 <1.20",
     //#elseif MC == 1.20.1
     //?? "minecraft": ">=1.20- <1.20.2",
+    //#elseif MC == 1.20.4
+    "minecraft": ">=1.20.3- <1.20.5",
     //#else
-    "minecraft": "$mc_version",
+    //?? "minecraft": "$mc_version",
     //#endif
     "fabric-resource-loader-v0": "*"
   },
diff --git a/version.gradle.kts b/version.gradle.kts
index e055f3f..9808989 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -100,7 +100,7 @@ unimined.minecraft {
         isNeoForge -> neoForged {
             loader(when (mcVersion) {
                 1_20_02 -> "86"
-                1_20_03 -> "1-beta"
+                1_20_04 -> "2-beta"
                 else -> throw IllegalStateException("Unknown NeoForge version for $mcVersionString")
             })
             minecraftRemapper.config {
@@ -223,7 +223,7 @@ dependencies {
 
     if (isFabric) {
         when (mcVersion) {
-            1_20_03 -> "9.0.0-pre.1" // TODO: Update out of pre
+            1_20_04 -> "9.0.0-pre.1" // TODO: Update out of pre
             1_20_02 -> "8.0.0"
             1_20_01 -> "7.2.2"
             1_19_04 -> "6.3.1"
@@ -247,7 +247,7 @@ dependencies {
 
     if (isFabric) {
         when (mcVersion) {
-            1_20_03 -> "0.91.1+1.20.3"
+            1_20_04 -> "0.91.1+1.20.3"
             1_20_02 -> "0.91.1+1.20.2"
             1_20_01 -> "0.91.0+1.20.1"
             1_19_04 -> "0.87.2+1.19.4"
@@ -325,7 +325,7 @@ modrinth {
     when (mcVersion) {
         1_19_04 -> "23w13a_or_b"
         1_20_01 -> "1.20"
-        1_20_03 -> "1.20.4" // TODO: Invert this when 1.20.4 is buildable
+        1_20_04 -> "1.20.3"
         else -> null
     }?.let(gameVersions::add)
     loaders.add(loaderName)
diff --git a/versions/mainProject b/versions/mainProject
index 8a82347..66d55ba 100644
--- a/versions/mainProject
+++ b/versions/mainProject
@@ -1 +1 @@
-1.20.3-fabric
\ No newline at end of file
+1.20.4-fabric
\ No newline at end of file