Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ subprojects {

tasks {
getByName<JavaCompile>("compileJava") {
options.release.set(21)
options.release.set(24)
options.encoding = "UTF-8"
}
getByName<JacocoReport>("jacocoTestReport") {
Expand All @@ -21,5 +21,11 @@ subprojects {
events("passed", "skipped", "failed")
}
}

configure<JavaPluginExtension> {
toolchain {
languageVersion.set(JavaLanguageVersion.of(24))
}
}
}
}
6 changes: 0 additions & 6 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
15 changes: 4 additions & 11 deletions game/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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)
Expand All @@ -39,11 +37,6 @@ dependencies {
}

tasks {
compileJava {
options.encoding = "UTF-8"
options.release.set(21)
}

jacocoTestReport {
dependsOn(test)
reports {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
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 {

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);
}
}
27 changes: 26 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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"
)
)
}
}
}
Expand Down
11 changes: 0 additions & 11 deletions setup/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand All @@ -40,11 +34,6 @@ dependencies {
testRuntimeOnly(libs.junit.engine)
}
tasks {
compileJava {
options.encoding = "UTF-8"
options.release.set(21)
}

jacocoTestReport {
dependsOn(test)
reports {
Expand Down
Loading