From 1f5eff2a0845a88f9ce90cfda8462e29be56be80 Mon Sep 17 00:00:00 2001 From: Grayray75 <69988482+Grayray75@users.noreply.github.com> Date: Fri, 3 May 2024 18:49:46 +0200 Subject: [PATCH] Update to Minecraft 1.20.5/6 --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 5 +++-- build.gradle | 25 ++++++++++------------- gradle.properties | 14 ++++++------- src/main/resources/fabric.mod.json | 4 ++-- src/main/resources/fpsdisplay.mixins.json | 2 +- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b175abd..d3657c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: "17" + java-version: "21" cache: "gradle" - name: Build with Gradle run: ./gradlew build --no-daemon diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d43933..6683cc0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" - java-version: "17" + java-version: "21" - name: Build and publish with Gradle run: ./gradlew build modrinth curseforge --stacktrace env: diff --git a/CHANGELOG.md b/CHANGELOG.md index fad3de1..1285ec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v4.1.0 + +* Update to Minecraft v1.20.5 / 1.20.6 + ## v4.0.1 * Fixed incorrect translation in the settings menu. diff --git a/README.md b/README.md index 19a8f81..8a86504 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,9 @@ You can download this mod from: | Minecraft version | Latest mod version | Support status | | ----------------- | ------------------ | ------------------------- | -| 1.20.3, 1.20.4 | `4.0.0` | :heavy_check_mark: Active | -| 1.14.0 - 1.20.1 | `3.1.0` | :x: Obsolete | +| 1.20.5, 1.20.6 | `4.1.0` | :heavy_check_mark: Active | +| 1.20.3, 1.20.4 | `4.0.0` | :x: Obsolete | +| 1.14.0 - 1.20.2 | `3.1.0` | :x: Obsolete | | 1.12.2 | | :white_circle: soon™ | | 1.8.9 | `3.1.0` | :warning: soon™ | diff --git a/build.gradle b/build.gradle index ed06b29..deecd8f 100644 --- a/build.gradle +++ b/build.gradle @@ -31,11 +31,7 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } - modApi("dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_config_version}") { - exclude(group: "org.quiltmc.parsers") - exclude(group: "com.twelvemonkeys.common") - exclude(group: "com.twelvemonkeys.imageio") - } + modApi "dev.isxander:yet-another-config-lib:${project.yacl_config_version}-fabric" } def includeFabricApiModule(String moduleName) { @@ -55,13 +51,13 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - // 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 { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 withSourcesJar() } @@ -72,7 +68,8 @@ jar { publishing { publications { - mavenJava(MavenPublication) { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name from components.java } } @@ -94,7 +91,7 @@ modrinth { changelog = "A changelog can be found at https://github.com/Grayray75/FPS-Display/blob/main/CHANGELOG.md" uploadFile = remapJar - gameVersions = ["1.20.3", "1.20.4"] + gameVersions = ["1.20.5", "1.20.6"] loaders = ["fabric", "quilt"] dependencies { optional.project "modmenu" @@ -113,11 +110,11 @@ curseforge { releaseType = "release" changelog = "A changelog can be found at https://github.com/Grayray75/FPS-Display/blob/main/CHANGELOG.md" - addGameVersion "1.20.3" - addGameVersion "1.20.4" + addGameVersion "1.20.5" + addGameVersion "1.20.6" addGameVersion "Fabric" addGameVersion "Quilt" - addGameVersion "Java 17" + addGameVersion "Java 21" mainArtifact(remapJar) { displayName = "v${project.mod_version} (${project.minecraft_version})" diff --git a/gradle.properties b/gradle.properties index e5de1d8..e238353 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # https://fabricmc.net/develop/ - minecraft_version=1.20.4 - yarn_mappings=1.20.4+build.3 - loader_version=0.15.9 + minecraft_version=1.20.5 + yarn_mappings=1.20.5+build.1 + loader_version=0.15.10 # Mod Properties mod_version=4.0.1 @@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx2G # Dependencies # https://linkie.shedaniel.dev/ - fabric_version=0.91.1+1.20.4 - modmenu_version=9.0.0 - cloth_config_version=13.0.121 - yacl_config_version=3.3.2+1.20.4 + fabric_version=0.97.8+1.20.5 + modmenu_version=10.0.0-beta.1 + cloth_config_version=14.0.126 + yacl_config_version=3.4.2+1.20.5 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 18b68d4..ecde19a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,8 +32,8 @@ "fpsdisplay.mixins.json" ], "depends": { - "fabricloader": ">=0.14.0", - "minecraft": ["1.20.3", "1.20.4"], + "fabricloader": ">=0.15.0", + "minecraft": ["1.20.5", "1.20.6"], "fabric-key-binding-api-v1": "*", "fabric-lifecycle-events-v1": "*" }, diff --git a/src/main/resources/fpsdisplay.mixins.json b/src/main/resources/fpsdisplay.mixins.json index d180cd3..6900362 100644 --- a/src/main/resources/fpsdisplay.mixins.json +++ b/src/main/resources/fpsdisplay.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "io.grayray75.mods.fpsdisplay.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ "InGameHudMixin",