refactor: fix critical bugs and code quality issues (1.21.x port)

Same fixes as on 1.20.x and dev branches:
- fabric.mod.json: dynamic minecraft_version dep
- StackableTools.kt: /stackabletools reload subcommand, gio open
- ScreenHandlerMixin: extracted tryMerge helper
- build.gradle.kts: processResources minecraft_dependency, resources srcDir
- Deleted dead files: compile.sh, compile_config.*, gradle-mc-versions.properties

Author: YoannDev90

build.gradle.kts

@@ -35,10 +35,6 @@ loom {
 }
 
 fabricApi {
-	configureDataGeneration {
-		client = true
-	}
-	
 	configureTests {
 		createSourceSet = true
 		modId = "stackabletools-test"
@@ -48,9 +44,10 @@ fabricApi {
 	}
 }
 
-	sourceSets {
+sourceSets {
 	named("main") {
 		java.srcDir("src/mc-$mcVersion/kotlin")
+		resources.srcDir("src/mc-$mcVersion/resources")
 	}
 	named("gametest") {
 		java.setSrcDirs(listOf("src/mc-$mcVersion/gametest/kotlin"))
@@ -75,10 +72,13 @@ dependencies {
 // Afin d'empaqueter toml4j dans le JAR, on inclut le runtime dans la tâche jar.
 
 tasks.processResources {
+	val minecraftDep = providers.gradleProperty("minecraft_version").get()
+
 	inputs.property("version", version)
+	inputs.property("minecraft_dependency", minecraftDep)
 
 	filesMatching("fabric.mod.json") {
-		expand("version" to version)
+		expand("version" to version, "minecraft_dependency" to minecraftDep)
 	}
 }
 

compile.sh

@@ -29,7 +29,7 @@
   "mixins": ["stackabletools.mixins.json"],
   "depends": {
     "fabricloader": ">=0.18.5",
-    "minecraft": ">=1.21.0",
+    "minecraft": "${minecraft_dependency}",
     "java": ">=21",
     "fabric-api": "*",
     "fabric-language-kotlin": "*"

compile_config_sample.json

@@ -123,13 +123,16 @@ object StackableTools : ModInitializer {
 			)
 
 			dispatcher.register(
-				CommandManager.literal("reload")
-					.requires { it.hasPermissionLevel(2) }
-					.executes { context ->
-						ConfigManager.loadConfig()
-						context.source.sendFeedback({ Text.literal("Configuration reloaded!") }, false)
-						1
-					}
+				CommandManager.literal("stackabletools")
+					.then(
+						CommandManager.literal("reload")
+							.requires { it.hasPermissionLevel(2) }
+							.executes { context ->
+								ConfigManager.loadConfig()
+								context.source.sendFeedback({ Text.literal("Configuration reloaded!") }, false)
+								1
+							}
+					)
 			)
 
 			dispatcher.register(
@@ -164,7 +167,7 @@ object StackableTools : ModInitializer {
 							// Attempt 3: gnome-open (Legacy systems)
 							if (!opened) {
 								try {
-									Runtime.getRuntime().exec(arrayOf("gnome-open", configFile.path))
+									Runtime.getRuntime().exec(arrayOf("gio", "open", configFile.path))
 									opened = true
 								} catch (_: Exception) {}
 							}

gradle-mc-versions.properties

@@ -28,39 +28,30 @@ abstract class ScreenHandlerMixin {
      * Injected into the onSlotClick function to monitor and modify player mouse clicks within inventories.
      * We manually handle the PICKUP action when the item is marked as stackable by the mod.
      */
+    private fun tryMerge(handler: ScreenHandler, slotIndex: Int): Boolean {
+        if (slotIndex < 0 || slotIndex >= handler.slots.size) return false
+        val slot = handler.getSlot(slotIndex)
+        val cursorStack = handler.cursorStack
+        val slotStack = slot.stack
+        if (cursorStack.isEmpty || slotStack.isEmpty) return false
+        if (!StackableToolsUtils.isStackableItem(cursorStack) || !StackableToolsUtils.canStackItems(cursorStack, slotStack)) return false
+
+        val cfg = ConfigManager.getConfig().stacking
+        val maxStack = StackableToolsUtils.maxStackFor(cursorStack, cfg)
+
+        val canTransfer = (maxStack - slotStack.count).coerceAtLeast(0)
+        if (canTransfer <= 0) return false
+        val toTransfer = minOf(cursorStack.count, canTransfer)
+        slotStack.count += toTransfer
+        cursorStack.count -= toTransfer
+        handler.syncState()
+        return true
+    }
+
     @Inject(method = ["onSlotClick"], at = [At("HEAD")], cancellable = true)
-    private fun onSlotClick(slotIndex: Int, button: Int, actionActionType: SlotActionType, player: PlayerEntity, ci: CallbackInfo) {
-        // Run logic only on the server to prevent synchronization mismatches
+    private fun onSlotClick(slotIndex: Int, button: Int, actionType: SlotActionType, player: PlayerEntity, ci: CallbackInfo) {
         if (player.getWorld().isClient) return
-        
-        if (actionActionType == SlotActionType.PICKUP) {
-            val handler = this as Any as ScreenHandler
-            if (slotIndex < 0 || slotIndex >= handler.slots.size) return
-            
-            val slot = handler.getSlot(slotIndex)
-            val cursorStack = handler.cursorStack
-            val slotStack = slot.stack
-
-            // Logic: if current cursor item and slot item are the same "stackable" tool/potion, merge them manually
-            if (!cursorStack.isEmpty && !slotStack.isEmpty && 
-                StackableToolsUtils.isStackableItem(cursorStack) &&
-                StackableToolsUtils.canStackItems(cursorStack, slotStack)) {
-                
-                val cfg = ConfigManager.getConfig().stacking
-                // Determine limits for the category
-                val maxStack = StackableToolsUtils.maxStackFor(cursorStack, cfg)
-                
-                val canTransfer = (maxStack - slotStack.count).coerceAtLeast(0)
-                if (canTransfer > 0) {
-                    val toTransfer = minOf(cursorStack.count, canTransfer)
-                    slotStack.count += toTransfer
-                    cursorStack.count -= toTransfer
-                    
-                    // Sync the state with client side to ensure visual representation is correct
-                    handler.syncState()
-                    ci.cancel() // Interrupt vanilla behavior
-                }
-            }
-        }
+        val handler = this as Any as ScreenHandler
+        if (actionType == SlotActionType.PICKUP && tryMerge(handler, slotIndex)) ci.cancel()
     }
 }

src/main/resources/fabric.mod.json

@@ -144,7 +144,7 @@ object StackableTools : ModInitializer {
 
 							if (!opened) {
 								try {
-									Runtime.getRuntime().exec(arrayOf("gnome-open", configFile.path))
+									Runtime.getRuntime().exec(arrayOf("gio", "open", configFile.path))
 									opened = true
 								} catch (_: Exception) {}
 							}