Feature: Merge floodgate-modded

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+tab_width = 4
+max_line_length = off
+
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 9999
+ij_java_doc_align_exception_comments = false
+ij_java_doc_align_param_comments = false

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         # See https://github.com/actions/setup-java/commits
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Setup Gradle

.github/workflows/pullrequest.yml

@@ -26,7 +26,7 @@ jobs:
         # See https://github.com/actions/setup-java/commits
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: Setup Gradle

api/build.gradle.kts

@@ -1,3 +1,8 @@
+plugins {
+    id("floodgate.publish-conventions")
+    id("floodgate.shadow-conventions")
+}
+
 dependencies {
     api(libs.cumulus)
     api(libs.events)

build.gradle.kts

@@ -1,62 +1,3 @@
 plugins {
-    `java-library`
-    alias(libs.plugins.micronaut) apply false
-    alias(libs.plugins.lombok) apply false
-}
-
-allprojects {
-    group = "org.geysermc.floodgate"
-    description = "Allows Bedrock players to join Java edition servers while keeping the server in online mode"
-
-    apply {
-        plugin("net.kyori.indra.git")
-    }
-
-    if (shouldAddBranchName()) {
-        version = versionWithBranchName()
-    }
-}
-
-//todo differentiate maven publishing from downloads publishing
-val deployProjects = setOf(
-    projects.api,
-    projects.coreCommon,
-    projects.coreNetty4,
-    projects.isolation,
-    projects.bungee,
-    projects.spigot,
-    projects.velocity,
-    projects.bungeeBase,
-    projects.spigotBase,
-    projects.velocityBase,
-    projects.universal
-).map { it.dependencyProject }
-
-val shadowProjects = setOf(
-    projects.api,
-    projects.coreCommon,
-    projects.coreNetty4,
-    projects.bungeeBase,
-    projects.spigotBase,
-    projects.velocityBase,
-    projects.universal
-).map { it.dependencyProject }
-
-//todo re-add checkstyle when we switch back to 2 space indention
-// and take a look again at spotbugs someday
-
-subprojects {
-    apply {
-        plugin("java-library")
-        plugin("io.freefair.lombok")
-    }
-
-    when (this) {
-        in deployProjects -> plugins.apply("floodgate.publish-conventions")
-        else -> plugins.apply("floodgate.base-conventions")
-    }
-
-    if (this in shadowProjects) {
-        plugins.apply("floodgate.shadow-conventions")
-    }
+    id("floodgate.base-conventions")
 }

buildSrc/build.gradle.kts

@@ -4,12 +4,25 @@ plugins {
 
 repositories {
     gradlePluginPortal()
+    mavenCentral()
+    maven("https://maven.architectury.dev/")
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.neoforged.net/releases/")
 }
 
 dependencies {
+    // Used to access version catalogue from the convention plugins
+    // this is OK as long as the same version catalog is used in the main build and build-logic
+    // see https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(libs.lombok)
+    implementation(libs.micronaut)
     implementation(libs.indra.common)
     implementation(libs.indra.git)
     implementation(libs.indra.licenser.spotless)
     implementation(libs.shadow)
     implementation(libs.gradle.idea.ext)
+    implementation(libs.architectury.plugin)
+    implementation(libs.architectury.loom)
+    //implementation(libs.minotaur) TODO modrinth publishing
 }

buildSrc/src/main/kotlin/LibsAccessor.kt

@@ -0,0 +1,6 @@
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.accessors.dm.LibrariesForLibs
+
+val Project.libs: LibrariesForLibs
+    get() = rootProject.extensions.getByType()

buildSrc/src/main/kotlin/floodgate.base-conventions.gradle.kts

@@ -5,8 +5,14 @@ plugins {
     id("net.kyori.indra.git")
 //    id("net.kyori.indra.licenser.spotless")
     id("floodgate.depsize")
+    id("io.freefair.lombok")
 }
 
+val rootProperties: Map<String, *> = project.rootProject.properties
+group = rootProperties["group"] as String + "." + rootProperties["id"] as String
+version = if (shouldAddBranchName()) versionWithBranchName() else rootProperties["version"] as String
+description = rootProperties["description"] as String
+
 dependencies {
     compileOnly("org.checkerframework", "checker-qual", "3.19.0")
 }
@@ -42,8 +48,28 @@ tasks {
                 "version" to fullVersion(),
                 "description" to project.description,
                 "url" to "https://geysermc.org",
-                "author" to "GeyserMC"
+                "author" to "GeyserMC",
+                "minecraft_version" to libs.versions.minecraft.version.get()
             )
         }
     }
-}
+}
+
+repositories {
+    mavenCentral()
+    maven("https://repo.opencollab.dev/main/")
+
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.neoforged.net/releases")
+    maven("https://repo.papermc.io/repository/maven-public")
+
+    // Spigot
+    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") {
+        mavenContent { snapshotsOnly() }
+    }
+
+    maven("https://libraries.minecraft.net") {
+        name = "minecraft"
+        mavenContent { releasesOnly() }
+    }
+}

buildSrc/src/main/kotlin/floodgate.modded-conventions.gradle.kts

@@ -0,0 +1,44 @@
+plugins {
+    id("floodgate.base-conventions")
+    id("floodgate.shadow-conventions")
+    id("architectury-plugin")
+    id("dev.architectury.loom")
+}
+
+configurations {
+    create("includeTransitive").isTransitive = true
+    create("shadowBundle") {
+        isCanBeResolved = true
+        isCanBeConsumed = false
+        isTransitive = false
+    }
+}
+
+architectury {
+    minecraft = libs.versions.minecraft.version.get()
+}
+
+loom {
+    silentMojangMappingsLicense()
+}
+
+indra {
+    javaVersions {
+        target(21)
+    }
+}
+
+tasks {
+    shadowJar {
+        // Mirrors the example fabric project, otherwise tons of dependencies are shaded that shouldn't be
+        configurations = listOf(project.configurations.getByName("shadowBundle"))
+        // The remapped shadowJar is the final desired mod jar
+        archiveVersion.set(project.version.toString())
+        archiveClassifier.set("shaded")
+    }
+}
+
+dependencies {
+    minecraft(libs.minecraft)
+    mappings(loom.officialMojangMappings())
+}

buildSrc/src/main/kotlin/floodgate.publish-conventions.gradle.kts

@@ -6,4 +6,11 @@ plugins {
 indra {
     publishSnapshotsTo("geysermc", "https://repo.opencollab.dev/maven-snapshots")
     publishReleasesTo("geysermc", "https://repo.opencollab.dev/maven-releases")
-}
+}
+
+// TODO
+//publishing {
+//    // skip shadow jar from publishing. Workaround for https://github.com/johnrengelman/shadow/issues/651
+//    val javaComponent = project.components["java"] as AdhocComponentWithVariants
+//    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { skip() }
+//}

bungee/base/build.gradle.kts

@@ -1,3 +1,8 @@
+plugins {
+    id("floodgate.shadow-conventions")
+    id("floodgate.publish-conventions")
+}
+
 dependencies {
     api(projects.coreNetty4)
     annotationProcessor(projects.coreNetty4)

bungee/isolated/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    java
+    id("floodgate.base-conventions")
 }
 
 dependencies {

core/common/build.gradle.kts

@@ -1,6 +1,8 @@
 plugins {
+    id("floodgate.publish-conventions")
     id("floodgate.generate-templates")
     id("floodgate.dependency-hash")
+    id("floodgate.shadow-conventions")
     id("io.micronaut.library")
 }
 

core/netty4/build.gradle.kts

@@ -1,3 +1,8 @@
+plugins {
+    id("floodgate.publish-conventions")
+    id("floodgate.shadow-conventions")
+}
+
 dependencies {
     api(projects.coreCommon)
     annotationProcessor(projects.coreCommon)

fabric/base/build.gradle.kts

@@ -0,0 +1,34 @@
+plugins {
+    id("floodgate.modded-conventions")
+}
+
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+// Used to extend runtime/compile classpaths
+val common: Configuration by configurations.creating
+// Needed to read mixin config in the runServer task, and for the architectury transformer
+// (e.g. the @ExpectPlatform annotation)
+val developmentFabric: Configuration = configurations.getByName("developmentFabric")
+//// Our custom transitive include configuration
+//val includeTransitive: Configuration = configurations.getByName("includeTransitive")
+
+configurations {
+    compileClasspath.get().extendsFrom(configurations["common"])
+    runtimeClasspath.get().extendsFrom(configurations["common"])
+    developmentFabric.extendsFrom(configurations["common"])
+}
+
+dependencies {
+    modImplementation(libs.fabric.loader)
+    modApi(libs.fabric.api)
+    // "namedElements" configuration should be used to depend on different loom projects
+    common(project(":mod", configuration = "namedElements"))
+    // Bundle transformed classes of the common module for production mod jar
+    shadowBundle(project(path = ":mod", configuration = "transformProductionFabric"))
+    modImplementation(libs.cloud.fabric)
+
+    compileOnlyApi(projects.isolation)
+}

fabric/base/src/main/java/org/geysermc/floodgate/mod/util/fabric/ModMixinConfigPluginImpl.java

@@ -0,0 +1,10 @@
+package org.geysermc.floodgate.mod.util.fabric;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+public class ModMixinConfigPluginImpl {
+
+    public static boolean applyProxyFix() {
+        return FabricLoader.getInstance().isModLoaded("fabricproxy-lite");
+    }
+}

fabric/base/src/main/java/org/geysermc/floodgate/platform/fabric/FabricFloodgateMod.java

@@ -0,0 +1,50 @@
+package org.geysermc.floodgate.platform.fabric;
+
+import io.micronaut.context.ApplicationContext;
+import io.micronaut.inject.qualifiers.Qualifiers;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.geysermc.floodgate.isolation.library.LibraryManager;
+import org.geysermc.floodgate.mod.ModPlatform;
+
+import java.nio.file.Path;
+
+public final class FabricFloodgateMod extends ModPlatform {
+
+    private final ModContainer container;
+
+    public FabricFloodgateMod(LibraryManager manager, ModContainer container) {
+        super(manager);
+        this.container = container;
+    }
+
+    @Override
+    protected void onContextCreated(ApplicationContext context) {
+        super.onContextCreated(context);
+        context.registerSingleton(container)
+            .registerSingleton(
+                Path.class,
+                FabricLoader.getInstance().getConfigDir().resolve("floodgate"),
+                Qualifiers.byName("dataDirectory")
+        );
+
+        ServerLifecycleEvents.SERVER_STARTED.register((server) -> {
+            context.registerSingleton(server, false);
+            context.registerSingleton(MinecraftServerAudiences.of(server), false);
+        });
+    }
+
+    @Override
+    public @Nullable Path resourcePath(String file) {
+        return container.findPath(file).orElse(null);
+    }
+
+    @Override
+    public boolean isClient() {
+        return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
+    }
+}

fabric/base/src/main/java/org/geysermc/floodgate/platform/fabric/listener/FabricEventRegistration.java

@@ -0,0 +1,15 @@
+package org.geysermc.floodgate.platform.fabric.listener;
+
+import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import org.geysermc.floodgate.core.platform.listener.ListenerRegistration;
+import org.geysermc.floodgate.mod.listener.ModEventListener;
+
+public final class FabricEventRegistration implements ListenerRegistration<ModEventListener> {
+    @Override
+    public void register(ModEventListener listener) {
+        ServerPlayConnectionEvents.JOIN.register(
+                (handler, sender, server) -> listener.onPlayerJoin(handler.getPlayer().getUUID())
+        );
+    }
+}