Skip to content

Commit 4d3ff9e

Browse files
feature: add Cloudnet integration (#19)
* feature(deps): add CloudNet dependencies * build(java): update java to 24 * feature(repo): add missing repo * fix(build): improve java version apply * fix(build): remove double java version set * feature(repo): add missing repo * feature(cloudnet): add minestom hook --------- Co-authored-by: theEvilReaper <[email protected]>
1 parent 013f33b commit 4d3ff9e

File tree

6 files changed

+43
-30
lines changed

6 files changed

+43
-30
lines changed

build.gradle.kts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ subprojects {
44

55
tasks {
66
getByName<JavaCompile>("compileJava") {
7-
options.release.set(21)
7+
options.release.set(24)
88
options.encoding = "UTF-8"
99
}
1010
getByName<JacocoReport>("jacocoTestReport") {
@@ -21,5 +21,11 @@ subprojects {
2121
events("passed", "skipped", "failed")
2222
}
2323
}
24+
25+
configure<JavaPluginExtension> {
26+
toolchain {
27+
languageVersion.set(JavaLanguageVersion.of(24))
28+
}
29+
}
2430
}
2531
}

common/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ plugins {
55
group = "net.onelitefeather.cygnus"
66
version = "1.0.1"
77

8-
java {
9-
toolchain {
10-
languageVersion.set(JavaLanguageVersion.of(21))
11-
}
12-
}
13-
148
dependencies {
159
implementation(platform(libs.mycelium.bom))
1610
implementation(platform(libs.aonyx.bom))

game/build.gradle.kts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ application {
1212
mainClass.set("net.onelitefeather.cygnus.CygnusLoader")
1313
}
1414

15-
java {
16-
toolchain {
17-
languageVersion.set(JavaLanguageVersion.of(21))
18-
}
19-
}
20-
2115
dependencies {
2216
implementation(platform(libs.mycelium.bom))
2317
implementation(platform(libs.aonyx.bom))
@@ -27,6 +21,10 @@ dependencies {
2721
implementation(libs.xerus)
2822
// implementation(libs.canis)
2923

24+
//CloudNet
25+
implementation(platform(libs.cloudnet.bom))
26+
implementation(libs.bundles.cloudnet)
27+
3028
testImplementation(libs.minestom)
3129
testImplementation(libs.adventure)
3230
testImplementation(libs.cyano)
@@ -39,11 +37,6 @@ dependencies {
3937
}
4038

4139
tasks {
42-
compileJava {
43-
options.encoding = "UTF-8"
44-
options.release.set(21)
45-
}
46-
4740
jacocoTestReport {
4841
dependsOn(test)
4942
reports {
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package net.onelitefeather.cygnus;
22

3+
import dev.derklaro.aerogel.Injector;
4+
import eu.cloudnetservice.driver.inject.InjectionLayer;
5+
import eu.cloudnetservice.modules.bridge.impl.platform.minestom.MinestomBridgeExtension;
36
import net.minestom.server.MinecraftServer;
47

58
public final class CygnusLoader {
69

710
public static void main(String[] args) {
811
MinecraftServer server = MinecraftServer.init();
912
new Cygnus();
13+
try (InjectionLayer<Injector> layer = InjectionLayer.ext()) {
14+
layer.instance(MinestomBridgeExtension.class).onLoad();
15+
}
1016
server.start("0.0.0.0", 25565);
1117
}
1218
}

settings.gradle.kts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ dependencyResolutionManagement {
1111
repositories {
1212
mavenCentral()
1313
maven("https://reposilite.atlasengine.ca/public")
14+
maven("https://central.sonatype.com/repository/maven-snapshots/")
15+
maven("https://repository.derklaro.dev/snapshots/")
1416
maven {
1517
name = "OneLiteFeatherRepository"
1618
url = uri("https://repo.onelitefeather.dev/onelitefeather")
@@ -34,6 +36,7 @@ dependencyResolutionManagement {
3436
version("agones4j", "2.0.2")
3537
version("grpc", "1.68.0")
3638
version("tomcat-annotations-api", "6.0.53")
39+
version("cloudnet", "4.0.0-RC15-SNAPSHOT")
3740

3841
version("bom", "1.4.4")
3942
version("aonyx", "0.5.2")
@@ -61,10 +64,32 @@ dependencyResolutionManagement {
6164
library("grpc.protobuf", "io.grpc", "grpc-protobuf").versionRef("grpc")
6265
library("grpc.netty", "io.grpc", "grpc-netty").versionRef("grpc")
6366
library("grpc.okhttp", "io.grpc", "grpc-okhttp").versionRef("grpc")
64-
library("tomcat-annotations-api", "org.apache.tomcat", "annotations-api").versionRef("tomcat-annotations-api")
67+
library(
68+
"tomcat-annotations-api",
69+
"org.apache.tomcat",
70+
"annotations-api"
71+
).versionRef("tomcat-annotations-api")
72+
73+
library("cloudnet-bom", "eu.cloudnetservice.cloudnet", "bom").versionRef("cloudnet")
74+
library("cloudnet-bridge", "eu.cloudnetservice.cloudnet", "bridge-api").withoutVersion()
75+
library("cloudnet-bridge-impl", "eu.cloudnetservice.cloudnet", "bridge-impl").withoutVersion()
76+
library("cloudnet-driver-impl", "eu.cloudnetservice.cloudnet", "driver-impl").withoutVersion()
77+
library("cloudnet-platform-inject", "eu.cloudnetservice.cloudnet", "platform-inject-api").withoutVersion()
78+
library("cloudnet-jvm-wrapper", "eu.cloudnetservice.cloudnet", "wrapper-jvm-api").withoutVersion()
6579

6680
plugin("shadow", "com.gradleup.shadow").versionRef("shadow")
6781
plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
82+
83+
bundle(
84+
"cloudnet",
85+
listOf(
86+
"cloudnet-bridge",
87+
"cloudnet-bridge-impl",
88+
"cloudnet-driver-impl",
89+
"cloudnet-platform-inject",
90+
"cloudnet-jvm-wrapper"
91+
)
92+
)
6893
}
6994
}
7095
}

setup/build.gradle.kts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ plugins {
1010
group = "net.onelitefeather"
1111
version = "1.0.1"
1212

13-
java {
14-
toolchain {
15-
languageVersion.set(JavaLanguageVersion.of(21))
16-
}
17-
}
18-
1913
application {
2014
mainClass.set("net.onelitefeather.cygnus.setup.SetupLoader")
2115
}
@@ -40,11 +34,6 @@ dependencies {
4034
testRuntimeOnly(libs.junit.engine)
4135
}
4236
tasks {
43-
compileJava {
44-
options.encoding = "UTF-8"
45-
options.release.set(21)
46-
}
47-
4837
jacocoTestReport {
4938
dependsOn(test)
5039
reports {

0 commit comments

Comments
 (0)