Merge branch '1.20.6'

.github/workflows/gradle.yml

@@ -28,10 +28,10 @@ jobs:
     - name: Validate Gradle wrapper
       uses: gradle/actions/wrapper-validation@v3
 
-    - name: Set up Java 17
+    - name: Set up Java 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'microsoft'
 
     - name: Grant execute permission for gradlew

README.md

@@ -12,7 +12,7 @@ The zoom from the [Wurst Client](https://www.wurstclient.net/) as a standalone m
 
 ## Setup (for developers)
 
-(This assumes that you are using Windows with [Eclipse](https://www.eclipse.org/downloads/) and [Java Development Kit 17](https://adoptium.net/?variant=openjdk17&jvmVariant=hotspot) already installed.)
+(This assumes that you are using Windows with [Eclipse](https://www.eclipse.org/downloads/) and [Java Development Kit 21](https://adoptium.net/?variant=openjdk21&jvmVariant=hotspot) already installed.)
 
 1. Clone or download the repository.
 

build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 def ENV = System.getenv()
 
-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
@@ -48,8 +48,8 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	// Minecraft 1.20.5 (24w14a) upwards uses Java 21.
+	it.options.release = 21
 }
 
 java {
@@ -102,7 +102,7 @@ curseforge {
 		changelogType = "html"
 		changelog = file("changelog.txt")
 		releaseType = "release"
-		addGameVersion "1.20.4"
+		addGameVersion "1.20.6"
 		addGameVersion "Fabric"
 
 		mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))

changelog.txt

@@ -1,2 +1,2 @@
-<p>A changelog can be found at:&nbsp;<a href="https://www.wimods.net/wi-zoom/wi-zoom-1-5/?mc=1.20.4&utm_source=CurseForge&utm_medium=WI+Zoom&utm_campaign=Changelog&utm_content=WI+Zoom+MC1.20.4">https://www.wimods.net/wi-zoom/wi-zoom-1-5/</a></p>
-<p><strong>Note:</strong> This mod requires <a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api/files/4933446" target="_blank" rel="noopener noreferrer">Fabric API for Minecraft 1.20.4</a>.</p>
+<p>A changelog can be found at:&nbsp;<a href="https://www.wimods.net/wi-zoom/wi-zoom-1-5/?mc=1.20.6&utm_source=CurseForge&utm_medium=WI+Zoom&utm_campaign=Changelog&utm_content=WI+Zoom+MC1.20.6">https://www.wimods.net/wi-zoom/wi-zoom-1-5/</a></p>
+<p><strong>Note:</strong> This mod requires <a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api/files/5298745" target="_blank" rel="noopener noreferrer">Fabric API for Minecraft 1.20.6</a>.</p>

gradle.properties

@@ -5,15 +5,15 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these at https://fabricmc.net/develop/ and
 # https://www.curseforge.com/minecraft/mc-mods/fabric-api
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
 loader_version=0.15.10
 
 #Fabric api
-fabric_version=0.97.0+1.20.4
+fabric_version=0.97.8+1.20.6
 
 # Mod Properties
-mod_version = 1.5-MC1.20.4
+mod_version = 1.5-MC1.20.6
 maven_group = net.wurstclient.zoom
 archives_base_name = WI-Zoom
 

src/main/resources/fabric.mod.json

@@ -31,9 +31,9 @@
 
   "depends": {
     "fabricloader": ">=0.15.9",
-    "fabric-api": ">=0.76.1",
-    "minecraft": "~1.20-alpha.23.12.a",
-    "java": ">=17"
+    "fabric-api": ">=0.96.14",
+    "minecraft": "~1.20.5-alpha.24.14.a",
+    "java": ">=21"
   },
   "suggests": {
     "cameranoclip": "*",