From 63274c088abf9914167f4552a2c69ef10ab67cab Mon Sep 17 00:00:00 2001
From: xzeldon <contact@zeldon.ru>
Date: Tue, 24 Sep 2024 16:43:44 +0300
Subject: [PATCH] 1.21.1

---
 .github/workflows/build.yml                       |  4 ++--
 build.gradle                                      |  9 ++++-----
 gradle.properties                                 | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 gradlew.bat                                       |  2 ++
 src/main/resources/fabric.mod.json                |  6 +++---
 src/main/resources/removeblockoutline.mixins.json |  2 +-
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1fc365f..3075a21 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-2022]
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
diff --git a/build.gradle b/build.gradle
index 68661f8..28f0473 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -37,8 +37,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
index 5c3e32b..c29a4ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.2
-loader_version=0.14.21
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+loader_version=0.16.2
 
 # Mod Properties
-mod_version = 1.1.2-1.20.1
+mod_version = 1.1.2-1.21.1
 maven_group = ru.xzeldon.removeblockoutline
 archives_base_name = removeblockoutline
 
 # Dependencies
-fabric_version=0.83.1+1.20.1
+fabric_version=0.102.1+1.21.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..e1adfb4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..b7de9a7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index d4a05f0..aaaf398 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -31,10 +31,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.6",
+    "fabricloader": ">=0.16.2",
     "fabric": "*",
-    "minecraft": "~1.20",
-    "java": ">=17"
+    "minecraft": "~1.21.1",
+    "java": ">=21"
   },
   "suggests": {
     "another-mod": "*"
diff --git a/src/main/resources/removeblockoutline.mixins.json b/src/main/resources/removeblockoutline.mixins.json
index 0a16218..d76c590 100644
--- a/src/main/resources/removeblockoutline.mixins.json
+++ b/src/main/resources/removeblockoutline.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "ru.xzeldon.removeblockoutline.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [