diff --git a/build.gradle.kts b/build.gradle.kts index 09229ed..4652e55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "dev.plex" -version = "1.5" +version = "1.6" description = "Module-HTTPD" repositories { @@ -30,21 +30,21 @@ repositories { } dependencies { - implementation("org.projectlombok:lombok:1.18.38") - annotationProcessor("org.projectlombok:lombok:1.18.38") - implementation("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT") - implementation("dev.plex:server:1.5") + implementation("org.projectlombok:lombok:1.18.42") + annotationProcessor("org.projectlombok:lombok:1.18.42") + implementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + implementation("dev.plex:server:1.6") implementation("org.json:json:20250517") implementation("org.reflections:reflections:0.10.2") - implementation("org.eclipse.jetty:jetty-server:12.0.14") - implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.14") - implementation("org.eclipse.jetty:jetty-proxy:12.0.14") + implementation("org.eclipse.jetty:jetty-server:12.1.3") + implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.3") + implementation("org.eclipse.jetty:jetty-proxy:12.1.3") implementation("com.github.MilkBowl:VaultAPI:1.7.1") { exclude("org.bukkit", "bukkit") } - implementation(platform("com.intellectualsites.bom:bom-newest:1.52")) // Ref: https://github.com/IntellectualSites/bom + implementation(platform("com.intellectualsites.bom:bom-newest:1.55")) // Ref: https://github.com/IntellectualSites/bom compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") - implementation("commons-io:commons-io:2.19.0") + implementation("commons-io:commons-io:2.20.0") } tasks.getByName("jar") { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d4081da..bad7c24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/dev/plex/HTTPDModule.java b/src/main/java/dev/plex/HTTPDModule.java index ba20cb4..8707d01 100644 --- a/src/main/java/dev/plex/HTTPDModule.java +++ b/src/main/java/dev/plex/HTTPDModule.java @@ -134,7 +134,9 @@ public class HTTPDModule extends PlexModule private boolean setupPermissions() { RegisteredServiceProvider rsp = Bukkit.getServicesManager().getRegistration(Permission.class); - permissions = rsp.getProvider(); + if (rsp != null) { + permissions = rsp.getProvider(); + } return permissions != null; } diff --git a/src/main/java/dev/plex/logging/Log.java b/src/main/java/dev/plex/logging/Log.java index 7579fa0..2dcd972 100644 --- a/src/main/java/dev/plex/logging/Log.java +++ b/src/main/java/dev/plex/logging/Log.java @@ -1,6 +1,8 @@ package dev.plex.logging; import dev.plex.HTTPDModule; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -18,7 +20,7 @@ public class Log if (HTTPDModule.moduleConfig.getBoolean("server.logging")) { - Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.DARK_AQUA + "[Plex HTTPD] " + ChatColor.GRAY + "%s", message)); + Bukkit.getConsoleSender().sendMessage(Component.text("[Plex HTTPD] ").color(NamedTextColor.DARK_AQUA).append(Component.text(message).color(NamedTextColor.GRAY))); } } } diff --git a/src/main/java/dev/plex/request/impl/SchematicDownloadEndpoint.java b/src/main/java/dev/plex/request/impl/SchematicDownloadEndpoint.java index cce777d..9ce5b4d 100644 --- a/src/main/java/dev/plex/request/impl/SchematicDownloadEndpoint.java +++ b/src/main/java/dev/plex/request/impl/SchematicDownloadEndpoint.java @@ -83,10 +83,9 @@ public class SchematicDownloadEndpoint extends AbstractServlet String fixedPath = worldeditFile.getPath().replace("plugins/FastAsyncWorldEdit/schematics/", ""); fixedPath = fixedPath.replace("plugins/WorldEdit/schematics/", ""); String sanitizedName = fixedPath.replaceAll("<", "<").replaceAll(">", ">"); - sb.append(" \n" + - " \n " + sanitizedName + "\n \n" + - " \n " + formattedSize(worldeditFile.length()) + "\n \n" + - " \n"); + sb.append(" \n" + " \n ") + .append(sanitizedName).append("\n \n").append(" \n ") + .append(formattedSize(worldeditFile.length())).append("\n \n").append(" \n"); } file = file.replace("${schematics}", sb.toString()); files.clear(); diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml index 0b2ee25..f6e0330 100644 --- a/src/main/resources/module.yml +++ b/src/main/resources/module.yml @@ -1,4 +1,4 @@ name: Module-HTTPD -version: 1.5 +version: 1.6 description: HTTPD server for Plex main: dev.plex.HTTPDModule \ No newline at end of file