Update to 1.20.5-rc2

lucko · Apr 19, 2024 · 905031b · 905031b
1 parent a292dfd
commit 905031b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
@@ -1,13 +1,13 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '1.5-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 tasks.withType(JavaCompile) {
-    // override, compile targeting J17
-    options.release = 17
+    // override, compile targeting J21
+    options.release = 21
 }
 
 repositories {
@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:24w10a'
-    mappings 'net.fabricmc:yarn:24w10a+build.4:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.15.7'
+    minecraft 'com.mojang:minecraft:1.20.5-rc2'
+    mappings 'net.fabricmc:yarn:1.20.5-rc2+build.1:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.15.10'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,12 +40,12 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.91.2+1.20.4'))
+        modImplementation(fabricApi.module(it, '0.97.3+1.20.5'))
     }
 
-    include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT'))
+    include(modImplementation('me.lucko:fabric-permissions-api:0.3.1'))
 
-    modImplementation('eu.pb4:placeholder-api:2.0.0-beta.4+1.19')
+    modImplementation('eu.pb4:placeholder-api:2.4.0-pre.1+1.20.5')
 
     shade project(':spark-common')
 }

diff --git a/spark-fabric/src/main/resources/spark.mixins.json b/spark-fabric/src/main/resources/spark.mixins.json
@@ -1,7 +1,6 @@
 {
   "required": true,
   "package": "me.lucko.spark.fabric.mixin",
-  "compatibilityLevel": "JAVA_17",
   "client": [
     "ClientEntityManagerAccessor",
     "ClientWorldAccessor",