diff --git a/build.gradle.kts b/build.gradle.kts
index 53c2f29..7012d04 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ subprojects {
 
     tasks {
         getByName<JavaCompile>("compileJava") {
-            options.release.set(21)
+            options.release.set(24)
             options.encoding = "UTF-8"
         }
         getByName<JacocoReport>("jacocoTestReport") {
@@ -21,5 +21,11 @@ subprojects {
                 events("passed", "skipped", "failed")
             }
         }
+
+        configure<JavaPluginExtension> {
+            toolchain {
+                languageVersion.set(JavaLanguageVersion.of(24))
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 0c5782a..f377f0a 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -5,12 +5,6 @@ plugins {
 group = "net.onelitefeather.cygnus"
 version = "1.0.1"
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
 dependencies {
     implementation(platform(libs.mycelium.bom))
     implementation(platform(libs.aonyx.bom))
diff --git a/game/build.gradle.kts b/game/build.gradle.kts
index 4f7b516..310dd45 100644
--- a/game/build.gradle.kts
+++ b/game/build.gradle.kts
@@ -12,12 +12,6 @@ application {
     mainClass.set("net.onelitefeather.cygnus.CygnusLoader")
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
 dependencies {
     implementation(platform(libs.mycelium.bom))
     implementation(platform(libs.aonyx.bom))
@@ -27,6 +21,10 @@ dependencies {
     implementation(libs.xerus)
   //  implementation(libs.canis)
 
+    //CloudNet
+    implementation(platform(libs.cloudnet.bom))
+    implementation(libs.bundles.cloudnet)
+
     testImplementation(libs.minestom)
     testImplementation(libs.adventure)
     testImplementation(libs.cyano)
@@ -39,11 +37,6 @@ dependencies {
 }
 
 tasks {
-    compileJava {
-        options.encoding = "UTF-8"
-        options.release.set(21)
-    }
-
     jacocoTestReport {
         dependsOn(test)
         reports {
diff --git a/game/src/main/java/net/onelitefeather/cygnus/CygnusLoader.java b/game/src/main/java/net/onelitefeather/cygnus/CygnusLoader.java
index a7acef1..eb4fab2 100644
--- a/game/src/main/java/net/onelitefeather/cygnus/CygnusLoader.java
+++ b/game/src/main/java/net/onelitefeather/cygnus/CygnusLoader.java
@@ -1,5 +1,8 @@
 package net.onelitefeather.cygnus;
 
+import dev.derklaro.aerogel.Injector;
+import eu.cloudnetservice.driver.inject.InjectionLayer;
+import eu.cloudnetservice.modules.bridge.impl.platform.minestom.MinestomBridgeExtension;
 import net.minestom.server.MinecraftServer;
 
 public final class CygnusLoader {
@@ -7,6 +10,9 @@ public final class CygnusLoader {
     public static void main(String[] args) {
         MinecraftServer server = MinecraftServer.init();
         new Cygnus();
+        try (InjectionLayer<Injector> layer = InjectionLayer.ext()) {
+            layer.instance(MinestomBridgeExtension.class).onLoad();
+        }
         server.start("0.0.0.0", 25565);
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 395d4d7..5367069 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,6 +11,8 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         maven("https://reposilite.atlasengine.ca/public")
+        maven("https://central.sonatype.com/repository/maven-snapshots/")
+        maven("https://repository.derklaro.dev/snapshots/")
         maven {
             name = "OneLiteFeatherRepository"
             url = uri("https://repo.onelitefeather.dev/onelitefeather")
@@ -34,6 +36,7 @@ dependencyResolutionManagement {
             version("agones4j", "2.0.2")
             version("grpc", "1.68.0")
             version("tomcat-annotations-api", "6.0.53")
+            version("cloudnet", "4.0.0-RC15-SNAPSHOT")
 
             version("bom", "1.4.4")
             version("aonyx", "0.5.2")
@@ -61,10 +64,32 @@ dependencyResolutionManagement {
             library("grpc.protobuf", "io.grpc", "grpc-protobuf").versionRef("grpc")
             library("grpc.netty", "io.grpc", "grpc-netty").versionRef("grpc")
             library("grpc.okhttp", "io.grpc", "grpc-okhttp").versionRef("grpc")
-            library("tomcat-annotations-api", "org.apache.tomcat", "annotations-api").versionRef("tomcat-annotations-api")
+            library(
+                "tomcat-annotations-api",
+                "org.apache.tomcat",
+                "annotations-api"
+            ).versionRef("tomcat-annotations-api")
+
+            library("cloudnet-bom", "eu.cloudnetservice.cloudnet", "bom").versionRef("cloudnet")
+            library("cloudnet-bridge", "eu.cloudnetservice.cloudnet", "bridge-api").withoutVersion()
+            library("cloudnet-bridge-impl", "eu.cloudnetservice.cloudnet", "bridge-impl").withoutVersion()
+            library("cloudnet-driver-impl", "eu.cloudnetservice.cloudnet", "driver-impl").withoutVersion()
+            library("cloudnet-platform-inject", "eu.cloudnetservice.cloudnet", "platform-inject-api").withoutVersion()
+            library("cloudnet-jvm-wrapper", "eu.cloudnetservice.cloudnet", "wrapper-jvm-api").withoutVersion()
 
             plugin("shadow", "com.gradleup.shadow").versionRef("shadow")
             plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
+
+            bundle(
+                "cloudnet",
+                listOf(
+                    "cloudnet-bridge",
+                    "cloudnet-bridge-impl",
+                    "cloudnet-driver-impl",
+                    "cloudnet-platform-inject",
+                    "cloudnet-jvm-wrapper"
+                )
+            )
         }
     }
 }
diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts
index 7cfb20c..e666411 100644
--- a/setup/build.gradle.kts
+++ b/setup/build.gradle.kts
@@ -10,12 +10,6 @@ plugins {
 group = "net.onelitefeather"
 version = "1.0.1"
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
 application {
     mainClass.set("net.onelitefeather.cygnus.setup.SetupLoader")
 }
@@ -40,11 +34,6 @@ dependencies {
     testRuntimeOnly(libs.junit.engine)
 }
 tasks {
-    compileJava {
-        options.encoding = "UTF-8"
-        options.release.set(21)
-    }
-
     jacocoTestReport {
         dependsOn(test)
         reports {