Update to 1.20.5 (#80)

* Update to 1.20.5 * Update Java to 21 in GitHub Actions --------- Co-authored-by: EnderKill98 <[email protected]>
ramidzkh · Apr 26, 2024 · b8acf1b · b8acf1b
1 parent f90b266
commit b8acf1b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,11 +12,11 @@ jobs:
         uses: actions/checkout@v4
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Use Gradle cache for faster builds
         uses: actions/cache@v3
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,11 +16,11 @@ jobs:
         uses: actions/checkout@v4
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build
         run: ./gradlew build
         env:

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "1.4-SNAPSHOT"
+    id("fabric-loom") version "1.6-SNAPSHOT"
     id("com.matthewprenger.cursegradle") version "1.4.0"
     id("com.modrinth.minotaur") version "2.4.4"
 }
@@ -28,18 +28,18 @@ repositories {
 }
 
 dependencies {
-    minecraft("net.minecraft:minecraft:1.20.4")
-    mappings("net.fabricmc:yarn:1.20.4+build.1")
-    modImplementation("net.fabricmc:fabric-loader:0.15.2")
+    minecraft("net.minecraft:minecraft:1.20.5")
+    mappings("net.fabricmc:yarn:1.20.5+build.1")
+    modImplementation("net.fabricmc:fabric-loader:0.15.10")
 
-    modImplementation("net.fabricmc.fabric-api:fabric-api:0.91.3+1.20.4")
-    modImplementation("com.terraformersmc:modmenu:9.0.0-pre.1")
-    modImplementation("me.shedaniel.cloth:cloth-config-fabric:13.0.114")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:0.97.5+1.20.5")
+    modImplementation("com.terraformersmc:modmenu:10.0.0-beta.1")
+    modImplementation("me.shedaniel.cloth:cloth-config-fabric:14.0.126")
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 

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.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/me/ramidzkh/fabrishot/mixins/RenderSystemMixin.java b/src/main/java/me/ramidzkh/fabrishot/mixins/RenderSystemMixin.java
@@ -14,7 +14,7 @@ public class RenderSystemMixin {
     @Unique
     private static boolean wasLastFrameInCapture;
 
-    @Redirect(method = "flipFrame", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapBuffers(J)V"))
+    @Redirect(method = "flipFrame", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSwapBuffers(J)V"), remap = false)
     private static void glfwSwapBuffers(long window) {
         if (Fabrishot.isInCapture()) {
             wasLastFrameInCapture = true;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -18,14 +18,14 @@
   "name": "Fabrishot",
   "description": "Take high resolution screenshots because why not",
   "depends": {
-    "minecraft": "1.20.4",
+    "minecraft": "1.20.5",
     "fabric-lifecycle-events-v1": "*",
     "fabric-key-binding-api-v1": "*"
   },
   "recommends": {
     "fabric-resource-loader-v0": "*",
-    "modmenu": ">=7.0.0",
-    "cloth-config2": ">=11.0.0"
+    "modmenu": ">=10.0.0-beta.1",
+    "cloth-config2": ">=14.0.126"
   },
   "authors": [
     "ramidzkh"