From e9bb823be31eb1c165b381c2a5f84af0042d5bd6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sun, 19 Oct 2025 17:14:09 +0200 Subject: [PATCH 1/3] Updated some small things Signed-off-by: Sebastian --- .github/workflows/build.yml | 30 +++++++++++++++++++ build.gradle.kts | 15 +++++----- gradle.properties | 16 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../sebiann/qol27/client/SaveCoordinates.kt | 4 --- .../qol27/client/WoodStrippingDetection.kt | 18 +++++------ src/main/resources/fabric.mod.json | 4 +-- 7 files changed, 58 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 src/main/java/moe/sebiann/qol27/client/SaveCoordinates.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..798ec8d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request] + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ diff --git a/build.gradle.kts b/build.gradle.kts index 1f71b4a..c6817d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "2.2.0" + kotlin("jvm") version "2.2.20" id("fabric-loom") version "1.11-SNAPSHOT" - kotlin("plugin.serialization") version "2.0.20" + kotlin("plugin.serialization") version "2.3.0-Beta1" id("maven-publish") } @@ -55,8 +55,8 @@ dependencies { modImplementation("dev.isxander:yet-another-config-lib:${project.property("yacl_version")}") modImplementation("com.terraformersmc:modmenu:${project.property("modmenu_version")}") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1") - compileOnlyApi("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0-RC.2") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") + compileOnlyApi("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2") } tasks.processResources { @@ -68,9 +68,10 @@ tasks.processResources { filesMatching("fabric.mod.json") { expand( "version" to project.version, - "minecraft_version" to project.property("minecraft_version"), - "loader_version" to project.property("loader_version"), - "kotlin_loader_version" to project.property("kotlin_loader_version") + "minecraft_version" to project.property("minecraft_version").toString(), + "loader_version" to project.property("loader_version").toString(), + "kotlin_loader_version" to project.property("kotlin_loader_version").toString(), + "yacl_version" to project.property("yacl_version").toString() ) } } diff --git a/gradle.properties b/gradle.properties index 6f4a676..a8e0865 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.8 -yarn_mappings=1.21.8+build.1 -loader_version=0.17.2 -kotlin_loader_version=1.13.4+kotlin.2.2.0 +minecraft_version=1.21.10 +yarn_mappings=1.21.10+build.2 +loader_version=0.17.3 +kotlin_loader_version=1.13.6+kotlin.2.2.20 # Mod Properties -mod_version=0.3.2 +mod_version=0.3.3 maven_group=moe.sebiann archives_base_name=Qol27 # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.133.0+1.21.8 -yacl_version=3.7.1+1.21.6-fabric -modmenu_version=15.0.0 +fabric_version=0.136.0+1.21.10 +yacl_version=3.8.0+1.21.9-fabric +modmenu_version=16.0.0-rc.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..2e11132 100644 --- 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/moe/sebiann/qol27/client/SaveCoordinates.kt b/src/main/java/moe/sebiann/qol27/client/SaveCoordinates.kt deleted file mode 100644 index 7ca1527..0000000 --- a/src/main/java/moe/sebiann/qol27/client/SaveCoordinates.kt +++ /dev/null @@ -1,4 +0,0 @@ -package moe.sebiann.qol27.client - -class SaveCoordinates { -} \ No newline at end of file diff --git a/src/main/java/moe/sebiann/qol27/client/WoodStrippingDetection.kt b/src/main/java/moe/sebiann/qol27/client/WoodStrippingDetection.kt index e604c3a..6786174 100644 --- a/src/main/java/moe/sebiann/qol27/client/WoodStrippingDetection.kt +++ b/src/main/java/moe/sebiann/qol27/client/WoodStrippingDetection.kt @@ -37,13 +37,13 @@ object WoodStrippingDetection { } private fun isStrippableWood(block: Block?): Boolean { - val strippableBlocks = setOf( - Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, - Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.MANGROVE_LOG, Blocks.CHERRY_LOG, - Blocks.OAK_WOOD, Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, - Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, Blocks.MANGROVE_WOOD, Blocks.CHERRY_WOOD, - Blocks.CRIMSON_STEM, Blocks.WARPED_STEM - ) - return block in strippableBlocks - } + val strippableBlocks = setOf( + Blocks.OAK_LOG, Blocks.SPRUCE_LOG, Blocks.BIRCH_LOG, Blocks.JUNGLE_LOG, + Blocks.ACACIA_LOG, Blocks.DARK_OAK_LOG, Blocks.MANGROVE_LOG, Blocks.CHERRY_LOG, + Blocks.OAK_WOOD, Blocks.SPRUCE_WOOD, Blocks.BIRCH_WOOD, Blocks.JUNGLE_WOOD, + Blocks.ACACIA_WOOD, Blocks.DARK_OAK_WOOD, Blocks.MANGROVE_WOOD, Blocks.CHERRY_WOOD, + Blocks.CRIMSON_STEM, Blocks.WARPED_STEM + ) + return block in strippableBlocks + } } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b620345..2a943b9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,10 +23,10 @@ }, "mixins": [], "depends": { - "yet_another_config_lib_v3": ">=3.7.1+1.21.5-fabric", + "yet_another_config_lib_v3": ">=${yacl_version}", "fabricloader": ">=${loader_version}", "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", - "minecraft": "${minecraft_version}" + "minecraft": "<=${minecraft_version}" } } \ No newline at end of file From 0f9371f3c52dde16ec1afd7944af16f45580f981 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 8 Nov 2025 17:43:17 +0100 Subject: [PATCH 2/3] Update final Signed-off-by: Sebastian --- build.gradle.kts | 6 +++--- gradle.properties | 4 ++-- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6817d9..6a83181 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,9 +2,9 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "2.2.20" - id("fabric-loom") version "1.11-SNAPSHOT" - kotlin("plugin.serialization") version "2.3.0-Beta1" + kotlin("jvm") version "2.2.21" + id("fabric-loom") version "1.12-SNAPSHOT" + kotlin("plugin.serialization") version "2.3.0-Beta2" id("maven-publish") } diff --git a/gradle.properties b/gradle.properties index a8e0865..05f804b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,13 @@ org.gradle.jvmargs=-Xmx2G minecraft_version=1.21.10 yarn_mappings=1.21.10+build.2 loader_version=0.17.3 -kotlin_loader_version=1.13.6+kotlin.2.2.20 +kotlin_loader_version=1.13.7+kotlin.2.2.21 # Mod Properties mod_version=0.3.3 maven_group=moe.sebiann archives_base_name=Qol27 # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.136.0+1.21.10 +fabric_version=0.138.0+1.21.10 yacl_version=3.8.0+1.21.9-fabric modmenu_version=16.0.0-rc.1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2a943b9..0bafc62 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,7 +3,7 @@ "id": "qol27", "version": "${version}", "name": "QoL27", - "description": "Multiple Quality of Life improvements for Minecraft 1.21.8", + "description": "Multiple Quality of Life improvements for Minecraft 1.21.10", "authors": [ "Sebiann" ], From f29d8f08b951d5536b9be29b5ba471c41f4448c3 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 8 Nov 2025 17:47:57 +0100 Subject: [PATCH 3/3] Update GitHub Actions workflow for build and publish --- .github/workflows/build.yml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 798ec8d..26f2f92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,26 +5,33 @@ name: build on: [pull_request] - jobs: - build: - runs-on: ubuntu-24.04 + build-and-publish: + runs-on: ubuntu-latest steps: - - name: checkout repository + - name: Checkout repository uses: actions/checkout@v4 - - name: validate gradle wrapper - uses: gradle/actions/wrapper-validation@v4 - - name: setup jdk + + - name: Set up JDK 21 uses: actions/setup-java@v4 with: + distribution: 'temurin' java-version: '21' - distribution: 'microsoft' - - name: make gradle wrapper executable - run: chmod +x ./gradlew - - name: build + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle run: ./gradlew build - - name: capture build artifacts - uses: actions/upload-artifact@v4 + + - name: Publish to GitHub and Modrinth + uses: Kir-Antipov/mc-publish@v3.3 with: - name: Artifacts - path: build/libs/ + github-token: ${{ secrets.GITHUB_TOKEN }} + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + files: build/libs/!(*-dev).jar + + name: ${{ github.event.release.name }} + version: ${{ github.ref_name }} + changelog: ${{ github.event.release.body }}