update to 1.21.10

.github/workflows/build.yml

@@ -0,0 +1,37 @@
+# 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-and-publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Publish to GitHub and Modrinth
+        uses: Kir-Antipov/mc-publish@v3.3
+        with:
+          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 }}

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"
-    id("fabric-loom") version "1.11-SNAPSHOT"
-    kotlin("plugin.serialization") version "2.0.20"
+    kotlin("jvm") version "2.2.21"
+    id("fabric-loom") version "1.12-SNAPSHOT"
+    kotlin("plugin.serialization") version "2.3.0-Beta2"
     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()
         )
     }
 }

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.7+kotlin.2.2.21
 # 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.138.0+1.21.10
+yacl_version=3.8.0+1.21.9-fabric
+modmenu_version=16.0.0-rc.1

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

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
+    }
 }

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"
   ],
@@ -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}"
   }
 }