From c307c02731bb778abae0761352ebe02cdb4a5cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Levilain?= <jeremy@jeremylvln.fr>
Date: Mon, 23 Oct 2023 18:43:46 +0200
Subject: [PATCH] feat: move API source to agents projects [breaking change]

---
 .idea/jarRepositories.xml                     |  5 ++
 .idea/modules.xml                             |  8 +--
 .../shulker-gradle-tools.iml                  | 12 ++++
 ...lker.packages.shulker-proxy-agent.api.iml} | 30 ++++----
 ...ackages.shulker-proxy-agent.bungeecord.iml | 58 +++++++--------
 ...er.packages.shulker-proxy-agent.common.iml | 58 +++++++--------
 ....packages.shulker-proxy-agent.velocity.iml | 58 +++++++--------
 .../shulker.packages.shulker-proxy-api.iml    | 11 ---
 ...hulker.packages.shulker-proxy-api.test.iml | 71 -------------------
 ...ker.packages.shulker-server-agent.api.iml} | 28 ++++----
 ...r.packages.shulker-server-agent.common.iml |  2 +-
 ...er.packages.shulker-server-agent.paper.iml |  2 +-
 ...ulker.packages.shulker-server-api.test.iml | 71 -------------------
 build.gradle.kts                              | 37 +++++++++-
 packages/shulker-proxy-agent/build.gradle.kts | 44 ++++++------
 .../shulker-proxy-agent/gradle.properties     |  1 -
 packages/shulker-proxy-agent/project.json     |  2 +-
 .../proxyagent/api/ShulkerProxyAPI.java       |  9 +++
 .../proxyagent/ProxyInterfaceBungeeCord.kt    |  3 +-
 .../io/shulkermc/proxyagent/ProxyInterface.kt |  3 +-
 .../proxyagent/api/ShulkerProxyAPIImpl.kt     | 36 ++++++++--
 .../api/adapters/DirectoryAdapterImpl.kt      | 41 -----------
 .../proxyagent/domain/ServerPreConnectHook.kt |  3 +-
 .../features/directory/DirectoryFeature.kt    |  4 +-
 .../proxyagent/features/limbo/LimboFeature.kt |  2 +-
 .../proxyagent/ProxyInterfaceVelocity.kt      |  3 +-
 packages/shulker-proxy-api/build.gradle.kts   |  4 --
 packages/shulker-proxy-api/project.json       | 37 ----------
 .../io/shulkermc/proxyapi/ShulkerProxyAPI.kt  | 11 ---
 .../proxyapi/adapters/DirectoryAdapter.kt     |  8 ---
 .../shulker-server-agent/build.gradle.kts     | 26 ++++---
 .../shulker-server-agent/gradle.properties    |  1 -
 packages/shulker-server-agent/project.json    |  2 +-
 .../serveragent/api/ShulkerServerAPI.java     | 11 +++
 .../serveragent/api/ShulkerServerAPIImpl.kt   | 21 +++---
 .../api/adapters/NetworkAdapterImpl.kt        | 22 ------
 packages/shulker-server-api/build.gradle.kts  |  4 --
 packages/shulker-server-api/project.json      | 37 ----------
 .../shulkermc/serverapi/ShulkerServerAPI.kt   | 11 ---
 .../serverapi/adapters/NetworkAdapter.kt      | 10 ---
 settings.gradle                               |  2 -
 41 files changed, 278 insertions(+), 531 deletions(-)
 create mode 100644 .idea/modules/packages/shulker-gradle-tools/shulker-gradle-tools.iml
 rename .idea/modules/packages/{shulker-server-api/shulker.packages.shulker-server-api.main.iml => shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml} (74%)
 delete mode 100644 .idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml
 delete mode 100644 .idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml
 rename .idea/modules/packages/{shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml => shulker-server-agent/shulker.packages.shulker-server-agent.api.iml} (75%)
 delete mode 100644 .idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml
 delete mode 100644 packages/shulker-proxy-agent/gradle.properties
 create mode 100644 packages/shulker-proxy-agent/src/api/java/io/shulkermc/proxyagent/api/ShulkerProxyAPI.java
 delete mode 100644 packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt
 delete mode 100644 packages/shulker-proxy-api/build.gradle.kts
 delete mode 100644 packages/shulker-proxy-api/project.json
 delete mode 100644 packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/ShulkerProxyAPI.kt
 delete mode 100644 packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/adapters/DirectoryAdapter.kt
 delete mode 100644 packages/shulker-server-agent/gradle.properties
 create mode 100644 packages/shulker-server-agent/src/api/java/io/shulkermc/serveragent/api/ShulkerServerAPI.java
 delete mode 100644 packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/adapters/NetworkAdapterImpl.kt
 delete mode 100644 packages/shulker-server-api/build.gradle.kts
 delete mode 100644 packages/shulker-server-api/project.json
 delete mode 100644 packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/ShulkerServerAPI.kt
 delete mode 100644 packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/adapters/NetworkAdapter.kt

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 4670944e..12639098 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="papermc" />
       <option name="url" value="https://repo.papermc.io/repository/maven-public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://plugins.gradle.org/m2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a66b222b..281973ac 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -10,25 +10,21 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/google-agones-sdk/bindings/java/shulker.packages.google-agones-sdk-bindings-java.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker.packages.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker.packages.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-sdk/bindings/java/shulker.packages.shulker-sdk-bindings-java.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.api.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.api.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.main.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/packages/shulker.packages.test.iml" filepath="$PROJECT_DIR$/.idea/modules/packages/shulker.packages.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/shulker.test.iml" filepath="$PROJECT_DIR$/.idea/modules/shulker.test.iml" />
     </modules>
diff --git a/.idea/modules/packages/shulker-gradle-tools/shulker-gradle-tools.iml b/.idea/modules/packages/shulker-gradle-tools/shulker-gradle-tools.iml
new file mode 100644
index 00000000..e8b741af
--- /dev/null
+++ b/.idea/modules/packages/shulker-gradle-tools/shulker-gradle-tools.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":shulker-gradle-tools" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-gradle-tools" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../../../packages/shulker-gradle-tools">
+      <excludeFolder url="file://$MODULE_DIR$/../../../../packages/shulker-gradle-tools/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../../packages/shulker-gradle-tools/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.main.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml
similarity index 74%
rename from .idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.main.iml
rename to .idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml
index f710f68f..e9642086 100644
--- a/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.main.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.api.iml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":packages:shulker-server-api:main" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-server-api" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":packages:shulker-proxy-agent:api" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-proxy-agent" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Werror" />
-        </compilerSettings>
+        <compilerSettings />
         <compilerArguments>
           <flagArguments>
             <flagArg name="allowNoSourceFiles" arg="true" />
@@ -13,9 +11,9 @@
             <flagArg name="noStdlib" arg="true" />
           </flagArguments>
           <stringArguments>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/classes/kotlin/main" />
+            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/classes/kotlin/api" />
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="moduleName" arg="shulker-server-api" />
+            <stringArg name="moduleName" arg="shulker-proxy-agent_api" />
             <stringArg name="apiVersion" arg="1.9" />
             <stringArg name="languageVersion" arg="1.9" />
           </stringArguments>
@@ -37,24 +35,26 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/classes/kotlin/main" />
+    <output url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/classes/java/api" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kapt/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kapt/main" isTestSource="false" generated="true" />
+    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/api" isTestSource="false" generated="true" />
     </content>
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kaptKotlin/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kaptKotlin/main" isTestSource="false" generated="true" />
+    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/api" isTestSource="false" generated="true" />
     </content>
-    <content url="file://$MODULE_DIR$/../../../../packages/shulker-server-api/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-server-api/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-server-api/src/main/resources" type="java-resource" />
+    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/api" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-agent/src/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-agent/src/api/java" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/tmp/kapt3/classes/main" />
+          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/tmp/kapt3/classes/api" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
index ffb952db..98c73571 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.bungeecord.iml
@@ -47,9 +47,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/bungeecord">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/bungeecord" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/bungeecord" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/bungeecord">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/bungeecord" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/bungeecord" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/bungeecord">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/bungeecord" isTestSource="false" />
@@ -62,6 +64,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-agent.api" />
     <orderEntry type="module" module-name="shulker.packages.shulker-proxy-agent.common" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
@@ -72,14 +75,13 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-api.main" />
     <orderEntry type="module" module-name="shulker.packages.google-agones-sdk-bindings-java.main" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.md-5:bungeecord-api:1.20-R0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.kyori:adventure-platform-bungeecord:4.3.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-api:4.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:3.24.4" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
@@ -101,32 +103,32 @@
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.12.12" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.12" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:2.0.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.md-5:brigadier:1.0.16-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: io.netty:netty-codec:4.1.96.Final" level="project" />
@@ -145,9 +147,9 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-text-serializer-json:4.14.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.9.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: io.netty:netty-resolver:4.1.96.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.8.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.9.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-netty-shaded:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-services:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-protobuf:1.58.0" level="project" />
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
index 51d2bcc5..2497048b 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.common.iml
@@ -46,9 +46,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/common">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/common" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/common" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/common">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/common" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/common" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/common">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/common" isTestSource="false" />
@@ -59,6 +61,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-agent.api" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
@@ -68,12 +71,11 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-api.main" />
     <orderEntry type="module" module-name="shulker.packages.google-agones-sdk-bindings-java.main" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-api:4.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:3.24.4" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
@@ -83,39 +85,39 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:24.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.12.12" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.12" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.36" level="project" />
-    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.6" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:2.0.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.7" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:2.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.8.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.9.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-netty-shaded:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-services:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-protobuf:1.58.0" level="project" />
diff --git a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
index 69f94590..b0abc5b0 100644
--- a/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
+++ b/.idea/modules/packages/shulker-proxy-agent/shulker.packages.shulker-proxy-agent.velocity.iml
@@ -47,9 +47,11 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/velocity">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/velocity" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kapt/velocity" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/velocity">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/velocity" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/source/kaptKotlin/velocity" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/velocity">
       <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-agent/generated/sources/buildConfig/velocity" isTestSource="false" />
@@ -64,6 +66,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-agent.api" />
     <orderEntry type="module" module-name="shulker.packages.shulker-proxy-agent.common" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
@@ -74,20 +77,19 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-api.main" />
     <orderEntry type="module" module-name="shulker.packages.google-agones-sdk-bindings-java.main" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.velocitypowered:velocity-api:3.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-api:4.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-httpclient-okhttp:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-client-api:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:3.24.4" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-text-serializer-gson:4.14.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-text-serializer-legacy:4.14.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-text-serializer-plain:4.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:2.0.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.moandjiezana.toml:toml4j:0.7.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.gson:gson:2.8.8" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.inject:guice:5.0.1" level="project" />
@@ -103,28 +105,28 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.jetbrains:annotations:24.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:logging-interceptor:3.12.12" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.12" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.6" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-gatewayapi:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-resource:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-rbac:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-admissionregistration:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apps:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-autoscaling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-apiextensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-batch:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-certificates:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-coordination:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-discovery:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-events:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-extensions:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-flowcontrol:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-networking:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-metrics:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-policy:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-scheduling:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-storageclass:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-node:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-core:6.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.snakeyaml:snakeyaml-engine:2.7" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-databind:2.15.2" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.15.2" level="project" />
@@ -142,9 +144,9 @@
     <orderEntry type="library" name="Gradle: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.8.1" level="project" />
+    <orderEntry type="library" name="Gradle: io.fabric8:kubernetes-model-common:6.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-annotations:2.15.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.8.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: io.fabric8:kubernetes-client:6.9.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-netty-shaded:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-services:1.58.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Gradle: io.grpc:grpc-protobuf:1.58.0" level="project" />
diff --git a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml b/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml
deleted file mode 100644
index 4f250d53..00000000
--- a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":packages:shulker-proxy-api" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-proxy-api" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api">
-      <excludeFolder url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api/.gradle" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml b/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml
deleted file mode 100644
index 885e02e9..00000000
--- a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.test.iml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":packages:shulker-proxy-api:test" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-proxy-api" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
-        <additionalVisibleModuleNames>:packages:shulker-proxy-api:main</additionalVisibleModuleNames>
-        <compilerSettings />
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="allowNoSourceFiles" arg="true" />
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/classes/kotlin/test" />
-            <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="moduleName" arg="shulker-proxy-api_test" />
-            <stringArg name="apiVersion" arg="1.9" />
-            <stringArg name="languageVersion" arg="1.9" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.9.10/de62c537edfe46edc9987d6bad393550690da01c/kotlin-scripting-jvm-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.9.10/83fd6c933c3fc24672350b0950311b7eaa3e33fc/kotlin-scripting-common-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.9.10/72812e8a368917ab5c0a5081b56915ffdfec93b7/kotlin-stdlib-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.10/dafaf2c27f27c09220cee312df10917d9a5d97ce/kotlin-stdlib-common-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.9.10/398513a8534701579cccaf5953ea914416b4696c/kotlin-script-runtime-1.9.10.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions" />
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kapt/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kapt/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kaptKotlin/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kaptKotlin/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="shulker.packages.shulker-proxy-api.main" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/tmp/kapt3/classes/test" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="shulker.packages.shulker-proxy-api.main" />
-</module>
\ No newline at end of file
diff --git a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.api.iml
similarity index 75%
rename from .idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml
rename to .idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.api.iml
index e39d4f35..4803f3cf 100644
--- a/.idea/modules/packages/shulker-proxy-api/shulker.packages.shulker-proxy-api.main.iml
+++ b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.api.iml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":packages:shulker-proxy-api:main" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-proxy-api" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":packages:shulker-server-agent:api" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-server-agent" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Werror" />
-        </compilerSettings>
+        <compilerSettings />
         <compilerArguments>
           <flagArguments>
             <flagArg name="allowNoSourceFiles" arg="true" />
@@ -13,9 +11,9 @@
             <flagArg name="noStdlib" arg="true" />
           </flagArguments>
           <stringArguments>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/classes/kotlin/main" />
+            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/classes/kotlin/api" />
             <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="moduleName" arg="shulker-proxy-api" />
+            <stringArg name="moduleName" arg="shulker-server-agent_api" />
             <stringArg name="apiVersion" arg="1.9" />
             <stringArg name="languageVersion" arg="1.9" />
           </stringArguments>
@@ -37,24 +35,24 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/classes/kotlin/main" />
+    <output url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/classes/java/api" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kapt/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kapt/main" isTestSource="false" generated="true" />
+    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/generated/source/kapt/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/generated/source/kapt/api" isTestSource="false" generated="true" />
     </content>
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kaptKotlin/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/generated/source/kaptKotlin/main" isTestSource="false" generated="true" />
+    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/generated/source/kaptKotlin/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/generated/source/kaptKotlin/api" isTestSource="false" generated="true" />
     </content>
-    <content url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api/src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-proxy-api/src/main/resources" type="java-resource" />
+    <content url="file://$MODULE_DIR$/../../../../packages/shulker-server-agent/src/api">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-server-agent/src/api/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../packages/shulker-server-agent/src/api/kotlin" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-proxy-api/tmp/kapt3/classes/main" />
+          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-agent/tmp/kapt3/classes/api" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
index 2742e45a..4d24e85f 100644
--- a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
+++ b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.common.iml
@@ -56,6 +56,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shulker.packages.shulker-server-agent.api" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
         <CLASSES>
@@ -65,7 +66,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="shulker.packages.shulker-server-api.main" />
     <orderEntry type="module" module-name="shulker.packages.google-agones-sdk-bindings-java.main" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.kyori:adventure-api:4.14.0" level="project" />
diff --git a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
index 3cd61c0f..51a39ac9 100644
--- a/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
+++ b/.idea/modules/packages/shulker-server-agent/shulker.packages.shulker-server-agent.paper.iml
@@ -57,6 +57,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shulker.packages.shulker-server-agent.api" />
     <orderEntry type="module" module-name="shulker.packages.shulker-server-agent.common" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
@@ -67,7 +68,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="shulker.packages.shulker-server-api.main" />
     <orderEntry type="module" module-name="shulker.packages.google-agones-sdk-bindings-java.main" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT" level="project" />
diff --git a/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml b/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml
deleted file mode 100644
index 8978e2e6..00000000
--- a/.idea/modules/packages/shulker-server-api/shulker.packages.shulker-server-api.test.iml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":packages:shulker-server-api:test" external.linked.project.path="$MODULE_DIR$/../../../../packages/shulker-server-api" external.root.project.path="$MODULE_DIR$/../../../.." external.system.id="GRADLE" external.system.module.group="io.shulkermc" external.system.module.type="sourceSet" external.system.module.version="0.1.0" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
-      <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
-        <additionalVisibleModuleNames>:packages:shulker-server-api:main</additionalVisibleModuleNames>
-        <compilerSettings />
-        <compilerArguments>
-          <flagArguments>
-            <flagArg name="allowNoSourceFiles" arg="true" />
-            <flagArg name="noReflect" arg="true" />
-            <flagArg name="noStdlib" arg="true" />
-          </flagArguments>
-          <stringArguments>
-            <stringArg name="destination" arg="$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/classes/kotlin/test" />
-            <stringArg name="jvmTarget" arg="17" />
-            <stringArg name="moduleName" arg="shulker-server-api_test" />
-            <stringArg name="apiVersion" arg="1.9" />
-            <stringArg name="languageVersion" arg="1.9" />
-          </stringArguments>
-          <arrayArguments>
-            <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.9.10/de62c537edfe46edc9987d6bad393550690da01c/kotlin-scripting-jvm-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.9.10/83fd6c933c3fc24672350b0950311b7eaa3e33fc/kotlin-scripting-common-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.9.10/72812e8a368917ab5c0a5081b56915ffdfec93b7/kotlin-stdlib-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.9.10/dafaf2c27f27c09220cee312df10917d9a5d97ce/kotlin-stdlib-common-1.9.10.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.9.10/398513a8534701579cccaf5953ea914416b4696c/kotlin-script-runtime-1.9.10.jar</arg>
-              </args>
-            </arrayArg>
-            <arrayArg name="pluginOptions" />
-          </arrayArguments>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kapt/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kapt/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kaptKotlin/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/generated/source/kaptKotlin/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../packages/shulker-server-api/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="shulker.packages.shulker-server-api.main" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../../dist/java/packages/shulker-server-api/tmp/kapt3/classes/test" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="shulker.packages.shulker-server-api.main" />
-</module>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index e13c4813..c6fd5a9f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -208,7 +208,36 @@ subprojects {
         }
     }
 
-    if (project.hasProperty("isProxyPlugin")) {
+    fun registerApiSourceSet(commonSourceSet: SourceSet?) {
+        val apiSourceSet = sourceSets.create("api")
+
+        if (commonSourceSet != null) {
+            dependencies {
+                "commonImplementation"(apiSourceSet.output)
+            }
+        }
+
+        val apiJar = tasks.register("apiJar", ShadowJar::class.java) {
+            archiveClassifier = "api"
+            from(apiSourceSet.output)
+            configurations = listOf(project.configurations.getByName("apiRuntimeClasspath"))
+        }
+
+        artifacts.add("archives", apiJar)
+        tasks.assemble {
+            dependsOn(apiJar)
+        }
+
+        publishing {
+            publications {
+                named<MavenPublication>("mavenJava") {
+                    artifact(apiJar)
+                }
+            }
+        }
+    }
+
+    if (project.name == "shulker-proxy-agent") {
         apply(plugin = "org.jetbrains.kotlin.kapt")
 
         val commonSourceSet = sourceSets.create("common")
@@ -216,6 +245,8 @@ subprojects {
             registerPluginProvider(providerName, commonSourceSet)
         }
 
+        registerApiSourceSet(commonSourceSet)
+
         dependencies {
             "commonCompileOnly"("net.kyori:adventure-api:4.14.0")
             "bungeecordCompileOnly"("net.md-5:bungeecord-api:1.20-R0.1")
@@ -223,12 +254,14 @@ subprojects {
             "velocityCompileOnly"("com.velocitypowered:velocity-api:3.1.1")
             "kaptVelocity"("com.velocitypowered:velocity-api:3.1.1")
         }
-    } else if (project.hasProperty("isServerPlugin")) {
+    } else if (project.name == "shulker-server-agent") {
         val commonSourceSet = sourceSets.create("common")
         listOf("paper").forEach { providerName ->
             registerPluginProvider(providerName, commonSourceSet)
         }
 
+        registerApiSourceSet(commonSourceSet)
+
         dependencies {
             "commonCompileOnly"("net.kyori:adventure-api:4.14.0")
             "paperCompileOnly"("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
diff --git a/packages/shulker-proxy-agent/build.gradle.kts b/packages/shulker-proxy-agent/build.gradle.kts
index 97689601..fc96a512 100644
--- a/packages/shulker-proxy-agent/build.gradle.kts
+++ b/packages/shulker-proxy-agent/build.gradle.kts
@@ -1,35 +1,33 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     id("com.github.gmazzo.buildconfig") version "4.1.2"
 }
 
 dependencies {
-    commonApi(project(":packages:shulker-proxy-api"))
-
-    commonCompileOnly("io.fabric8:kubernetes-client-api:6.9.0")
-    commonRuntimeOnly("io.fabric8:kubernetes-client:6.9.0")
-    commonImplementation("io.fabric8:kubernetes-httpclient-okhttp:6.9.0")
-
-    commonImplementation(project(":packages:google-agones-sdk-bindings-java"))
-    commonRuntimeOnly("io.grpc:grpc-netty-shaded:1.58.0")
+    // Kubernetes
+    "commonCompileOnly"("io.fabric8:kubernetes-client-api:6.9.0")
+    "commonRuntimeOnly"("io.fabric8:kubernetes-client:6.9.0")
+    "commonImplementation"("io.fabric8:kubernetes-httpclient-okhttp:6.9.0")
+
+    // Agones
+    "commonImplementation"(project(":packages:google-agones-sdk-bindings-java"))
+    "commonRuntimeOnly"("io.grpc:grpc-netty-shaded:1.58.0")
 }
 
-tasks {
-    bungeecordJar {
-        dependsOn(":packages:shulker-proxy-api:shadowJar")
-        dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
-        mergeServiceFiles()
-    }
+tasks.named("bungeecordJar", ShadowJar::class.java) {
+    dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
+    mergeServiceFiles()
+}
 
-    velocityJar {
-        dependsOn(":packages:shulker-proxy-api:shadowJar")
-        dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
-        mergeServiceFiles()
-    }
+tasks.named("velocityJar", ShadowJar::class.java) {
+    dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
+    mergeServiceFiles()
+}
 
-    processBungeecordResources {
-        inputs.property("version", project.version)
-        expand("version" to project.version)
-    }
+tasks.named("processBungeecordResources", ProcessResources::class.java) {
+    inputs.property("version", project.version)
+    expand("version" to project.version)
 }
 
 ktlint {
diff --git a/packages/shulker-proxy-agent/gradle.properties b/packages/shulker-proxy-agent/gradle.properties
deleted file mode 100644
index 923033f2..00000000
--- a/packages/shulker-proxy-agent/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-isProxyPlugin=true
diff --git a/packages/shulker-proxy-agent/project.json b/packages/shulker-proxy-agent/project.json
index e9699e72..a7497a72 100644
--- a/packages/shulker-proxy-agent/project.json
+++ b/packages/shulker-proxy-agent/project.json
@@ -28,5 +28,5 @@
     }
   },
   "tags": ["lang:java"],
-  "implicitDependencies": ["shulker-proxy-api"]
+  "implicitDependencies": ["google-agones-sdk-bindings-java"]
 }
diff --git a/packages/shulker-proxy-agent/src/api/java/io/shulkermc/proxyagent/api/ShulkerProxyAPI.java b/packages/shulker-proxy-agent/src/api/java/io/shulkermc/proxyagent/api/ShulkerProxyAPI.java
new file mode 100644
index 00000000..faf1113e
--- /dev/null
+++ b/packages/shulker-proxy-agent/src/api/java/io/shulkermc/proxyagent/api/ShulkerProxyAPI.java
@@ -0,0 +1,9 @@
+package io.shulkermc.proxyagent.api;
+
+import java.util.Set;
+
+public abstract class ShulkerProxyAPI {
+    public static ShulkerProxyAPI INSTANCE;
+
+    abstract public Set<String> getServersByTag(String tag);
+}
diff --git a/packages/shulker-proxy-agent/src/bungeecord/kotlin/io/shulkermc/proxyagent/ProxyInterfaceBungeeCord.kt b/packages/shulker-proxy-agent/src/bungeecord/kotlin/io/shulkermc/proxyagent/ProxyInterfaceBungeeCord.kt
index 3d065f7c..3e7a82eb 100644
--- a/packages/shulker-proxy-agent/src/bungeecord/kotlin/io/shulkermc/proxyagent/ProxyInterfaceBungeeCord.kt
+++ b/packages/shulker-proxy-agent/src/bungeecord/kotlin/io/shulkermc/proxyagent/ProxyInterfaceBungeeCord.kt
@@ -3,7 +3,6 @@ package io.shulkermc.proxyagent
 import io.shulkermc.proxyagent.domain.Player
 import io.shulkermc.proxyagent.domain.PlayerPreLoginHook
 import io.shulkermc.proxyagent.domain.ServerPreConnectHook
-import io.shulkermc.proxyapi.adapters.ServerName
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer
 import net.md_5.bungee.api.ProxyServer
@@ -22,7 +21,7 @@ class ProxyInterfaceBungeeCord(
     private val plugin: Plugin,
     private val proxy: ProxyServer
 ) : ProxyInterface {
-    override fun registerServer(name: ServerName, address: InetSocketAddress) {
+    override fun registerServer(name: String, address: InetSocketAddress) {
         this.proxy.servers[name] = this.proxy.constructServerInfo(name, address, "", false)
     }
 
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt
index 851670bf..bed6cfba 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt
@@ -2,12 +2,11 @@ package io.shulkermc.proxyagent
 
 import io.shulkermc.proxyagent.domain.PlayerPreLoginHook
 import io.shulkermc.proxyagent.domain.ServerPreConnectHook
-import io.shulkermc.proxyapi.adapters.ServerName
 import java.net.InetSocketAddress
 import java.util.concurrent.TimeUnit
 
 interface ProxyInterface {
-    fun registerServer(name: ServerName, address: InetSocketAddress)
+    fun registerServer(name: String, address: InetSocketAddress)
     fun unregisterServer(name: String): Boolean
     fun hasServer(name: String): Boolean
 
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/ShulkerProxyAPIImpl.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/ShulkerProxyAPIImpl.kt
index db93f44c..dab512f8 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/ShulkerProxyAPIImpl.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/ShulkerProxyAPIImpl.kt
@@ -1,18 +1,40 @@
 package io.shulkermc.proxyagent.api
 
 import io.shulkermc.proxyagent.ShulkerProxyAgentCommon
-import io.shulkermc.proxyagent.api.adapters.DirectoryAdapterImpl
-import io.shulkermc.proxyapi.ShulkerProxyAPI
-import io.shulkermc.proxyapi.adapters.DirectoryAdapter
+import java.net.InetSocketAddress
 
-class ShulkerProxyAPIImpl(agent: ShulkerProxyAgentCommon) : ShulkerProxyAPI() {
-    val directoryAdapter = DirectoryAdapterImpl(agent)
+class ShulkerProxyAPIImpl(private val agent: ShulkerProxyAgentCommon) : ShulkerProxyAPI() {
+    private val serversByTag = HashMap<String, MutableSet<String>>()
+    private val tagsByServer = HashMap<String, Set<String>>()
 
     init {
         INSTANCE = this
     }
 
-    override fun getDirectoryAdapter(): DirectoryAdapter {
-        return this.directoryAdapter
+    override fun getServersByTag(tag: String): Set<String> {
+        return this.serversByTag.getOrDefault(tag, HashSet())
+    }
+
+    fun registerServer(name: String, address: InetSocketAddress, tags: Set<String>) {
+        this.agent.proxyInterface.registerServer(name, address)
+
+        for (tag in tags) {
+            this.serversByTag.getOrPut(tag) { mutableSetOf() }.add(name)
+            this.agent.logger.fine("Tagged '$tag' on server '$name'")
+        }
+        this.tagsByServer[name] = tags
+        this.agent.logger.info("Added server '$name' to directory")
+    }
+
+    fun unregisterServer(name: String) {
+        if (this.agent.proxyInterface.unregisterServer(name)) {
+            this.agent.logger.info("Removed server '$name' from directory")
+
+            val tags = this.tagsByServer[name]
+            if (tags != null) {
+                tags.forEach { tag -> this.serversByTag[tag]!!.remove(name) }
+                this.tagsByServer.remove(name)
+            }
+        }
     }
 }
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt
deleted file mode 100644
index a333f532..00000000
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/api/adapters/DirectoryAdapterImpl.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.shulkermc.proxyagent.api.adapters
-
-import io.shulkermc.proxyagent.ShulkerProxyAgentCommon
-import io.shulkermc.proxyapi.adapters.DirectoryAdapter
-import io.shulkermc.proxyapi.adapters.ServerName
-import io.shulkermc.proxyapi.adapters.ServerTag
-import java.net.InetSocketAddress
-
-class DirectoryAdapterImpl(
-    private val agent: ShulkerProxyAgentCommon
-) : DirectoryAdapter {
-    private val serversByTag = HashMap<ServerTag, MutableSet<ServerName>>()
-    private val tagsByServer = HashMap<ServerName, Set<ServerTag>>()
-
-    fun registerServer(name: ServerName, address: InetSocketAddress, tags: Set<ServerTag>) {
-        this.agent.proxyInterface.registerServer(name, address)
-
-        for (tag in tags) {
-            this.serversByTag.getOrPut(tag) { mutableSetOf() }.add(name)
-            this.agent.logger.fine("Tagged '$tag' on server '$name'")
-        }
-        this.tagsByServer[name] = tags
-        this.agent.logger.info("Added server '$name' to directory")
-    }
-
-    fun unregisterServer(name: ServerName) {
-        if (this.agent.proxyInterface.unregisterServer(name)) {
-            this.agent.logger.info("Removed server '$name' from directory")
-
-            val tags = this.tagsByServer[name]
-            if (tags != null) {
-                tags.forEach { tag -> this.serversByTag[tag]!!.remove(name) }
-                this.tagsByServer.remove(name)
-            }
-        }
-    }
-
-    override fun getServersByTag(tag: String): Set<ServerName> {
-        return this.serversByTag.getOrDefault(tag, HashSet())
-    }
-}
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/domain/ServerPreConnectHook.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/domain/ServerPreConnectHook.kt
index 074597de..78bd12a2 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/domain/ServerPreConnectHook.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/domain/ServerPreConnectHook.kt
@@ -1,8 +1,7 @@
 package io.shulkermc.proxyagent.domain
 
-import io.shulkermc.proxyapi.adapters.ServerName
 import java.util.Optional
 
-data class ServerPreConnectHookResult(val newServerName: Optional<ServerName>)
+data class ServerPreConnectHookResult(val newServerName: Optional<String>)
 
 typealias ServerPreConnectHook = (player: Player, originalServerName: String) -> ServerPreConnectHookResult
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/directory/DirectoryFeature.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/directory/DirectoryFeature.kt
index b81c813a..76ddabad 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/directory/DirectoryFeature.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/directory/DirectoryFeature.kt
@@ -33,7 +33,7 @@ class DirectoryFeature(
 
         if (gameServer.status.isReady()) {
             val tags = gameServer.metadata.annotations["minecraftserver.shulkermc.io/tags"]
-            this.agent.api.directoryAdapter.registerServer(
+            this.agent.api.registerServer(
                 gameServer.metadata.name,
                 InetSocketAddress(gameServer.status.address, gameServer.status.ports!![0].port!!),
                 tags?.split(",")?.toSet() ?: emptySet()
@@ -42,6 +42,6 @@ class DirectoryFeature(
     }
 
     private fun unregisterServer(gameServer: AgonesV1GameServer) {
-        this.agent.api.directoryAdapter.unregisterServer(gameServer.metadata.name)
+        this.agent.api.unregisterServer(gameServer.metadata.name)
     }
 }
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/limbo/LimboFeature.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/limbo/LimboFeature.kt
index df23ed27..ef3993f5 100644
--- a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/limbo/LimboFeature.kt
+++ b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/features/limbo/LimboFeature.kt
@@ -26,7 +26,7 @@ class LimboFeature(
 
     private fun onServerPreConnect(player: Player, originalServerName: String): ServerPreConnectHookResult {
         if (originalServerName == LIMBO_TAG) {
-            val limboServers = this.agent.api.directoryAdapter.getServersByTag(LIMBO_TAG).iterator()
+            val limboServers = this.agent.api.getServersByTag(LIMBO_TAG).iterator()
 
             if (limboServers.hasNext()) {
                 val firstLimboServer = limboServers.next()
diff --git a/packages/shulker-proxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt b/packages/shulker-proxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt
index ba8007c4..ac53873f 100644
--- a/packages/shulker-proxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt
+++ b/packages/shulker-proxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/ProxyInterfaceVelocity.kt
@@ -9,14 +9,13 @@ import com.velocitypowered.api.proxy.server.ServerInfo
 import com.velocitypowered.api.scheduler.ScheduledTask
 import io.shulkermc.proxyagent.domain.PlayerPreLoginHook
 import io.shulkermc.proxyagent.domain.ServerPreConnectHook
-import io.shulkermc.proxyapi.adapters.ServerName
 import net.kyori.adventure.text.Component
 import java.net.InetSocketAddress
 import java.util.concurrent.TimeUnit
 import kotlin.jvm.optionals.getOrElse
 
 class ProxyInterfaceVelocity(private val plugin: ShulkerProxyAgent, private val proxy: ProxyServer) : ProxyInterface {
-    override fun registerServer(name: ServerName, address: InetSocketAddress) {
+    override fun registerServer(name: String, address: InetSocketAddress) {
         this.proxy.registerServer(ServerInfo(name, address))
     }
 
diff --git a/packages/shulker-proxy-api/build.gradle.kts b/packages/shulker-proxy-api/build.gradle.kts
deleted file mode 100644
index 1e6b1768..00000000
--- a/packages/shulker-proxy-api/build.gradle.kts
+++ /dev/null
@@ -1,4 +0,0 @@
-configure<JavaPluginExtension> {
-    withJavadocJar()
-    withSourcesJar()
-}
diff --git a/packages/shulker-proxy-api/project.json b/packages/shulker-proxy-api/project.json
deleted file mode 100644
index efc39890..00000000
--- a/packages/shulker-proxy-api/project.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "shulker-proxy-api",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/shulker-proxy-api/src",
-  "projectType": "library",
-  "targets": {
-    "build": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-proxy-api:build -x check"
-      },
-      "inputs": ["default", "java:dependencies"],
-      "outputs": ["{workspaceRoot}/dist/java/shulker-proxy-api"]
-    },
-    "test": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-proxy-api:test"
-      },
-      "inputs": ["default", "java:dependencies"]
-    },
-    "lint": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-proxy-api:ktlintCheck"
-      },
-      "inputs": ["default", "java:dependencies"]
-    },
-    "publish-maven": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-proxy-api:publish"
-      }
-    }
-  },
-  "tags": ["lang:java"]
-}
diff --git a/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/ShulkerProxyAPI.kt b/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/ShulkerProxyAPI.kt
deleted file mode 100644
index 694a821d..00000000
--- a/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/ShulkerProxyAPI.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.shulkermc.proxyapi
-
-import io.shulkermc.proxyapi.adapters.DirectoryAdapter
-
-abstract class ShulkerProxyAPI {
-    companion object {
-        lateinit var INSTANCE: ShulkerProxyAPI
-    }
-
-    abstract fun getDirectoryAdapter(): DirectoryAdapter
-}
diff --git a/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/adapters/DirectoryAdapter.kt b/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/adapters/DirectoryAdapter.kt
deleted file mode 100644
index c1011cbf..00000000
--- a/packages/shulker-proxy-api/src/main/kotlin/io/shulkermc/proxyapi/adapters/DirectoryAdapter.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.shulkermc.proxyapi.adapters
-
-typealias ServerName = String
-typealias ServerTag = String
-
-interface DirectoryAdapter {
-    fun getServersByTag(tag: ServerTag): Set<ServerName>
-}
diff --git a/packages/shulker-server-agent/build.gradle.kts b/packages/shulker-server-agent/build.gradle.kts
index 304fbe09..763bbfcd 100644
--- a/packages/shulker-server-agent/build.gradle.kts
+++ b/packages/shulker-server-agent/build.gradle.kts
@@ -1,19 +1,17 @@
-dependencies {
-    commonApi(project(":packages:shulker-server-api"))
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-    commonImplementation(project(":packages:google-agones-sdk-bindings-java"))
-    commonRuntimeOnly("io.grpc:grpc-netty-shaded:1.58.0")
+dependencies {
+    // Agones
+    "commonImplementation"(project(":packages:google-agones-sdk-bindings-java"))
+    "commonRuntimeOnly"("io.grpc:grpc-netty-shaded:1.58.0")
 }
 
-tasks {
-    paperJar {
-        dependsOn(":packages:shulker-server-api:shadowJar")
-        dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
-        mergeServiceFiles()
-    }
+tasks.named("paperJar", ShadowJar::class.java) {
+    dependsOn(":packages:google-agones-sdk-bindings-java:shadowJar")
+    mergeServiceFiles()
+}
 
-    processPaperResources {
-        inputs.property("version", project.version)
-        expand("version" to project.version)
-    }
+tasks.named("processPaperResources", ProcessResources::class.java) {
+    inputs.property("version", project.version)
+    expand("version" to project.version)
 }
diff --git a/packages/shulker-server-agent/gradle.properties b/packages/shulker-server-agent/gradle.properties
deleted file mode 100644
index 50703a64..00000000
--- a/packages/shulker-server-agent/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-isServerPlugin=true
diff --git a/packages/shulker-server-agent/project.json b/packages/shulker-server-agent/project.json
index 1315c539..ff084017 100644
--- a/packages/shulker-server-agent/project.json
+++ b/packages/shulker-server-agent/project.json
@@ -28,5 +28,5 @@
     }
   },
   "tags": ["lang:java"],
-  "implicitDependencies": ["shulker-server-api"]
+  "implicitDependencies": ["google-agones-sdk-bindings-java"]
 }
diff --git a/packages/shulker-server-agent/src/api/java/io/shulkermc/serveragent/api/ShulkerServerAPI.java b/packages/shulker-server-agent/src/api/java/io/shulkermc/serveragent/api/ShulkerServerAPI.java
new file mode 100644
index 00000000..818fd8ab
--- /dev/null
+++ b/packages/shulker-server-agent/src/api/java/io/shulkermc/serveragent/api/ShulkerServerAPI.java
@@ -0,0 +1,11 @@
+package io.shulkermc.serveragent.api;
+
+import java.util.concurrent.CompletableFuture;
+
+public abstract class ShulkerServerAPI {
+    public static ShulkerServerAPI INSTANCE;
+
+    abstract public void askShutdown();
+    abstract public CompletableFuture<Void> setAllocated();
+    abstract public CompletableFuture<Void> setReserved(long seconds);
+}
diff --git a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/ShulkerServerAPIImpl.kt b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/ShulkerServerAPIImpl.kt
index 975f3e81..37ee4236 100644
--- a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/ShulkerServerAPIImpl.kt
+++ b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/ShulkerServerAPIImpl.kt
@@ -1,18 +1,23 @@
 package io.shulkermc.serveragent.api
 
 import io.shulkermc.serveragent.ShulkerServerAgentCommon
-import io.shulkermc.serveragent.api.adapters.NetworkAdapterImpl
-import io.shulkermc.serverapi.ShulkerServerAPI
-import io.shulkermc.serverapi.adapters.NetworkAdapter
-
-class ShulkerServerAPIImpl(agent: ShulkerServerAgentCommon) : ShulkerServerAPI() {
-    private val networkAdapter = NetworkAdapterImpl(agent)
+import java.util.concurrent.CompletableFuture
+import kotlin.system.exitProcess
 
+class ShulkerServerAPIImpl(private val agent: ShulkerServerAgentCommon) : ShulkerServerAPI() {
     init {
         INSTANCE = this
     }
 
-    override fun getNetworkAdapter(): NetworkAdapter {
-        return this.networkAdapter
+    override fun askShutdown() {
+        try {
+            this.agent.agonesGateway.askShutdown()
+        } catch (ex: Exception) {
+            this.agent.logger.severe("Failed to ask Agones sidecar to shutdown properly, stopping process manually")
+            exitProcess(0)
+        }
     }
+
+    override fun setAllocated(): CompletableFuture<Void> = this.agent.agonesGateway.setAllocated().thenAccept {}
+    override fun setReserved(seconds: Long): CompletableFuture<Void> = this.agent.agonesGateway.setReserved(seconds).thenAccept {}
 }
diff --git a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/adapters/NetworkAdapterImpl.kt b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/adapters/NetworkAdapterImpl.kt
deleted file mode 100644
index 30d8947c..00000000
--- a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/api/adapters/NetworkAdapterImpl.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.shulkermc.serveragent.api.adapters
-
-import io.shulkermc.serveragent.ShulkerServerAgentCommon
-import io.shulkermc.serverapi.adapters.NetworkAdapter
-import java.util.concurrent.CompletableFuture
-import kotlin.system.exitProcess
-
-class NetworkAdapterImpl(
-    private val agent: ShulkerServerAgentCommon
-) : NetworkAdapter {
-    override fun setAllocated(): CompletableFuture<Unit> = this.agent.agonesGateway.setAllocated().thenApply {}
-    override fun setReserved(seconds: Long): CompletableFuture<Unit> = this.agent.agonesGateway.setReserved(seconds).thenApply {}
-
-    override fun askShutdown() {
-        try {
-            this.agent.agonesGateway.askShutdown()
-        } catch (ex: Exception) {
-            this.agent.logger.severe("Failed to ask Agones sidecar to shutdown properly, stopping process manually")
-            exitProcess(0)
-        }
-    }
-}
diff --git a/packages/shulker-server-api/build.gradle.kts b/packages/shulker-server-api/build.gradle.kts
deleted file mode 100644
index 1e6b1768..00000000
--- a/packages/shulker-server-api/build.gradle.kts
+++ /dev/null
@@ -1,4 +0,0 @@
-configure<JavaPluginExtension> {
-    withJavadocJar()
-    withSourcesJar()
-}
diff --git a/packages/shulker-server-api/project.json b/packages/shulker-server-api/project.json
deleted file mode 100644
index e1654350..00000000
--- a/packages/shulker-server-api/project.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "name": "shulker-server-api",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/shulker-server-api/src",
-  "projectType": "library",
-  "targets": {
-    "build": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-server-api:build -x check"
-      },
-      "inputs": ["default", "java:dependencies"],
-      "outputs": ["{workspaceRoot}/dist/java/shulker-server-api"]
-    },
-    "test": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-server-api:test"
-      },
-      "inputs": ["default", "java:dependencies"]
-    },
-    "lint": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-server-api:ktlintCheck"
-      },
-      "inputs": ["default", "java:dependencies"]
-    },
-    "publish-maven": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "./gradlew :packages:shulker-server-api:publish"
-      }
-    }
-  },
-  "tags": ["lang:java"]
-}
diff --git a/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/ShulkerServerAPI.kt b/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/ShulkerServerAPI.kt
deleted file mode 100644
index 351af005..00000000
--- a/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/ShulkerServerAPI.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.shulkermc.serverapi
-
-import io.shulkermc.serverapi.adapters.NetworkAdapter
-
-abstract class ShulkerServerAPI {
-    companion object {
-        lateinit var INSTANCE: ShulkerServerAPI
-    }
-
-    abstract fun getNetworkAdapter(): NetworkAdapter
-}
diff --git a/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/adapters/NetworkAdapter.kt b/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/adapters/NetworkAdapter.kt
deleted file mode 100644
index 7db31e23..00000000
--- a/packages/shulker-server-api/src/main/kotlin/io/shulkermc/serverapi/adapters/NetworkAdapter.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.shulkermc.serverapi.adapters
-
-import java.util.concurrent.CompletableFuture
-
-interface NetworkAdapter {
-    fun setAllocated(): CompletableFuture<Unit>
-    fun setReserved(seconds: Long): CompletableFuture<Unit>
-
-    fun askShutdown()
-}
diff --git a/settings.gradle b/settings.gradle
index 303ede5b..92dfb460 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,6 @@
 rootProject.name = "shulker"
 
-include ':packages:shulker-proxy-api'
 include ':packages:shulker-proxy-agent'
-include ':packages:shulker-server-api'
 include ':packages:shulker-server-agent'
 
 include ':packages:shulker-sdk-bindings-java'