Preparations for using gametest framework

bootstrap/mod/build.gradle.kts

@@ -2,9 +2,9 @@ plugins {
     id("geyser.modded-conventions")
 }
 
-architectury {
-    common("neoforge", "fabric")
-}
+//architectury {
+//    common("neoforge", "fabric")
+//}
 
 loom {
     mixin.defaultRefmapName.set("geyser-refmap.json")

bootstrap/mod/fabric/build.gradle.kts

@@ -3,9 +3,28 @@ plugins {
     id("geyser.modrinth-uploading-conventions")
 }
 
-architectury {
-    platformSetupLoomIde()
-    fabric()
+//architectury {
+//    platformSetupLoomIde()
+//    fabric()
+//}
+
+loom {
+    mods {
+        create("geyser-fabric") {
+            sourceSet(sourceSets.main.get())
+            sourceSet("main", projects.mod)
+            sourceSet("main", projects.core)
+        }
+    }
+}
+
+fabricApi {
+    configureTests {
+        createSourceSet = true
+        modId = "geyser-gametest"
+        enableClientGameTests = false
+        eula = true
+    }
 }
 
 dependencies {
@@ -13,7 +32,7 @@ dependencies {
     modApi(libs.fabric.api)
 
     api(project(":mod", configuration = "namedElements"))
-    shadowBundle(project(path = ":mod", configuration = "transformProductionFabric"))
+    //shadowBundle(project(path = ":mod", configuration = "transformProductionFabric"))
     shadowBundle(projects.core)
     includeTransitive(projects.core)
 
@@ -37,14 +56,14 @@ dependencies {
     include(libs.fabric.permissions.api)
 }
 
-tasks.withType<Jar> {
-    manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.fabric.GeyserFabricMain"
-}
-
 relocate("org.cloudburstmc.netty")
 relocate("org.cloudburstmc.protocol")
 
 tasks {
+    jar {
+        manifest.attributes["Main-Class"] = "org.geysermc.geyser.platform.fabric.GeyserFabricMain"
+    }
+
     remapJar {
         archiveBaseName.set("Geyser-Fabric")
     }
@@ -52,6 +71,19 @@ tasks {
     remapModrinthJar {
         archiveBaseName.set("geyser-fabric")
     }
+
+    getByName("processGametestResources", ProcessResources::class) {
+        filesMatching("fabric.mod.json") {
+            expand(
+                "id" to "geyser",
+                "name" to "Geyser",
+                "version" to project.version,
+                "description" to project.description,
+                "url" to "https://geysermc.org",
+                "author" to "GeyserMC"
+            )
+        }
+    }
 }
 
 modrinth {

bootstrap/mod/fabric/gradle.properties

@@ -1 +0,0 @@
-loom.platform=fabric

bootstrap/mod/fabric/src/gametest/java/org/geysermc/geyser/gametest/GeyserGameTest.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.geyser.gametest;
+
+public class GeyserGameTest {
+    // TODO actually add gametests
+}

bootstrap/mod/fabric/src/gametest/resources/fabric.mod.json

@@ -0,0 +1,13 @@
+{
+    "schemaVersion": 1,
+    "id": "geyser-gametest",
+    "version": "1.0.0",
+    "name": "Geyser-GameTest",
+    "icon": "assets/geyser/icon.png",
+    "environment": "*",
+    "entrypoints": {
+        "fabric-gametest": [
+            "org.geysermc.geyser.gametest.GeyserGameTest"
+        ]
+    }
+}

build-logic/build.gradle.kts

@@ -22,7 +22,8 @@ dependencies {
     implementation(libs.lombok)
     implementation(libs.indra)
     implementation(libs.shadow)
-    implementation(libs.architectury.plugin)
-    implementation(libs.architectury.loom)
+    //implementation(libs.architectury.plugin)
+    //implementation(libs.architectury.loom)
+    implementation("fabric-loom:fabric-loom.gradle.plugin:1.12.0-alpha.45")
     implementation(libs.minotaur)
 }

build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts

@@ -5,8 +5,9 @@ import org.gradle.kotlin.dsl.dependencies
 
 plugins {
     id("geyser.platform-conventions")
-    id("architectury-plugin")
-    id("dev.architectury.loom")
+    //id("architectury-plugin")
+    //id("dev.architectury.loom")
+    id("fabric-loom")
 }
 
 // These are provided by Minecraft/modded platforms already, no need to include them
@@ -39,13 +40,13 @@ provided("org.ow2.asm", "asm")
 provided("org.incendo", ".*")
 provided("io.leangen.geantyref", "geantyref")
 
-architectury {
-    minecraft = libs.minecraft.get().version as String
-}
+//architectury {
+//    minecraft = libs.minecraft.get().version as String
+//}
 
-loom {
-    silentMojangMappingsLicense()
-}
+//loom {
+//    silentMojangMappingsLicense()
+//}
 
 indra {
     javaVersions {

core/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     alias(libs.plugins.blossom)
     id("geyser.publish-conventions")
     id("io.freefair.lombok")
+    // Allows gametests/fabric runServer task to work correctly
+    id("net.fabricmc.fabric-loom-companion")
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -34,7 +34,7 @@ bungeecord-api = "1.21-R0.1"
 velocity = "3.4.0-SNAPSHOT"
 viaproxy = "3.3.2-SNAPSHOT"
 fabric-loader = "0.17.2"
-fabric-api = "0.133.14+1.21.9"
+fabric-api = "0.136.0+1.21.10"
 fabric-permissions-api = "0.4.1"
 neoforge-minecraft = "21.10.0-beta"
 mixin = "0.8.5"

settings.gradle.kts

@@ -20,7 +20,7 @@ include(":ap")
 include(":api")
 include(":bungeecord")
 include(":fabric")
-include(":neoforge")
+//include(":neoforge")
 include(":mod")
 include(":spigot")
 include(":standalone")
@@ -32,7 +32,7 @@ include(":core")
 // Specify project dirs
 project(":bungeecord").projectDir = file("bootstrap/bungeecord")
 project(":fabric").projectDir = file("bootstrap/mod/fabric")
-project(":neoforge").projectDir = file("bootstrap/mod/neoforge")
+//project(":neoforge").projectDir = file("bootstrap/mod/neoforge")
 project(":mod").projectDir = file("bootstrap/mod")
 project(":spigot").projectDir = file("bootstrap/spigot")
 project(":standalone").projectDir = file("bootstrap/standalone")