Skip to content
Draft
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.gradle.kotlin.dsl.withType
/**
* Java version compatibility to apply to all api projects.
*/
val JAVA_API_COMPATIBILITY = JavaLanguageVersion.of(17)
val JAVA_API_COMPATIBILITY = JavaLanguageVersion.of(21)

class CloudNetJavaApiPlugin : Plugin<Project> {
override fun apply(project: Project) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package eu.cloudnetservice.ext.adventure;

import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextFormat;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -66,7 +66,6 @@ void testFindCharByFormat() {
Assertions.assertEquals('k', AdventureTextFormatLookup.findFormatChar(TextDecoration.OBFUSCATED));
Assertions.assertEquals('m', AdventureTextFormatLookup.findFormatChar(TextDecoration.STRIKETHROUGH));

Assertions.assertNull(AdventureTextFormatLookup.findFormatChar(new TextFormat() {
}));
Assertions.assertNull(AdventureTextFormatLookup.findFormatChar(TextColor.color(0x123456)));
}
}
30 changes: 15 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]

# plugins
indra = "4.0.0"
shadow = "9.3.1"
indra = "4.1.0"
shadow = "9.6.1"
juppiter = "0.5.0-beta.2"
spotless = "8.9.0"
nexusPublish = "2.0.0"
Expand All @@ -13,16 +13,16 @@ gson = "2.14.0"
guava = "33.6.0-jre"

# testing
junit = "6.0.3"
mockito = "5.21.0"
junit = "6.1.3"
mockito = "5.23.0"
testcontainers = "2.0.5"

# compile time processing
lombok = "1.18.46"
javapoet = "1.13.0"

# console
jline = "3.30.16"
jline = "4.3.1"
cloud = "2.0.0-cn1"
cloudApi = "2.0.0"
stringSimilarity = "2.0.0"
Expand All @@ -31,45 +31,45 @@ cloudConfirmation = "1.0.0-rc.1"
# databases
h2 = "1.4.197" # do not update, leads to database incompatibility
xodus = "2.0.1"
mongodb = "5.6.5"
hikariCp = "7.0.2"
mysqlConnector = "9.7.0"
mongodb = "5.9.2"
hikariCp = "7.1.0"
mysqlConnector = "26.7.0"

# general
oshi = "7.4.4"
gulf = "0.0.1"
vavr = "1.0.1"
sshj = "0.40.0"
aerogel = "3.1.0"
awsSdk = "2.41.11"
unirest = "4.7.4"
awsSdk = "2.52.1"
unirest = "4.10.1"
caffeine = "3.2.4"
reflexion = "2.0.0"
geantyref = "2.0.1"
dockerJava = "3.7.1"
nightConfig = "3.8.4"
nightConfig = "3.9.0"
annotations = "26.1.0"
influxClient = "7.4.0"
netty = "2025.11.08-3a259e91"

# logging
slf4j = "2.0.18"
logback = "1.5.32"
logback = "1.6.2"

# platform api versions
sponge = "9.0.0"
velocity = "3.5.1"
velocity = "4.0.0"
waterdogpe = "1.2.4"
nukkitX = "1.0-SNAPSHOT"
minestom = "2026.08.07-26.2"
minestomExtensions = "1.2.0"
spigot = "1.8.8-R0.1-SNAPSHOT"
bungeecord = "26.1-R0.1-SNAPSHOT"
limboloohp = "0.7.9-ALPHA"
folia = "1.21.11-R0.1-SNAPSHOT"
folia = "26.1.2.build.8-stable"

# platform extensions
adventure = "4.26.1"
adventure = "5.2.0"
modlauncher = "8.1.3"
npcLib = "3.0.0-beta.17"
packetEvents = "2.13.0"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 12 additions & 23 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/bridge/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ tasks.withType<JavaCompile> {

val zipFileName = "cloudnet_fabric_version_bridge_all.zip"
val downloadUrl = "https://github.com/CloudNetService/cloudnet-bridge-fabric/releases/latest/download/$zipFileName"
val includeNestedModJars by tasks.registering(IncludeNestedModJarsTask::class) {
val includeNestedModJars = tasks.register<IncludeNestedModJarsTask>("includeNestedModJars") {
dependsOn(tasks.compileJava)

nestedZipDownloadUrl.set(downloadUrl)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,27 @@ public VelocityBridgePlugin(

@Override
public void onLoad() {
// init the bridge management
this.bridgeManagement.registerServices(this.serviceRegistry);
this.bridgeManagement.postInit();
// register the player listeners

this.proxy.getEventManager().register(this.pluginInstance, this.playerListener);
// register the cloud command
this.proxy.getCommandManager().register("cloudnet", this.cloudCommand, "cloud");

var cloudCommandMeta = this.proxy.getCommandManager()
.metaBuilder("cloud")
.aliases("cloudnet")
.build();
this.proxy.getCommandManager().register(cloudCommandMeta, this.cloudCommand);

// register the hub command if requested
if (!this.bridgeManagement.configuration().hubCommandNames().isEmpty()) {
// convert to an array for easier access
var names = this.bridgeManagement.configuration().hubCommandNames().toArray(new String[0]);
// register the command
var hubCommandMeta = this.proxy.getCommandManager()
.metaBuilder(names[0])
.aliases(names.length > 1 ? Arrays.copyOfRange(names, 1, names.length) : new String[0])
.build();
this.proxy.getCommandManager().register(
names[0],
new VelocityHubCommand(this.proxy, this.bridgeManagement),
names.length > 1 ? Arrays.copyOfRange(names, 1, names.length) : new String[0]);
hubCommandMeta,
new VelocityHubCommand(this.proxy, this.bridgeManagement));
}
}

Expand Down
6 changes: 2 additions & 4 deletions modules/npcs/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ tasks.shadowJar.configure {
relocate("com.github.retrooper", "eu.cloudnetservice.modules.npc.relocate.com.packetevents")
relocate("com.github.juliarn.npclib", "eu.cloudnetservice.modules.npc.relocate.com.github.juliarn.npclib")

dependencies {
exclude("plugin.yml")
exclude("META-INF/**", "**/*.html", "module-info.*")
}
exclude("plugin.yml")
exclude("META-INF/**", "**/*.html", "module-info.*")

manifest {
attributes["paperweight-mappings-namespace"] = "mojang"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ public void prompt(@NonNull String prompt) {

@Override
public int width() {
return this.terminal.getWidth();
return this.terminal.getColumns();
}

@Override
Expand Down
Loading