From 636ae1c30e6df6c1988112cc164f146811c9407a Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Thu, 28 Nov 2024 09:47:27 -0600
Subject: [PATCH] Begin initial build preparations for 1.21.4

---
 build.gradle.kts                                        | 7 +++++++
 fabric/src/main/resources/fabric.mod.json               | 4 ++--
 gradle.properties                                       | 6 +++---
 neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++--
 settings.gradle.kts                                     | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 477881a0..bd4b8a96 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,6 +75,13 @@ allprojects {
             name = "TerraformersMC"
         }
         maven("https://maven.neoforged.net/releases/")
+        maven("https://prmaven.neoforged.net/NeoForge/pr1590") {
+            name = "Maven for PR #1717" // https://github.com/neoforged/NeoForge/pull/1717
+            content {
+                includeModule("net.neoforged", "neoforge")
+                includeModule("net.neoforged", "testframework")
+            }
+        }
     }
 
     tasks.withType<JavaCompile> {
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 2195c3fb..240c1c8c 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -40,8 +40,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.16.7",
-    "fabric-api": ">=0.107.0",
-    "minecraft": ">=1.21.2 <1.21.4"
+    "fabric-api": ">=0.110.0",
+    "minecraft": ">=1.21.4 <1.21.5"
   },
   "custom": {
     "loom:injected_interfaces": {
diff --git a/gradle.properties b/gradle.properties
index 4026e2b1..f87de1e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21.3
+minecraft_version=1.21.4-rc1
 
 archives_base_name=bingo
 mod_version=1.1.12
 maven_group=io.github.gaming32
 
 fabric_loader_version=0.16.7
-fabric_api_version=0.107.0+1.21.3
+fabric_api_version=0.110.2+1.21.4
 
-neoforge_version=21.3.0-beta
+neoforge_version=21.4.0-alpha.1.21.4-rc1.date.time
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index b49626bd..e48269a7 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -27,13 +27,13 @@ file = "META-INF/accesstransformer.cfg"
 [[dependencies.bingo]]
    modId="neoforge"
    type="required"
-   versionRange="[21.2.1-beta,)"
+   versionRange="21.4.0-beta" # TODO
    ordering="NONE"
    side="BOTH"
 
 [[dependencies.bingo]]
    modId="minecraft"
    type="required"
-   versionRange="[1.21.2,1.21.4)"
+   versionRange="1.21.4" # TODO
    ordering="NONE"
    side="BOTH"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3b273f77..07b98364 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,4 +9,4 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("neoforge")
+//include("neoforge")