From 3fa774286888e245e919a989dfed04beeb4cde40 Mon Sep 17 00:00:00 2001
From: TonimatasDEV <amatascubero@gmail.com>
Date: Thu, 13 Jun 2024 20:33:25 +0200
Subject: [PATCH] Port 1.21

---
 common/build.gradle.kts   | 2 +-
 gradle.properties         | 8 ++++----
 neoforge/build.gradle.kts | 6 +++++-
 settings.gradle.kts       | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 56b719b..b799fac 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,7 +1,7 @@
 val fabricLoaderVersion: String by extra
 
 architectury {
-    common("fabric", "forge", "neoforge")
+    common("fabric", /*"forge",*/ "neoforge")
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index 36d8e84..1c87f4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,15 +4,15 @@ org.gradle.jvmargs=-Xmx5G
 modVersion=1.4.1
 
 # Minecraft
-minecraftVersion=1.20.6
-minecraftVersionRange=1.20.5,1.20.6
+minecraftVersion=1.21
+minecraftVersionRange=1.21,1.21
 
 # Forge Properties
 forgeVersion=50.0.0
 
 # Fabric Properties
-fabricLoaderVersion=0.15.10
+fabricLoaderVersion=0.15.11
 yarnMappings=1
 
 # NeoForge Properties
-neoforgeVersion=20.6.2-beta
\ No newline at end of file
+neoforgeVersion=21.0.0-beta
\ No newline at end of file
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
index 0d07eed..538f34e 100644
--- a/neoforge/build.gradle.kts
+++ b/neoforge/build.gradle.kts
@@ -36,7 +36,11 @@ dependencies {
 }
 
 tasks.withType<ProcessResources> {
-    val replaceProperties = mapOf("minecraftVersionRange" to minecraftVersionRange, "modVersion" to modVersion)
+    val versionRangeSplit = minecraftVersionRange.split(",")
+    var versionRange = minecraftVersionRange
+    if (versionRangeSplit[0] == versionRangeSplit[1]) versionRange = versionRangeSplit[0]
+    
+    val replaceProperties = mapOf("minecraftVersionRange" to versionRange, "modVersion" to modVersion)
     inputs.properties(replaceProperties)
 
     filesMatching("META-INF/neoforge.mods.toml") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c127e47..34a01f4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,5 +7,5 @@ pluginManagement {
     }
 }
 
-include("common", "fabric", "forge", "neoforge")
+include("common", "fabric", /*"forge",*/ "neoforge")
 rootProject.name = "PacketFixer"