1.21 port

lilgallon · Jun 16, 2024 · 9eefaef · 9eefaef
1 parent 72ea3ac
commit 9eefaef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 1.4.7 for Minecraft 1.21
+
+- MC 1.21 support
+
 ## Version 1.4.7 for Minecraft 1.20.4
 
 - Add japanese traduction

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'idea'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
 }
 
 version = "MC${minecraft_version}-${mod_version}"
@@ -10,7 +10,7 @@ base {
     archivesName = mod_id
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
@@ -39,6 +39,9 @@ repositories {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+
+    // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 }
 
 tasks.named('processResources', ProcessResources).configure {

diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.21)
-forge_version=49.0.30
-forge_version_range=[49,)
-loader_version_range=[49,)
+minecraft_version=1.21
+minecraft_version_range=[1.21,1.21)
+forge_version=51.0.8
+forge_version_range=[51,)
+loader_version_range=[51,)
 
 mapping_channel=official
-mapping_version=1.20.4
+mapping_version=1.21
 
 mod_id=horsestatsmod
 mod_name=HorseStatsMod