Merge pull request #9 from olehrstm/feature/upgrade-to-1-21-10

feature/upgrade-to-1-21-10

Author: olehrstm

build.gradle.kts

@@ -50,9 +50,9 @@ 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") as String,
+            "loader_version" to project.property("loader_version") as String,
+            "kotlin_loader_version" to project.property("kotlin_loader_version") as String
         )
     }
 }

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 # 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.5+kotlin.2.2.10
+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=1.0.1
+mod_version=1.0.2
 maven_group=de.ole101.rpx
 archives_base_name=resourcepackextractor
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.132.0+1.21.8
+fabric_version=0.135.0+1.21.10

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/de/ole101/rpx/client/screen/ExtractPackScreen.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.minecraft.client.MinecraftClient
+import net.minecraft.client.gui.Click
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.widget.ButtonWidget
@@ -144,16 +145,19 @@ class ExtractPackScreen(private val parent: Screen) : Screen(Text.translatable("
         )
     }
 
-    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+    override fun mouseClicked(click: Click?, doubled: Boolean): Boolean {
+        if (click == null) return super.mouseClicked(click, doubled)
+
         if (extractionState.isExtracting.value) return true // block interaction while extracting
 
-        val hovered = listRenderer.getHoveredIndex(mouseX.toInt(), mouseY.toInt(), width, serverPackProfiles.size)
+        val hovered = listRenderer.getHoveredIndex(click.x.toInt(), click.y.toInt(), width, serverPackProfiles.size)
         if (hovered in serverPackProfiles.indices) {
             selectedIndex = hovered
             updateButtonStates()
             return true
         }
-        return super.mouseClicked(mouseX, mouseY, button)
+
+        return super.mouseClicked(click, doubled)
     }
 
     override fun resize(client: MinecraftClient?, width: Int, height: Int) {