From 85af5d89d70053261f407a6d12ca31d2e7f6ec26 Mon Sep 17 00:00:00 2001
From: Xujiayao <i@xujiayao.com>
Date: Wed, 18 Mar 2026 21:50:10 +0800
Subject: [PATCH] JDK 25

---
 .github/workflows/build.yml                   | 4 ++--
 build.gradle                                  | 8 ++++----
 minecraft/src/main/resources/dmcc.mixins.json | 2 +-
 settings.gradle                               | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ebdac2c..330a240a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,11 +7,11 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v6
-      - name: Setup JDK 21
+      - name: Setup JDK 25
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v5
       - name: Setup Gradle
diff --git a/build.gradle b/build.gradle
index 381c65e8..26f38cb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,15 +14,15 @@ subprojects {
 
     version = mod_version
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(25)
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
     }
 
     tasks.withType(JavaCompile).configureEach {
-        options.release = 21
+        options.release = 25
         options.encoding = "UTF-8"
     }
 
diff --git a/minecraft/src/main/resources/dmcc.mixins.json b/minecraft/src/main/resources/dmcc.mixins.json
index bf62ee12..e24ca6a6 100644
--- a/minecraft/src/main/resources/dmcc.mixins.json
+++ b/minecraft/src/main/resources/dmcc.mixins.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "com.xujiayao.discord_mc_chat.minecraft.mixins",
-  "compatibilityLevel": "JAVA_21",
+  "compatibilityLevel": "JAVA_25",
   "mixins": [
     "MixinCommands",
     "MixinMinecraftServer",
diff --git a/settings.gradle b/settings.gradle
index adb84146..f1ff01c0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,5 +5,9 @@ pluginManagement {
     }
 }
 
+plugins {
+    id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0"
+}
+
 include(":core")
 include(":minecraft")