From 4879257f4781481ecbc70639c41f848101ab97c0 Mon Sep 17 00:00:00 2001
From: kento2 <kento+git@placeq.com>
Date: Mon, 16 Feb 2026 09:47:03 +0100
Subject: [PATCH] lowk did smth

---
 .idea/gradle.xml                              |  5 +-
 .idea/inspectionProfiles/Project_Default.xml  |  2 +-
 .idea/kotlinc.xml                             |  6 ++
 build.gradle.kts                              |  6 ++
 core-api/build.gradle.kts                     | 20 ------
 .../MissingServiceFieldException.java         |  7 --
 .../scrow/provider/RegisteredService.java     | 15 ----
 .../kentoj/scrow/provider/ServiceField.java   | 10 ---
 .../scrow/provider/ServiceRegistry.java       | 68 ------------------
 .../provider/AbstractServiceProvider.java     | 15 ----
 .../provider/GenericServiceProvider.java      | 21 ------
 .../provider/provider/ServiceProvider.java    |  8 ---
 .../de/kentoj/scrow/services/mail/Mail.java   | 12 ----
 .../scrow/services/mail/MailService.java      | 13 ----
 core-bukkit-api/build.gradle.kts              | 60 ++++++++++++++++
 .../de/kentoj/scrow/bukkit}/ScrowAPI.java     |  4 +-
 .../bukkit}/services/EconomyService.java      |  2 +-
 .../scrow/bukkit/services/email/Email.java    | 18 +++++
 .../bukkit/services/email/EmailDraft.java     | 28 ++++++++
 .../bukkit/services/email/EmailService.java   | 25 +++++++
 .../services/friends/FriendRequest.java       |  2 +-
 .../bukkit}/services/friends/Friendship.java  |  4 +-
 .../scrow/bukkit/services/old/CmdContext.java | 16 +++++
 .../bukkit/services/old/CommandExecutor.java  |  9 +++
 .../bukkit/services/old/CommandsService.java  |  9 +++
 .../bukkit/services/old/RegisteredCmdArg.java | 11 +++
 .../scrow/bukkit/services/old/SCommand.java   | 21 ++++++
 .../scrow/bukkit/services/old/arg/CmdArg.java |  6 ++
 .../services/old/arg/PlayerArgType.java       | 28 ++++++++
 .../scrow/bukkit}/util/pair/Tuple2.java       |  2 +-
 .../scrow/bukkit}/util/pair/Tuple3.java       |  2 +-
 .../scrow/bukkit}/util/pair/Tuple4.java       |  2 +-
 .../build.gradle.kts                          | 12 ++--
 .../kentoj/scrow/bukkit}/CoreImplPlugin.java  |  2 +-
 .../kentoj/scrow/bukkit}/ScrowAPISurface.java |  6 +-
 .../bukkit/command/AbstractSCommand.java      | 69 +++++++++++++++++++
 .../scrow/bukkit/command/CmdContextImpl.java  | 33 +++++++++
 .../bukkit/command/CommandProcessor.java      | 29 ++++++++
 .../scrow/bukkit/command/LaunchCommand.java   | 26 +++++++
 .../economy/InMemoryEconomyService.java       |  4 +-
 .../bukkit}/economy/MongoEconomyService.java  |  5 +-
 .../scrow/bukkit/friends/FriendsCommand.java  | 22 ++++++
 .../bukkit}/friends/FriendshipService.java    |  7 +-
 .../friends/friendship/BsonFriendship.java    |  6 +-
 .../friendship/FriendshipRepository.java      |  6 +-
 .../friends/friendship/FriendshipUtils.java   |  4 +-
 .../friendship/MongoFriendshipRepository.java |  6 +-
 .../friends/request/BsonFriendRequest.java    |  4 +-
 .../request/FriendRequestRepository.java      |  4 +-
 .../request/MongoFriendRequestRepository.java |  4 +-
 .../src/main/resources/plugin.yml             |  4 +-
 core-impl/run/eula.txt                        |  3 -
 gradlew.bat                                   |  4 +-
 settings.gradle.kts                           | 12 +++-
 54 files changed, 486 insertions(+), 243 deletions(-)
 create mode 100644 .idea/kotlinc.xml
 delete mode 100644 core-api/build.gradle.kts
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/MissingServiceFieldException.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/RegisteredService.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/ServiceField.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/ServiceRegistry.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/provider/AbstractServiceProvider.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/provider/GenericServiceProvider.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/provider/provider/ServiceProvider.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/services/mail/Mail.java
 delete mode 100644 core-api/src/main/java/de/kentoj/scrow/services/mail/MailService.java
 create mode 100644 core-bukkit-api/build.gradle.kts
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/ScrowAPI.java (89%)
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/services/EconomyService.java (95%)
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/Email.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailDraft.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailService.java
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/services/friends/FriendRequest.java (75%)
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/services/friends/Friendship.java (60%)
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CmdContext.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandExecutor.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandsService.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/RegisteredCmdArg.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/SCommand.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/CmdArg.java
 create mode 100644 core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/PlayerArgType.java
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/util/pair/Tuple2.java (67%)
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/util/pair/Tuple3.java (71%)
 rename {core-api/src/main/java/de/kentoj/scrow => core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit}/util/pair/Tuple4.java (74%)
 rename {core-impl => core-bukkit-impl}/build.gradle.kts (79%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/CoreImplPlugin.java (97%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/ScrowAPISurface.java (91%)
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/AbstractSCommand.java
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CmdContextImpl.java
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CommandProcessor.java
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/LaunchCommand.java
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/economy/InMemoryEconomyService.java (93%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/economy/MongoEconomyService.java (95%)
 create mode 100644 core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendsCommand.java
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/FriendshipService.java (87%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/friendship/BsonFriendship.java (85%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/friendship/FriendshipRepository.java (81%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/friendship/FriendshipUtils.java (85%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/friendship/MongoFriendshipRepository.java (95%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/request/BsonFriendRequest.java (90%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/request/FriendRequestRepository.java (87%)
 rename {core-impl/src/main/java/de/kentoj/scrow => core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit}/friends/request/MongoFriendRequestRepository.java (96%)
 rename {core-impl => core-bukkit-impl}/src/main/resources/plugin.yml (51%)
 delete mode 100644 core-impl/run/eula.txt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 95825c6..679db2d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -8,8 +9,8 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/core-api" />
-            <option value="$PROJECT_DIR$/core-impl" />
+            <option value="$PROJECT_DIR$/core-bukkit-api" />
+            <option value="$PROJECT_DIR$/core-bukkit-impl" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 617595b..ad43ab6 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="ClassCanBeRecord" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+    <inspection_tool class="ClassCanBeRecord" enabled="true" level="TEXT ATTRIBUTES" enabled_by_default="true" editorAttributes="CONSIDERATION_ATTRIBUTES">
       <option name="myIgnoredAnnotations">
         <list>
           <option value="io.micronaut.*" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..254a1fc
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="2.2.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index bc59d7c..deb6ac1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,6 +16,12 @@ subprojects {
 
     repositories {
         mavenCentral()
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
+            name = "spigotmc-repo"
+        }
+        maven("https://libraries.minecraft.net") {
+            name = "Minecraft Libraries"
+        }
     }
 
     dependencies {
diff --git a/core-api/build.gradle.kts b/core-api/build.gradle.kts
deleted file mode 100644
index 766b8ac..0000000
--- a/core-api/build.gradle.kts
+++ /dev/null
@@ -1,20 +0,0 @@
-plugins {
-    id("java")
-}
-
-group = "de.kentoj.scrow"
-version = "1.0-SNAPSHOT"
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
\ No newline at end of file
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/MissingServiceFieldException.java b/core-api/src/main/java/de/kentoj/scrow/provider/MissingServiceFieldException.java
deleted file mode 100644
index 4bf1f3b..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/MissingServiceFieldException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package de.kentoj.scrow.provider;
-
-public class MissingServiceFieldException extends RuntimeException {
-    public MissingServiceFieldException(Class<?> apiClass, Class<?> serviceClass) {
-        super("missing static field of type " + serviceClass + " annotated with " + ServiceField.class.getCanonicalName() + " in " + apiClass.getCanonicalName());
-    }
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/RegisteredService.java b/core-api/src/main/java/de/kentoj/scrow/provider/RegisteredService.java
deleted file mode 100644
index 81d8978..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/RegisteredService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.kentoj.scrow.provider;
-
-import de.kentoj.scrow.provider.provider.ServiceProvider;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Set;
-
-@Getter
-@AllArgsConstructor
-public class RegisteredService<T> {
-    private final Class<T> serviceClass;
-    private final ServiceProvider<T> serviceProvider;
-    private final Set<Class<?>> requiredServices;
-}
\ No newline at end of file
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/ServiceField.java b/core-api/src/main/java/de/kentoj/scrow/provider/ServiceField.java
deleted file mode 100644
index 404bea2..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/ServiceField.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.kentoj.scrow.provider;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ServiceField {}
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/ServiceRegistry.java b/core-api/src/main/java/de/kentoj/scrow/provider/ServiceRegistry.java
deleted file mode 100644
index 1ea6c48..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/ServiceRegistry.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package de.kentoj.scrow.provider;
-
-import de.kentoj.scrow.provider.provider.ServiceProvider;
-import lombok.RequiredArgsConstructor;
-
-import java.lang.reflect.AccessFlag;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-@SuppressWarnings("unchecked")
-@RequiredArgsConstructor
-public class ServiceRegistry {
-
-    private final Set<RegisteredService<?>> registeredServices = new HashSet<>();
-
-    public <T> void provideService(
-            Class<T> serviceInterfaceClass,
-            ServiceProvider<T> serviceProvider,
-            Set<Class<?>> requiredServices
-    ) {
-        registeredServices.add(new RegisteredService<>(serviceInterfaceClass, serviceProvider, requiredServices));
-    }
-
-    public void load(Class<?> apiClass) {
-        Arrays.stream(apiClass.getDeclaredFields())
-                .filter(f -> f.accessFlags().contains(AccessFlag.STATIC))
-                .filter(f -> f.isAnnotationPresent(ServiceField.class))
-                .filter(f -> {
-                    try {
-                        f.setAccessible(true);
-                        return f.get(null) == null;
-                    } catch (IllegalAccessException e) {
-                        throw new RuntimeException(e);
-                    }
-                })
-                .forEach(field -> loadServiceRecursively(apiClass, getService(field.getType())));
-    }
-
-    public void loadServiceRecursively(Class<?> apiClass, RegisteredService<?> registeredService) {
-        for (Class<?> serviceClass : registeredService.getRequiredServices()) {
-            var sv = getService(serviceClass);
-            loadServiceRecursively(apiClass, sv);
-        }
-
-        var field = Arrays.stream(apiClass.getDeclaredFields())
-                .filter(f -> f.accessFlags().contains(AccessFlag.STATIC))
-                .filter(f -> f.isAnnotationPresent(ServiceField.class))
-                .findFirst()
-                .orElseThrow(() -> new MissingServiceFieldException(apiClass, registeredService.getServiceClass()));
-        try {
-            if (field.get(null) != null) return;
-            field.setAccessible(true);
-            field.set(null, registeredService.getServiceProvider().get());
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public <T> RegisteredService<T> getService(Class<T> serviceClass) {
-        return (RegisteredService<T>) registeredServices.stream()
-                .filter(Objects::nonNull)
-                .filter(sv -> sv.getServiceClass() == serviceClass)
-                .findFirst()
-                .orElseThrow(() -> new IllegalStateException("No registered-service for " + serviceClass.getCanonicalName() + " registered"));
-    }
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/provider/AbstractServiceProvider.java b/core-api/src/main/java/de/kentoj/scrow/provider/provider/AbstractServiceProvider.java
deleted file mode 100644
index 450baaa..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/provider/AbstractServiceProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.kentoj.scrow.provider.provider;
-
-import org.jetbrains.annotations.Nullable;
-
-public abstract class AbstractServiceProvider<T> implements ServiceProvider<T> {
-
-    private final @Nullable T service = load();
-
-    abstract protected T load();
-
-    @Override
-    public T get() {
-        return service;
-    }
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/provider/GenericServiceProvider.java b/core-api/src/main/java/de/kentoj/scrow/provider/provider/GenericServiceProvider.java
deleted file mode 100644
index 13e58dc..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/provider/GenericServiceProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.kentoj.scrow.provider.provider;
-
-import java.util.function.Supplier;
-
-public class GenericServiceProvider<T> implements ServiceProvider<T> {
-
-    private final T service;
-
-    public GenericServiceProvider(T service) {
-        this.service = service;
-    }
-
-    public GenericServiceProvider(Supplier<T> serviceSupplier) {
-        this.service = serviceSupplier.get();
-    }
-
-    @Override
-    public T get() {
-        return service;
-    }
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/provider/provider/ServiceProvider.java b/core-api/src/main/java/de/kentoj/scrow/provider/provider/ServiceProvider.java
deleted file mode 100644
index 579d56c..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/provider/provider/ServiceProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.kentoj.scrow.provider.provider;
-
-public interface ServiceProvider<T> {
-
-    T get();
-
-    default void cleanup() {}
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/services/mail/Mail.java b/core-api/src/main/java/de/kentoj/scrow/services/mail/Mail.java
deleted file mode 100644
index 034ff90..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/services/mail/Mail.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.kentoj.scrow.services.mail;
-
-import lombok.Value;
-
-import java.util.UUID;
-
-@Value
-public class Mail {
-    UUID from;
-    String subject;
-    String body;
-}
diff --git a/core-api/src/main/java/de/kentoj/scrow/services/mail/MailService.java b/core-api/src/main/java/de/kentoj/scrow/services/mail/MailService.java
deleted file mode 100644
index a726ea2..0000000
--- a/core-api/src/main/java/de/kentoj/scrow/services/mail/MailService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.kentoj.scrow.services.mail;
-
-import reactor.core.publisher.Mono;
-
-import java.util.UUID;
-
-/**
- * like email but for minecraft
- */
-public interface MailService {
-
-    Mono<Long> sendMail(UUID to, Mail mail);
-}
diff --git a/core-bukkit-api/build.gradle.kts b/core-bukkit-api/build.gradle.kts
new file mode 100644
index 0000000..66b64df
--- /dev/null
+++ b/core-bukkit-api/build.gradle.kts
@@ -0,0 +1,60 @@
+import org.gradle.internal.declarativedsl.dom.mutation.valueFromString
+
+plugins {
+    id("java")
+    id("java-library")
+    id("maven-publish")
+}
+
+group = "de.kentoj.scrow"
+version = "1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+    api("me.lucko:commodore:2.2")
+    api("org.spigotmc:spigot-api:1.21.11-R0.1-SNAPSHOT")
+}
+
+tasks.findByName("shadowJar")?.let {
+    dependencies {
+        "exclude"("dependency"("com.mojang.brigadier")!!)
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("CoreBukkitApi") {
+            groupId = project.group.toString()
+            artifactId = project.name
+            version = project.version.toString()
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            name = "scrow"
+            url = uri("http://forge.kentoj.de/api/packages/scrow/maven")
+            isAllowInsecureProtocol = true
+
+            credentials(HttpHeaderCredentials::class) {
+                name = "Authorization"
+                value = "token a967694822eed6e97b1b20e8737733ef1400fa1f"
+            }
+
+            authentication {
+                create<HttpHeaderAuthentication>("header")
+            }
+        }
+    }
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/core-api/src/main/java/de/kentoj/scrow/ScrowAPI.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
similarity index 89%
rename from core-api/src/main/java/de/kentoj/scrow/ScrowAPI.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
index 77ad1fc..236e65d 100644
--- a/core-api/src/main/java/de/kentoj/scrow/ScrowAPI.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/ScrowAPI.java
@@ -1,7 +1,7 @@
-package de.kentoj.scrow;
+package de.kentoj.scrow.bukkit;
 
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.services.EconomyService;
+import de.kentoj.scrow.bukkit.services.EconomyService;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/core-api/src/main/java/de/kentoj/scrow/services/EconomyService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/EconomyService.java
similarity index 95%
rename from core-api/src/main/java/de/kentoj/scrow/services/EconomyService.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/EconomyService.java
index f0ea4b6..4f57459 100644
--- a/core-api/src/main/java/de/kentoj/scrow/services/EconomyService.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/EconomyService.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.services;
+package de.kentoj.scrow.bukkit.services;
 
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/Email.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/Email.java
new file mode 100644
index 0000000..e5797c2
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/Email.java
@@ -0,0 +1,18 @@
+package de.kentoj.scrow.bukkit.services.email;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public interface Email extends EmailDraft {
+
+    Long getId();
+
+    /**
+     * @return UUID of player the mail is sent to or null if console
+     */
+    @Nullable UUID getFrom();
+
+    @Nullable Instant getSentAt();
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailDraft.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailDraft.java
new file mode 100644
index 0000000..5cbb0bd
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailDraft.java
@@ -0,0 +1,28 @@
+package de.kentoj.scrow.bukkit.services.email;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.UUID;
+
+public interface EmailDraft {
+
+    /**
+     * @return UUID of player sending the mail or null if console
+     */
+    @Nullable UUID getFrom();
+
+    /**
+     * @return non-empty string specifying the subject
+     */
+    String getSubject();
+
+    /**
+     * @return body of the message
+     */
+    String getBody();
+
+    /**
+     * @return id of the mail this mail is replying to or null if not replying to any email
+     */
+    @Nullable Long getReplyTo();
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailService.java
new file mode 100644
index 0000000..f609a47
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/email/EmailService.java
@@ -0,0 +1,25 @@
+package de.kentoj.scrow.bukkit.services.email;
+
+import org.jetbrains.annotations.NotNull;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * like email but for minecraft
+ */
+public interface EmailService {
+
+    Mono<@NotNull Email> sendMail(UUID to, EmailDraft emailDraft);
+    Flux<@NotNull Email> sendMailToMany(Set<UUID> to, EmailDraft emailDraft);
+
+    Flux<@NotNull Email> fetchMails(UUID to);
+
+    /**
+     * @param to uuid of player whose inbox to operate on
+     * @param id id of the email
+     */
+    Mono<@NotNull Void> deleteMail(UUID to, long id);
+}
diff --git a/core-api/src/main/java/de/kentoj/scrow/services/friends/FriendRequest.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/FriendRequest.java
similarity index 75%
rename from core-api/src/main/java/de/kentoj/scrow/services/friends/FriendRequest.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/FriendRequest.java
index 005d7fb..644de2f 100644
--- a/core-api/src/main/java/de/kentoj/scrow/services/friends/FriendRequest.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/FriendRequest.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.services.friends;
+package de.kentoj.scrow.bukkit.services.friends;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/core-api/src/main/java/de/kentoj/scrow/services/friends/Friendship.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/Friendship.java
similarity index 60%
rename from core-api/src/main/java/de/kentoj/scrow/services/friends/Friendship.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/Friendship.java
index 99fa797..7312c4f 100644
--- a/core-api/src/main/java/de/kentoj/scrow/services/friends/Friendship.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/friends/Friendship.java
@@ -1,6 +1,6 @@
-package de.kentoj.scrow.services.friends;
+package de.kentoj.scrow.bukkit.services.friends;
 
-import de.kentoj.scrow.util.pair.Tuple2;
+import de.kentoj.scrow.bukkit.util.pair.Tuple2;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CmdContext.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CmdContext.java
new file mode 100644
index 0000000..f3994bc
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CmdContext.java
@@ -0,0 +1,16 @@
+package de.kentoj.scrow.bukkit.services.old;
+
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+public interface CmdContext {
+
+    CommandSender getSender();
+
+    Player getSenderPlayer();
+
+    Entity getSenderEntity();
+
+    <T> T getArg(String key);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandExecutor.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandExecutor.java
new file mode 100644
index 0000000..bd44ff6
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandExecutor.java
@@ -0,0 +1,9 @@
+package de.kentoj.scrow.bukkit.services.old;
+
+public interface CommandExecutor {
+
+    /**
+     * @return true on success, 1 on failure
+     */
+    boolean execute(CmdContext ctx);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandsService.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandsService.java
new file mode 100644
index 0000000..6a53a98
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/CommandsService.java
@@ -0,0 +1,9 @@
+package de.kentoj.scrow.bukkit.services.old;
+
+import org.bukkit.command.Command;
+import org.bukkit.plugin.Plugin;
+
+public interface CommandsService {
+
+    void register(Plugin plugin, Command command);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/RegisteredCmdArg.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/RegisteredCmdArg.java
new file mode 100644
index 0000000..24dd626
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/RegisteredCmdArg.java
@@ -0,0 +1,11 @@
+package de.kentoj.scrow.bukkit.services.old;
+
+import de.kentoj.scrow.bukkit.services.old.arg.CmdArg;
+import lombok.Value;
+
+@Value
+public class RegisteredCmdArg<T> {
+    int index;
+    String key;
+    CmdArg<T> arg;
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/SCommand.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/SCommand.java
new file mode 100644
index 0000000..0e17f41
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/SCommand.java
@@ -0,0 +1,21 @@
+package de.kentoj.scrow.bukkit.services.old;
+
+import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public interface SCommand {
+
+    @Nullable Permission getPermission();
+
+    RegisteredCmdArg<?> getArg(int index);
+
+    List<SCommand> getSubCommands();
+
+    String[] getLabels();
+
+    String getDescription();
+
+    @Nullable CommandExecutor getExecutor();
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/CmdArg.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/CmdArg.java
new file mode 100644
index 0000000..fef832a
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/CmdArg.java
@@ -0,0 +1,6 @@
+package de.kentoj.scrow.bukkit.services.old.arg;
+
+public interface CmdArg<S> {
+
+    S parseInput(String str);
+}
diff --git a/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/PlayerArgType.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/PlayerArgType.java
new file mode 100644
index 0000000..605f9f2
--- /dev/null
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/services/old/arg/PlayerArgType.java
@@ -0,0 +1,28 @@
+package de.kentoj.scrow.bukkit.services.old.arg;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.util.UUID;
+
+// FIXME module stuff
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class PlayerArgType {
+
+    public static final CmdArg<Player> player = str -> {
+        if (str.length() == 36) {
+            var uuid = UUID.fromString(str);
+            return Bukkit.getPlayer(uuid);
+        } else {
+            return Bukkit.getPlayer(str);
+        }
+    };
+
+    public static final CmdArg<OfflinePlayer> offlinePlayer = str -> {
+        var uuid = UUID.fromString(str);
+        return Bukkit.getOfflinePlayer(uuid);
+    };
+}
diff --git a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple2.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple2.java
similarity index 67%
rename from core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple2.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple2.java
index fb1200c..ad9007f 100644
--- a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple2.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple2.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.util.pair;
+package de.kentoj.scrow.bukkit.util.pair;
 
 import lombok.Value;
 
diff --git a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple3.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple3.java
similarity index 71%
rename from core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple3.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple3.java
index 0ee8aab..9d102e8 100644
--- a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple3.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple3.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.util.pair;
+package de.kentoj.scrow.bukkit.util.pair;
 
 import lombok.Value;
 
diff --git a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple4.java b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple4.java
similarity index 74%
rename from core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple4.java
rename to core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple4.java
index 252dda5..152628a 100644
--- a/core-api/src/main/java/de/kentoj/scrow/util/pair/Tuple4.java
+++ b/core-bukkit-api/src/main/java/de/kentoj/scrow/bukkit/util/pair/Tuple4.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.util.pair;
+package de.kentoj.scrow.bukkit.util.pair;
 
 import lombok.Value;
 
diff --git a/core-impl/build.gradle.kts b/core-bukkit-impl/build.gradle.kts
similarity index 79%
rename from core-impl/build.gradle.kts
rename to core-bukkit-impl/build.gradle.kts
index e9d4adb..c609bba 100644
--- a/core-impl/build.gradle.kts
+++ b/core-bukkit-impl/build.gradle.kts
@@ -1,7 +1,9 @@
+
 plugins {
     id("java")
     id("com.gradleup.shadow") version "9.2.0"
     id("xyz.jpenilla.run-paper") version "2.3.1"
+    kotlin("jvm")
 }
 
 group = "de.kentoj.scrow"
@@ -9,9 +11,6 @@ version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
-    maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
-        name = "spigotmc-repo"
-    }
 }
 
 dependencies {
@@ -19,8 +18,8 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
-    compileOnly("org.spigotmc:spigot-api:1.21.11-R0.1-SNAPSHOT")
-    implementation(project(":core-api"))
+    implementation(project(":core-bukkit-api"))
+    implementation(kotlin("stdlib-jdk8"))
 }
 
 tasks {
@@ -40,4 +39,7 @@ tasks.build {
 
 tasks.test {
     useJUnitPlatform()
+}
+kotlin {
+    jvmToolchain(21)
 }
\ No newline at end of file
diff --git a/core-impl/src/main/java/de/kentoj/scrow/CoreImplPlugin.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
similarity index 97%
rename from core-impl/src/main/java/de/kentoj/scrow/CoreImplPlugin.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
index 18fdedc..4ebbc94 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/CoreImplPlugin.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/CoreImplPlugin.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow;
+package de.kentoj.scrow.bukkit;
 
 import org.bukkit.plugin.java.JavaPlugin;
 import reactor.core.publisher.Mono;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/ScrowAPISurface.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
similarity index 91%
rename from core-impl/src/main/java/de/kentoj/scrow/ScrowAPISurface.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
index 53bd501..6a4d76c 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/ScrowAPISurface.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/ScrowAPISurface.java
@@ -1,11 +1,11 @@
-package de.kentoj.scrow;
+package de.kentoj.scrow.bukkit;
 
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
-import de.kentoj.scrow.economy.InMemoryEconomyService;
-import de.kentoj.scrow.economy.MongoEconomyService;
+import de.kentoj.scrow.bukkit.economy.InMemoryEconomyService;
+import de.kentoj.scrow.bukkit.economy.MongoEconomyService;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.bson.UuidRepresentation;
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/AbstractSCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/AbstractSCommand.java
new file mode 100644
index 0000000..c2e3be6
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/AbstractSCommand.java
@@ -0,0 +1,69 @@
+package de.kentoj.scrow.bukkit.command;
+
+import com.google.common.collect.ImmutableList;
+import de.kentoj.scrow.bukkit.services.old.CommandExecutor;
+import de.kentoj.scrow.bukkit.services.old.RegisteredCmdArg;
+import de.kentoj.scrow.bukkit.services.old.SCommand;
+import de.kentoj.scrow.bukkit.services.old.arg.CmdArg;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.permissions.Permission;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AbstractSCommand implements SCommand {
+
+    private final List<SCommand> subCommands = new ArrayList<>();
+    private final List<RegisteredCmdArg<?>> args = new ArrayList<>();
+
+    @Getter
+    private final String[] labels;
+    @Getter
+    private @Nullable Permission permission = null;
+    @Getter
+    @Setter(value = AccessLevel.PROTECTED)
+    private @Nullable String description;
+    @Getter
+    @Setter(value = AccessLevel.PROTECTED)
+    private @Nullable CommandExecutor executor = null;
+
+    public AbstractSCommand(String... labels) {
+        this.labels = labels;
+    }
+
+    protected <T> void addArg(String key, CmdArg<T> arg) {
+
+    }
+    protected <T> void addArg(String key, CmdArg<T> arg, T defaultValue) {
+        var index = args.size();
+        args.add(new RegisteredCmdArg<>(index, key, arg));
+    }
+
+    @Override
+    public RegisteredCmdArg<?> getArg(int index) {
+        //noinspection OptionalGetWithoutIsPresent
+        return args.stream()
+                .filter(ra -> ra.getIndex() == index)
+                .findFirst()
+                .get();
+    }
+
+    public void addSubCommand(SCommand subCommand) {
+        subCommands.add(subCommand);
+    }
+
+    protected void setPermission(@Nullable Permission permission) {
+        this.permission = permission;
+    }
+
+    protected void setPermission(String permission) {
+        setPermission(new Permission(permission));
+    }
+
+    public List<SCommand> getSubCommands() {
+        return ImmutableList.copyOf(subCommands);
+    }
+}
\ No newline at end of file
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CmdContextImpl.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CmdContextImpl.java
new file mode 100644
index 0000000..bc71cca
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CmdContextImpl.java
@@ -0,0 +1,33 @@
+package de.kentoj.scrow.bukkit.command;
+
+import de.kentoj.scrow.bukkit.services.old.CmdContext;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import java.util.Map;
+
+@RequiredArgsConstructor
+public class CmdContextImpl implements CmdContext {
+
+    private final Map<String, Object> args;
+    @Getter
+    private final CommandSender sender;
+
+    @Override
+    public Player getSenderPlayer() {
+        return (Player) sender;
+    }
+
+    @Override
+    public Entity getSenderEntity() {
+        return (Entity) sender;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T getArg(String key) {
+        return (T) args.get(key);
+    }
+}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CommandProcessor.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CommandProcessor.java
new file mode 100644
index 0000000..1aed98f
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/CommandProcessor.java
@@ -0,0 +1,29 @@
+package de.kentoj.scrow.bukkit.command;
+
+import de.kentoj.scrow.bukkit.services.old.CmdContext;
+import de.kentoj.scrow.bukkit.services.old.SCommand;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class CommandProcessor implements CommandExecutor {
+
+    public CmdContext process(SCommand scommand, String[] strArgs, CommandSender sender) {
+        Map<String, Object> args = new HashMap<>();
+        for (int i = 0; i < strArgs.length; i++) {
+            var arg = scommand.getArg(i);
+            var value = arg.getArg().parseInput(strArgs[i]);
+            args.put(arg.getKey(), value);
+        }
+        return new CmdContextImpl(args, sender);
+    }
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        return false;
+    }
+}
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/LaunchCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/LaunchCommand.java
new file mode 100644
index 0000000..3c110bd
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/command/LaunchCommand.java
@@ -0,0 +1,26 @@
+package de.kentoj.scrow.bukkit.command;
+
+import de.kentoj.scrow.bukkit.services.old.CommandExecutor;
+import de.kentoj.scrow.bukkit.services.old.arg.PlayerArgType;
+import de.kentoj.scrow.bukkit.services.old.CmdContext;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
+import org.bukkit.util.Vector;
+
+public class LaunchCommand extends AbstractSCommand implements CommandExecutor {
+
+    public LaunchCommand() {
+        super("launch");
+        setPermission(new Permission("corebukkit.cmd.launch"));
+        setExecutor(this);
+        addArg("player", PlayerArgType.player);
+        addArg("factor", IntRangeType.range(1, 5), 1);
+    }
+
+    @Override
+    public boolean execute(CmdContext ctx) {
+        final Player player = ctx.getArg("player");
+        player.setVelocity(new Vector(0, 1, 0));
+        return true;
+    }
+}
diff --git a/core-impl/src/main/java/de/kentoj/scrow/economy/InMemoryEconomyService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
similarity index 93%
rename from core-impl/src/main/java/de/kentoj/scrow/economy/InMemoryEconomyService.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
index 394720a..372813b 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/economy/InMemoryEconomyService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/InMemoryEconomyService.java
@@ -1,7 +1,7 @@
-package de.kentoj.scrow.economy;
+package de.kentoj.scrow.bukkit.economy;
 
 import com.google.common.base.Preconditions;
-import de.kentoj.scrow.services.EconomyService;
+import de.kentoj.scrow.bukkit.services.EconomyService;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
 
diff --git a/core-impl/src/main/java/de/kentoj/scrow/economy/MongoEconomyService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java
similarity index 95%
rename from core-impl/src/main/java/de/kentoj/scrow/economy/MongoEconomyService.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java
index ec0f801..ba7f830 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/economy/MongoEconomyService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/economy/MongoEconomyService.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.economy;
+package de.kentoj.scrow.bukkit.economy;
 
 import com.google.common.base.Preconditions;
 import com.mongodb.client.model.Filters;
@@ -6,8 +6,9 @@ import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.model.Updates;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.services.EconomyService;
+import de.kentoj.scrow.bukkit.services.EconomyService;
 import org.bson.Document;
+import org.bson.types.ObjectId;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Mono;
 
diff --git a/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendsCommand.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendsCommand.java
new file mode 100644
index 0000000..236ebfd
--- /dev/null
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendsCommand.java
@@ -0,0 +1,22 @@
+package de.kentoj.scrow.bukkit.friends;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+
+public class FriendsCommand {
+
+    public static Command<?> createCommand() {
+        return LiteralArgumentBuilder.literal("friends")
+                .then(LiteralArgumentBuilder.literal("add")
+                        .then(RequiredArgumentBuilder.argument("player", StringArgumentType.word())))
+                .then(LiteralArgumentBuilder.literal("list"))
+                .then(LiteralArgumentBuilder.literal("requests"))
+                .then(LiteralArgumentBuilder.literal("remove"))
+                .then(LiteralArgumentBuilder.literal("jump"))
+                .then(LiteralArgumentBuilder.literal("accept"))
+                .then(LiteralArgumentBuilder.literal("deny"))
+                .build().getCommand();
+    }
+}
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/FriendshipService.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
similarity index 87%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/FriendshipService.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
index f0125df..804e245 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/FriendshipService.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/FriendshipService.java
@@ -1,7 +1,7 @@
-package de.kentoj.scrow.friends;
+package de.kentoj.scrow.bukkit.friends;
 
-import de.kentoj.scrow.services.friends.FriendRequest;
-import de.kentoj.scrow.services.friends.Friendship;
+import de.kentoj.scrow.bukkit.services.friends.FriendRequest;
+import de.kentoj.scrow.bukkit.services.friends.Friendship;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -20,6 +20,7 @@ public interface FriendshipService {
     Mono<@NotNull Boolean> endFriendship(UUID initiator, UUID other);
 
     Flux<@NotNull FriendRequest> getIncomingFriendRequests(UUID playerId);
+
     Flux<@NotNull FriendRequest> getOutgoingFriendRequests(UUID playerId);
 
     /**
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/BsonFriendship.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/BsonFriendship.java
similarity index 85%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/friendship/BsonFriendship.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/BsonFriendship.java
index 579553a..6527c02 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/BsonFriendship.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/BsonFriendship.java
@@ -1,8 +1,8 @@
-package de.kentoj.scrow.friends.friendship;
+package de.kentoj.scrow.bukkit.friends.friendship;
 
 import com.google.common.base.Preconditions;
-import de.kentoj.scrow.services.friends.Friendship;
-import de.kentoj.scrow.util.pair.Tuple2;
+import de.kentoj.scrow.bukkit.services.friends.Friendship;
+import de.kentoj.scrow.bukkit.util.pair.Tuple2;
 import lombok.Value;
 import org.bson.codecs.pojo.annotations.BsonCreator;
 import org.bson.codecs.pojo.annotations.BsonProperty;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipRepository.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipRepository.java
similarity index 81%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipRepository.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipRepository.java
index ec44049..7f7a2d4 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipRepository.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipRepository.java
@@ -1,7 +1,7 @@
-package de.kentoj.scrow.friends.friendship;
+package de.kentoj.scrow.bukkit.friends.friendship;
 
-import de.kentoj.scrow.services.friends.Friendship;
-import de.kentoj.scrow.util.pair.Tuple2;
+import de.kentoj.scrow.bukkit.services.friends.Friendship;
+import de.kentoj.scrow.bukkit.util.pair.Tuple2;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipUtils.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipUtils.java
similarity index 85%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipUtils.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipUtils.java
index b37952c..1efa7c1 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/FriendshipUtils.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/FriendshipUtils.java
@@ -1,6 +1,6 @@
-package de.kentoj.scrow.friends.friendship;
+package de.kentoj.scrow.bukkit.friends.friendship;
 
-import de.kentoj.scrow.util.pair.Tuple2;
+import de.kentoj.scrow.bukkit.util.pair.Tuple2;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/MongoFriendshipRepository.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipRepository.java
similarity index 95%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/friendship/MongoFriendshipRepository.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipRepository.java
index 130aeb5..c97c93f 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/friendship/MongoFriendshipRepository.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/friendship/MongoFriendshipRepository.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.friends.friendship;
+package de.kentoj.scrow.bukkit.friends.friendship;
 
 import com.mongodb.ErrorCategory;
 import com.mongodb.MongoWriteException;
@@ -7,8 +7,8 @@ import com.mongodb.client.model.IndexOptions;
 import com.mongodb.client.model.Indexes;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.services.friends.Friendship;
-import de.kentoj.scrow.util.pair.Tuple2;
+import de.kentoj.scrow.bukkit.services.friends.Friendship;
+import de.kentoj.scrow.bukkit.util.pair.Tuple2;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/request/BsonFriendRequest.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/BsonFriendRequest.java
similarity index 90%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/request/BsonFriendRequest.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/BsonFriendRequest.java
index 7742c06..371a6fb 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/request/BsonFriendRequest.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/BsonFriendRequest.java
@@ -1,7 +1,7 @@
-package de.kentoj.scrow.friends.request;
+package de.kentoj.scrow.bukkit.friends.request;
 
 import com.google.common.base.Preconditions;
-import de.kentoj.scrow.services.friends.FriendRequest;
+import de.kentoj.scrow.bukkit.services.friends.FriendRequest;
 import lombok.Value;
 import org.bson.codecs.pojo.annotations.BsonCreator;
 import org.bson.codecs.pojo.annotations.BsonProperty;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/request/FriendRequestRepository.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/FriendRequestRepository.java
similarity index 87%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/request/FriendRequestRepository.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/FriendRequestRepository.java
index 05ddb47..f44e230 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/request/FriendRequestRepository.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/FriendRequestRepository.java
@@ -1,6 +1,6 @@
-package de.kentoj.scrow.friends.request;
+package de.kentoj.scrow.bukkit.friends.request;
 
-import de.kentoj.scrow.services.friends.FriendRequest;
+import de.kentoj.scrow.bukkit.services.friends.FriendRequest;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/core-impl/src/main/java/de/kentoj/scrow/friends/request/MongoFriendRequestRepository.java b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestRepository.java
similarity index 96%
rename from core-impl/src/main/java/de/kentoj/scrow/friends/request/MongoFriendRequestRepository.java
rename to core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestRepository.java
index 92bcf92..1ac0dc5 100644
--- a/core-impl/src/main/java/de/kentoj/scrow/friends/request/MongoFriendRequestRepository.java
+++ b/core-bukkit-impl/src/main/java/de/kentoj/scrow/bukkit/friends/request/MongoFriendRequestRepository.java
@@ -1,4 +1,4 @@
-package de.kentoj.scrow.friends.request;
+package de.kentoj.scrow.bukkit.friends.request;
 
 import com.mongodb.ErrorCategory;
 import com.mongodb.MongoWriteException;
@@ -7,7 +7,7 @@ import com.mongodb.client.model.IndexOptions;
 import com.mongodb.client.model.Indexes;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import de.kentoj.scrow.services.friends.FriendRequest;
+import de.kentoj.scrow.bukkit.services.friends.FriendRequest;
 import org.jetbrains.annotations.NotNull;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
diff --git a/core-impl/src/main/resources/plugin.yml b/core-bukkit-impl/src/main/resources/plugin.yml
similarity index 51%
rename from core-impl/src/main/resources/plugin.yml
rename to core-bukkit-impl/src/main/resources/plugin.yml
index d8923f8..a580ed7 100644
--- a/core-impl/src/main/resources/plugin.yml
+++ b/core-bukkit-impl/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
-name: "CoreImpl"
+name: "CoreBukkit"
 version: "1.0"
-main: "de.kentoj.scrow.CoreImplPlugin"
+main: "de.kentoj.scrow.bukkit.CoreImplPlugin"
 api-version: "1.1"
 author: "Kento2 <kento@placeq.com>"
\ No newline at end of file
diff --git a/core-impl/run/eula.txt b/core-impl/run/eula.txt
deleted file mode 100644
index 481a3a5..0000000
--- a/core-impl/run/eula.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
-#Sun Feb 15 11:54:50 CET 2026
-eula=true
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a21..f39e6fa 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -46,7 +46,7 @@ set JAVA_EXE=java.exe
 if %ERRORLEVEL% equ 0 goto execute
 
 echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' SCommand could be found in your PATH. 1>&2
 echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
@@ -68,7 +68,7 @@ echo location of your Java installation. 1>&2
 goto fail
 
 :execute
-@rem Setup the command line
+@rem Setup the SCommand line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cb02752..7346df7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,11 @@
+pluginManagement {
+    plugins {
+        kotlin("jvm") version "2.2.10"
+    }
+}
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
 rootProject.name = "core"
-include("core-api")
-include("core-impl")
\ No newline at end of file
+include("core-bukkit-api")
+include("core-bukkit-impl")
\ No newline at end of file