complete rebrand, compiling, untested

Author: ammodev

.github/copilot-instructions.md

@@ -16,26 +16,38 @@
 ./gradlew publishToMavenLocal
 ```
 
-CI uses **Java 25 GraalVM**. The Java toolchain version is set in `gradle.properties` (`javaVersion=25`).
+CI uses **Java 25 GraalVM**. The Java toolchain version is set in `gradle.properties` (
+`javaVersion=25`).
 
 ## Architecture
 
-**Multi-platform Minecraft server API** — Kotlin on JVM, targeting Paper/Bukkit, Velocity, and Standalone (Hytale is future/placeholder). Every platform follows an **API/Implementation split**:
+**Multi-platform Minecraft server API** — Kotlin on JVM, targeting Paper/Bukkit, Velocity, and
+Standalone (Hytale is future/placeholder). Every platform follows an **API/Implementation split**:
 
 - `-api` modules define public interfaces and extension functions (what consumers depend on)
 - `-server` modules contain implementations (shaded into the final JAR, not published as API)
 - `surf-api-shared` contains cross-platform annotations, the component system, and internal hooks
-- `surf-api-gradle-plugin` provides Gradle plugins (`dev.slne.surf.surfapi.gradle.paper-plugin`, etc.) that downstream projects apply, and contains the KSP symbol processor (`surf-api-processor`)
+- `surf-api-gradle-plugin` provides Gradle plugins (`dev.slne.surf.api.gradle.paper-plugin`, etc.)
+  that downstream projects apply, and contains the KSP symbol processor (`surf-api-processor`)
 
 ### Service Discovery (two mechanisms)
 
-1. **`requiredService<T>()`** — For singleton bridges/APIs. Uses Adventure's `Services.serviceWithFallback()` backed by Java `ServiceLoader`. Implementations register with `@AutoService(InterfaceName::class)`. Used for NMS bridges, platform API singletons, and core services.
+1. **`requiredService<T>()`** — For singleton bridges/APIs. Uses Adventure's
+   `Services.serviceWithFallback()` backed by Java `ServiceLoader`. Implementations register with
+   `@AutoService(InterfaceName::class)`. Used for NMS bridges, platform API singletons, and core
+   services.
 
-2. **Component System** — For lifecycle-managed components. Classes annotated with `@ComponentMeta` (or meta-annotations `@Service`, `@Repository`) are discovered at compile-time by KSP, which writes JSON metadata to `META-INF/surfapi/components/`. At runtime, `ComponentService` loads, topologically sorts by `@Priority` and `@DependsOnComponent`, checks conditions (`@ConditionalOnProperty`, `@DependsOnPlugin`, `@DependsOnClass`, etc.), then calls `suspend fun load()` → `enable()` → `disable()`.
+2. **Component System** — For lifecycle-managed components. Classes annotated with
+   `@ComponentMeta` (or meta-annotations `@Service`, `@Repository`) are discovered at compile-time
+   by KSP, which writes JSON metadata to `META-INF/surfapi/components/`. At runtime,
+   `ComponentService` loads, topologically sorts by `@Priority` and `@DependsOnComponent`, checks
+   conditions (`@ConditionalOnProperty`, `@DependsOnPlugin`, `@DependsOnClass`, etc.), then calls
+   `suspend fun load()` → `enable()` → `disable()`.
 
 ### NMS Bridge Pattern
 
-Platform-specific (NMS) code is abstracted behind bridge interfaces in `-api` with implementations in `-server`:
+Platform-specific (NMS) code is abstracted behind bridge interfaces in `-api` with implementations
+in `-server`:
 
 ```kotlin
 // In -api: interface + companion delegation
@@ -56,15 +68,20 @@ Bridge implementations call `checkInstantiationByServiceLoader()` in their `init
 
 ### Kotlin Features
 
-- **Context parameters** enabled globally (`-Xcontext-parameters`). Used extensively in inventory framework DSLs:
+- **Context parameters** enabled globally (`-Xcontext-parameters`). Used extensively in inventory
+  framework DSLs:
   ```kotlin
   context(ctx: AbstractSurfViewContext<ViewRef>)
   fun <ViewRef : AbstractSurfViewRef> onOpen(block: context(ViewRef) OpenContext.() -> Unit)
   ```
-- **`@InternalSurfApi`** — `@RequiresOptIn` annotation for internal APIs. All subprojects opt in via compiler args. Mark new internal APIs with this.
-- **Coroutines** for all async work. Component lifecycle methods are `suspend`. Bukkit uses MCCoroutine (Folia-aware) for dispatching.
-- **Extension functions** are the primary API enrichment pattern, organized in files named `*-extension.kt` or `*-extensions.kt`.
-- **DSL markers** (`@InventoryFrameworkDSL`, `@ItemDsl`, `@PaneMarker`) restrict scope in builder DSLs.
+- **`@InternalSurfApi`** — `@RequiresOptIn` annotation for internal APIs. All subprojects opt in via
+  compiler args. Mark new internal APIs with this.
+- **Coroutines** for all async work. Component lifecycle methods are `suspend`. Bukkit uses
+  MCCoroutine (Folia-aware) for dispatching.
+- **Extension functions** are the primary API enrichment pattern, organized in files named
+  `*-extension.kt` or `*-extensions.kt`.
+- **DSL markers** (`@InventoryFrameworkDSL`, `@ItemDsl`, `@PaneMarker`) restrict scope in builder
+  DSLs.
 
 ### Logging
 
@@ -78,33 +95,41 @@ log.atWarning().withCause(e).log("Failed to do X for %s", name)
 ### Package Structure
 
 ```
-dev.slne.surf.surfapi                        # root
-dev.slne.surf.surfapi.core.api               # core API interfaces
-dev.slne.surf.surfapi.core.server            # core implementations
-dev.slne.surf.surfapi.bukkit.api             # bukkit API (extensions, bridges, DSLs)
-dev.slne.surf.surfapi.bukkit.server          # bukkit implementations
-dev.slne.surf.surfapi.velocity.api / .server # velocity
-dev.slne.surf.surfapi.shared.api             # shared annotations and component system
-dev.slne.surf.surfapi.libs.*                 # relocation target for shaded deps
+dev.slne.surf.api                        # root
+dev.slne.surf.api.core.api               # core API interfaces
+dev.slne.surf.api.core.server            # core implementations
+dev.slne.surf.api.paper.api             # bukkit API (extensions, bridges, DSLs)
+dev.slne.surf.api.paper.server          # bukkit implementations
+dev.slne.surf.api.velocity.api / .server # velocity
+dev.slne.surf.api.shared.api             # shared annotations and component system
+dev.slne.surf.api.libs.*                 # relocation target for shaded deps
 ```
 
 ### Dependency Shading
 
-All non-platform dependencies are shaded via Shadow and relocated to `dev.slne.surf.surfapi.libs.*` (configured in `gradle.properties` as `relocationPrefix`). Platform APIs (Paper, Velocity) are `compileOnly`. Relocations are configured in the Gradle plugin's `CommonSurfPlugin` using an infix DSL:
+All non-platform dependencies are shaded via Shadow and relocated to `dev.slne.surf.api.libs.*` (
+configured in `gradle.properties` as `relocationPrefix`). Platform APIs (Paper, Velocity) are
+`compileOnly`. Relocations are configured in the Gradle plugin's `CommonSurfPlugin` using an infix
+DSL:
 
 ```kotlin
 "me.devnatan.inventoryframework" relocatesTo "devnatan.inventoryframework"
 ```
 
 ### Versioning
 
-Format: `{MC_VERSION}-{LIBRARY_VERSION}` (e.g., `1.21.11-2.62.0`), set in `gradle.properties`. Publishing triggers on pushes to `version/*` branches.
+Format: `{MC_VERSION}-{LIBRARY_VERSION}` (e.g., `1.21.11-2.62.0`), set in `gradle.properties`.
+Publishing triggers on pushes to `version/*` branches.
 
 ## When Making Changes
 
-- **API changes** go in `-api` modules; implementations in `-server` modules. Never expose `-server` types in public API.
-- **New components**: annotate with `@ComponentMeta` (or `@Service`/`@Repository`), implement `Component`, and declare dependencies with `@DependsOnComponent`, `@DependsOnPlugin`, etc.
-- **New bridges**: define interface in `-api` with companion delegation via `requiredService()`, implement in `-server` with `@AutoService`.
-- **New extension functions**: place in a file named `{topic}-extensions.kt` in the appropriate `-api` module.
+- **API changes** go in `-api` modules; implementations in `-server` modules. Never expose `-server`
+  types in public API.
+- **New components**: annotate with `@ComponentMeta` (or `@Service`/`@Repository`), implement
+  `Component`, and declare dependencies with `@DependsOnComponent`, `@DependsOnPlugin`, etc.
+- **New bridges**: define interface in `-api` with companion delegation via `requiredService()`,
+  implement in `-server` with `@AutoService`.
+- **New extension functions**: place in a file named `{topic}-extensions.kt` in the appropriate
+  `-api` module.
 - **KDoc**: required for all public API members.
 - **Version catalog**: all dependency versions live in `gradle/libs.versions.toml`.

.github/workflows/build-pr-jar.yml

@@ -5,7 +5,7 @@ on:
     types: [ opened, synchronize, reopened, labeled ]
 
 env:
-  MODULE_REGEX: "surf-api-bukkit-server.*-all\\.jar$|surf-api-velocity-server.*-all\\.jar$|surf-api-standalone-server.*-all\\.jar$|surf-api-hytale-server.*-all\\.jar$"
+  MODULE_REGEX: "surf-api-paper-server.*-all\\.jar$|surf-api-velocity-server.*-all\\.jar$|surf-api-standalone-server.*-all\\.jar$"
 
 jobs:
   build_pr:

.github/workflows/publish-docs.yml

@@ -11,7 +11,7 @@ env:
   SLNE_SNAPSHOTS_REPO_PASSWORD: ${{ secrets.SLNE_SNAPSHOTS_REPO_PASSWORD }}
   SLNE_RELEASES_REPO_USERNAME: ${{ secrets.SLNE_RELEASES_REPO_USERNAME }}
   SLNE_RELEASES_REPO_PASSWORD: ${{ secrets.SLNE_RELEASES_REPO_PASSWORD }}
-  MODULE_REGEX: "surf-api-bukkit-server.*-all\\.jar$|surf-api-velocity-server.*-all\\.jar$|surf-api-standalone-server.*-all\\.jar$|surf-api-hytale-server.*-all\\.jar$"
+  MODULE_REGEX: "surf-api-paper-server.*-all\\.jar$|surf-api-velocity-server.*-all\\.jar$|surf-api-standalone-server.*-all\\.jar$"
   DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
 
 jobs:

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ subprojects {
     afterEvaluate {
         extensions.findByType<KotlinJvmExtension>()?.apply {
             compilerOptions {
-                optIn.add("dev.slne.surf.surfapi.shared.api.util.InternalSurfApi")
+                optIn.add("dev.slne.surf.api.shared.api.util.InternalSurfApi")
                 freeCompilerArgs.add("-Xcontext-parameters")
             }
         }

build.gradle.kts

@@ -50,7 +50,7 @@ extensions.configure<KotlinJvmProjectExtension> {
 java {
     withSourcesJar()
 
-    if (project.name != "surf-api-bukkit-plugin-test") {
+    if (project.name != "surf-api-paper-plugin-test") {
         withJavadocJar()
     }
 }

buildSrc/src/main/kotlin/core-convention.gradle.kts

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=25
 mcVersion=26.1
 group=dev.slne.surf
-version=26.1-2.77.0
-relocationPrefix=dev.slne.surf.surfapi.libs
+version=26.1-3.0.0
+relocationPrefix=dev.slne.surf.api.libs
 snapshot=false

gradle.properties

@@ -13,13 +13,13 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "surf-api"
 
-include(":surf-api-core:surf-api-core-api")
+include(":surf-api-core:surf-api-core")
 include(":surf-api-core:surf-api-core-server")
 
-include(":surf-api-bukkit:surf-api-bukkit-api")
-include(":surf-api-bukkit:surf-api-bukkit-server")
+include(":surf-api-paper:surf-api-paper")
+include(":surf-api-paper:surf-api-paper-server")
 
-include(":surf-api-velocity:surf-api-velocity-api")
+include(":surf-api-velocity:surf-api-velocity")
 include(":surf-api-velocity:surf-api-velocity-server")
 
 include("surf-api-standalone")
@@ -33,6 +33,6 @@ include("surf-api-shared:surf-api-shared-internal")
 val ci = System.getenv("CI")?.toBoolean() ?: false
 
 if (!ci) {
-//    include(":surf-api-bukkit:surf-api-bukkit-plugin-test")
+//    include(":surf-api-paper:surf-api-paper-plugin-test")
     include("surf-api-generator")
 }