Add support for 1.21.9 Fabric

Author: Johni0702

build.gradle.kts

@@ -53,6 +53,7 @@ dependencies {
             12106 -> "0.125.1+1.21.6"
             12107 -> "0.128.1+1.21.7"
             12108 -> "0.129.0+1.21.8"
+            12109 -> "0.133.13+1.21.9"
             else -> error("Unable to determine fabric api version")
         }
 

buildSrc/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     implementation("com.google.code.gson:gson:2.11.0")
     implementation("gg.essential:essential-gradle-toolkit:0.6.7")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
-    implementation("gg.essential:architectury-loom:1.7.30")
+    implementation("gg.essential:architectury-loom:1.7.35")
 }
 
 kotlin {

gradle.properties

@@ -1,5 +1,5 @@
 essential.defaults.loom=1
-essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.16.14
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.17.2
 org.gradle.jvmargs=-Xmx4G
 # TODO remove once upgrading to Loom 1.10
 # fabric-api 1.21.5 was built with Loom 1.10, seems to work well enough in dev with our current 1.7 though

root.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 preprocess {
     strictExtraMappings.set(true)
 
+    val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
     val fabric12108 = createNode("1.21.8-fabric", 12108, "yarn")
     val fabric12107 = createNode("1.21.7-fabric", 12107, "yarn")
     val fabric12106 = createNode("1.21.6-fabric", 12106, "yarn")
@@ -48,6 +49,7 @@ preprocess {
     val forge11202 = createNode("1.12.2-forge", 11202, "srg")
     val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+    fabric12109.link(fabric12108)
     fabric12108.link(fabric12107)
     fabric12107.link(fabric12106)
     fabric12106.link(fabric12105, file("versions/1.21.6-1.21.5.txt"))

settings.gradle.kts

@@ -59,6 +59,7 @@ listOf(
     "1.21.6-fabric",
     "1.21.7-fabric",
     "1.21.8-fabric",
+    "1.21.9-fabric",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

src/main/java/gg/essential/partnermod/EssentialPartner.java

@@ -80,7 +80,7 @@ public class EssentialPartner {
         "1.18", "1.18.1", "1.18.2",
         "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4",
         "1.20", "1.20.1", "1.20.2", "1.20.4", "1.20.6",
-        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8"
+        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9"
     ));
 
     private static final Set<String> NEOFORGE_SUPPORTED_VERSIONS = new HashSet<>(Arrays.asList(

src/main/java/gg/essential/partnermod/modal/ModalManager.java

@@ -166,12 +166,21 @@ private boolean handleKeyTyped(int key) {
     //$$         ScreenEvents.afterRender(screen).register((screen1, matrices, mouseX, mouseY, tickDelta) -> {
     //$$             handleDraw(matrices);
     //$$         });
+    //#if MC>=12109
+    //$$         ScreenMouseEvents.allowMouseClick(screen).register((screen1, click) -> {
+    //$$             return !handleMouseClick(click.x(), click.y());
+    //$$         });
+    //$$         ScreenKeyboardEvents.allowKeyPress(screen).register((screen1, keyInput) -> {
+    //$$             return !handleKeyTyped(keyInput.key());
+    //$$         });
+    //#else
     //$$         ScreenMouseEvents.allowMouseClick(screen).register((screen1, mouseX, mouseY, button) -> {
     //$$             return !handleMouseClick(mouseX, mouseY);
     //$$         });
     //$$         ScreenKeyboardEvents.allowKeyPress(screen).register((screen1, key, scancode, modifiers) -> {
     //$$             return !handleKeyTyped(key);
     //$$         });
+    //#endif
     //$$     }));
     //$$ }
     //#else

versions/1.21.9-fabric/gradle.properties

@@ -0,0 +1,3 @@
+essential.defaults.loom.mappings=net.fabricmc:yarn:1.21.9+build.1:v2
+# Required because our Loom doesn't yet support the unpick version included in the above yarn version
+essential.loom.disableUnpick=true