From 5e2912f39d972138de0cf25929e1f31a6b043ee8 Mon Sep 17 00:00:00 2001
From: JIA <430731352@qq.com>
Date: Sun, 28 Jun 2026 15:20:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6CurseMaven?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BB=93=E5=BA=93=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2afde484..86f74e96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,18 @@ version = mod_version
 group = mod_group_id
 
 repositories {
+    exclusiveContent {
+        forRepository {
+            maven {
+                name = 'CurseMaven'
+                url = 'https://cursemaven.com'
+            }
+        }
+        filter {
+            includeGroup 'curse.maven'
+        }
+    }
+
     mavenLocal()
     maven {
         name = 'Aliyun Public'
@@ -31,10 +43,6 @@ repositories {
         name = 'Registrate'
         url = 'https://maven.ithundxr.dev/snapshots'
     }
-    maven {
-        name = 'CurseMaven'
-        url = 'https://cursemaven.com'
-    }
     maven {
         name = 'Jared Maven'
         url = 'https://maven.blamejared.com'

From bc344f7de99c3a7bd92557cb2cf259afc4770b5d Mon Sep 17 00:00:00 2001
From: JIA <430731352@qq.com>
Date: Sun, 28 Jun 2026 15:29:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6NeoForge=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=93=E5=BA=93=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.gradle | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e8c1fb04..0c98a757 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,18 @@
 pluginManagement {
     repositories {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'NeoForge'
+                    url = 'https://maven.neoforged.net/releases'
+                }
+            }
+            filter {
+                includeGroup 'net.neoforged'
+                includeGroup 'net.neoforged.moddev'
+            }
+        }
+
         mavenLocal()
         maven {
             name = 'Aliyun Gradle Plugin'
@@ -10,7 +23,6 @@ pluginManagement {
             url = 'https://maven.aliyun.com/repository/public'
         }
         gradlePluginPortal()
-        maven { url = 'https://maven.neoforged.net/releases' }
     }
 }
 

From 23a2d71858504655a33e3c872f5eb54cf21e57e7 Mon Sep 17 00:00:00 2001
From: JIA <430731352@qq.com>
Date: Sun, 28 Jun 2026 15:31:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4Gradle=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle    | 8 --------
 settings.gradle | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 86f74e96..362f5c18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,14 +22,6 @@ repositories {
     }
 
     mavenLocal()
-    maven {
-        name = 'Aliyun Public'
-        url = 'https://maven.aliyun.com/repository/public'
-    }
-    maven {
-        name = 'Aliyun Central'
-        url = 'https://maven.aliyun.com/repository/central'
-    }
     mavenCentral()
     maven {
         name = 'NeoForge'
diff --git a/settings.gradle b/settings.gradle
index 0c98a757..42c43563 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,14 +14,6 @@ pluginManagement {
         }
 
         mavenLocal()
-        maven {
-            name = 'Aliyun Gradle Plugin'
-            url = 'https://maven.aliyun.com/repository/gradle-plugin'
-        }
-        maven {
-            name = 'Aliyun Public'
-            url = 'https://maven.aliyun.com/repository/public'
-        }
         gradlePluginPortal()
     }
 }

From b92bd637b5af4a57b21a7355238fb7af843f5c19 Mon Sep 17 00:00:00 2001
From: JIA <430731352@qq.com>
Date: Sun, 28 Jun 2026 15:35:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9D=A5=E6=BA=90=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ca7164b..32dcc60a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,6 +38,16 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Validate tag release branch
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+        shell: bash
+        run: |
+          git fetch --no-tags origin '+refs/heads/1.21.1:refs/remotes/origin/1.21.1'
+          if ! git merge-base --is-ancestor "$GITHUB_SHA" origin/1.21.1; then
+            echo "::error::Tag $GITHUB_REF_NAME points to $GITHUB_SHA, which is not contained in origin/1.21.1."
+            exit 1
+          fi
+
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with: