refactor: split version-specific code into multi-version source directories

- Move StackableToolsUtils.kt and ItemStackMixin.kt to src/mc-{1.20.4,1.20.5}/
- Add -PmcVersion build parameter for version selection
- Update build.gradle.kts with version-specific sourceSets
- Add gradle-mc-versions.properties as build reference
- Update game tests with templateName and improved error handling
- Expand fabric.mod.json version range to >=1.20.0

Author: YoannDev90

build.gradle.kts

@@ -6,6 +6,10 @@ plugins {
 	id("org.jetbrains.kotlin.jvm") version "2.3.20"
 }
 
+// Multi-version: use -PmcVersion=<version> (default: 1.20.6)
+// to select version-specific source dirs (src/mc-<version>/{kotlin,gametest}).
+val mcVersion: String = providers.gradleProperty("mcVersion").orElse("1.20.5").get()
+
 version = providers.gradleProperty("mod_version").get()
 group = providers.gradleProperty("maven_group").get()
 
@@ -46,10 +50,20 @@ fabricApi {
 	}
 }
 
+// Add version-specific source directories
+sourceSets {
+	named("main") {
+		java.srcDir("src/mc-$mcVersion/kotlin")
+	}
+	named("gametest") {
+		java.srcDir("src/mc-$mcVersion/gametest/kotlin")
+	}
+}
+
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}")
-	mappings("net.fabricmc:yarn:1.20.5+build.1:v2")
+	mappings("net.fabricmc:yarn:${providers.gradleProperty("yarn_mappings").get()}:v2")
 	modImplementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}")
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
@@ -61,8 +75,6 @@ dependencies {
 	implementation("org.json:json:20240303")
 }
 
-// Afin d'empaqueter toml4j dans le JAR, on inclut le runtime dans la tâche jar.
-
 tasks.processResources {
 	inputs.property("version", version)
 
@@ -82,9 +94,6 @@ kotlin {
 }
 
 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
 	sourceCompatibility = JavaVersion.VERSION_17
@@ -118,7 +127,6 @@ publishing {
 		}
 	}
 
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 	repositories {
 		// Add repositories to publish to here.
 		// Notice: This block does NOT have the same function as the block in the top level.

gradle-mc-versions.properties

@@ -0,0 +1,8 @@
+# Multi-version dependency reference
+# Usage: ./gradlew build -PmcVersion=<version> -Pminecraft_version=<mc_ver> ...
+#
+# 1.20.x defaults (from gradle.properties):
+#   minecraft_version=1.20.6, yarn_mappings=1.20.5+build.1, fabric_api_version=0.97.3+1.20.5
+
+# To build for 1.20.4:
+# ./gradlew build -PmcVersion=1.20.4 -Pminecraft_version=1.20.4 -Pyarn_mappings=1.20.4+build.3 -Pfabric_api_version=0.97.3+1.20.4

gradle.properties

@@ -1,15 +1,12 @@
-# Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xms1g -Xmx4g -XX:MaxMetaspaceSize=2g -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-
-# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349
 org.gradle.configuration-cache=false
 
 # Fabric Properties
-# check these on https://fabricmc.net/develop
 minecraft_version=1.20.5
 loader_version=0.18.5
 loom_version=1.15-SNAPSHOT
+yarn_mappings=1.20.5+build.1
 fabric_kotlin_version=1.13.10+kotlin.2.3.20
 
 # Mod Properties
@@ -18,4 +15,4 @@ maven_group=stackabletools
 archives_base_name=stackabletools
 
 # Dependencies
-fabric_api_version=0.97.3+1.20.5
+fabric_api_version=0.97.3+1.20.5

src/gametest/kotlin/stackabletools/StackableToolsGameTest.kt

@@ -23,7 +23,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that two identical diamond pickaxes can be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testIdenticalToolsCanStack(context: TestContext) {
 		val pickaxe1 = ItemStack(Items.DIAMOND_PICKAXE, 1)
 		val pickaxe2 = ItemStack(Items.DIAMOND_PICKAXE, 1)
@@ -38,7 +38,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that damaged tools cannot be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testDamagedToolsCannotStack(context: TestContext) {
 		val pickaxe1 = ItemStack(Items.DIAMOND_PICKAXE, 1)
 		val pickaxe2 = ItemStack(Items.DIAMOND_PICKAXE, 1)
@@ -56,7 +56,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that different item types cannot be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testDifferentItemsCannotStack(context: TestContext) {
 		val pickaxe = ItemStack(Items.DIAMOND_PICKAXE, 1)
 		val axe = ItemStack(Items.DIAMOND_AXE, 1)
@@ -71,7 +71,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that empty stacks cannot be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testEmptyStacksCannotStack(context: TestContext) {
 		val pickaxe = ItemStack(Items.DIAMOND_PICKAXE, 1)
 		val empty = ItemStack.EMPTY
@@ -86,7 +86,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that diamond pickaxes are identified as stackable when tools category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testToolsAreStackableWhenCategoryActive(context: TestContext) {
 		val pickaxe = ItemStack(Items.DIAMOND_PICKAXE, 1)
 
@@ -100,7 +100,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that potions are identified as stackable when potions category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testPotionsAreStackableWhenCategoryActive(context: TestContext) {
 		val potion = ItemStack(Items.POTION, 1)
 
@@ -114,7 +114,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that enchanted books are identified as stackable when enchanted books category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testEnchantedBooksAreStackable(context: TestContext) {
 		val enchantedBook = ItemStack(Items.ENCHANTED_BOOK, 1)
 
@@ -128,7 +128,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that weapons (swords) are identified as stackable when weapons category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testWeaponsAreStackableWhenCategoryActive(context: TestContext) {
 		val sword = ItemStack(Items.DIAMOND_SWORD, 1)
 
@@ -142,7 +142,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that armor pieces are identified as stackable when armors category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testArmorIsStackableWhenCategoryActive(context: TestContext) {
 		val helmet = ItemStack(Items.DIAMOND_HELMET, 1)
 
@@ -156,7 +156,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that elytra is identified as stackable when elytra category is active.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testElytraIsStackableWhenCategoryActive(context: TestContext) {
 		val elytra = ItemStack(Items.ELYTRA, 1)
 
@@ -170,7 +170,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that regular items (like dirt) are not stackable.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testRegularItemsNotStackable(context: TestContext) {
 		val dirt = ItemStack(Items.DIRT, 1)
 
@@ -184,7 +184,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that empty stacks are not stackable.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testEmptyStackNotStackable(context: TestContext) {
 		val empty = ItemStack.EMPTY
 
@@ -198,7 +198,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that two identical swords without damage can be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testIdenticalSwordsCanStack(context: TestContext) {
 		val sword1 = ItemStack(Items.DIAMOND_SWORD, 1)
 		val sword2 = ItemStack(Items.DIAMOND_SWORD, 1)
@@ -213,7 +213,7 @@ public class StackableToolsGameTest : FabricGameTest {
 	/**
 	 * Test that armor pieces with different damage levels cannot be stacked.
 	 */
-	@GameTest
+	@GameTest(templateName = "fabric-gametest-api-v1:empty")
 	public fun testDifferentlyDamagedArmorCannotStack(context: TestContext) {
 		val helmet1 = ItemStack(Items.DIAMOND_HELMET, 1)
 		val helmet2 = ItemStack(Items.DIAMOND_HELMET, 1)
@@ -232,13 +232,12 @@ public class StackableToolsGameTest : FabricGameTest {
 	 */
 	override fun invokeTestMethod(context: TestContext, method: Method) {
 		try {
-			// Ensure configuration is loaded before test
 			ConfigManager.loadConfig()
-			
-			// Run the test method
 			method.invoke(this, context)
+		} catch (e: java.lang.reflect.InvocationTargetException) {
+			context.throwGameTestException("Test failed: ${e.cause?.message ?: e.cause?.javaClass?.simpleName ?: "Unknown error"}")
 		} catch (e: Exception) {
-			context.throwGameTestException("Test failed with exception: ${e.message}")
+			context.throwGameTestException("Test failed: ${e.message ?: e.javaClass.simpleName}")
 		}
 	}
 }