Update dependencies and Gradle

This commit is contained in:
Focusvity
2025-11-05 19:52:08 +11:00
parent c30bc7affd
commit a06ef2ecd6
6 changed files with 21 additions and 18 deletions
+10 -10
View File
@@ -5,7 +5,7 @@ plugins {
} }
group = "dev.plex" group = "dev.plex"
version = "1.5" version = "1.6"
description = "Module-HTTPD" description = "Module-HTTPD"
repositories { repositories {
@@ -30,21 +30,21 @@ repositories {
} }
dependencies { dependencies {
implementation("org.projectlombok:lombok:1.18.38") implementation("org.projectlombok:lombok:1.18.42")
annotationProcessor("org.projectlombok:lombok:1.18.38") annotationProcessor("org.projectlombok:lombok:1.18.42")
implementation("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT") implementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
implementation("dev.plex:server:1.5") implementation("dev.plex:server:1.6")
implementation("org.json:json:20250517") implementation("org.json:json:20250517")
implementation("org.reflections:reflections:0.10.2") implementation("org.reflections:reflections:0.10.2")
implementation("org.eclipse.jetty:jetty-server:12.0.14") implementation("org.eclipse.jetty:jetty-server:12.1.3")
implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.14") implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.3")
implementation("org.eclipse.jetty:jetty-proxy:12.0.14") implementation("org.eclipse.jetty:jetty-proxy:12.1.3")
implementation("com.github.MilkBowl:VaultAPI:1.7.1") { implementation("com.github.MilkBowl:VaultAPI:1.7.1") {
exclude("org.bukkit", "bukkit") 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") compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
implementation("commons-io:commons-io:2.19.0") implementation("commons-io:commons-io:2.20.0")
} }
tasks.getByName<Jar>("jar") { tasks.getByName<Jar>("jar") {
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+3 -1
View File
@@ -134,7 +134,9 @@ public class HTTPDModule extends PlexModule
private boolean setupPermissions() private boolean setupPermissions()
{ {
RegisteredServiceProvider<Permission> rsp = Bukkit.getServicesManager().getRegistration(Permission.class); RegisteredServiceProvider<Permission> rsp = Bukkit.getServicesManager().getRegistration(Permission.class);
permissions = rsp.getProvider(); if (rsp != null) {
permissions = rsp.getProvider();
}
return permissions != null; return permissions != null;
} }
+3 -1
View File
@@ -1,6 +1,8 @@
package dev.plex.logging; package dev.plex.logging;
import dev.plex.HTTPDModule; import dev.plex.HTTPDModule;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@@ -18,7 +20,7 @@ public class Log
if (HTTPDModule.moduleConfig.getBoolean("server.logging")) 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)));
} }
} }
} }
@@ -83,10 +83,9 @@ public class SchematicDownloadEndpoint extends AbstractServlet
String fixedPath = worldeditFile.getPath().replace("plugins/FastAsyncWorldEdit/schematics/", ""); String fixedPath = worldeditFile.getPath().replace("plugins/FastAsyncWorldEdit/schematics/", "");
fixedPath = fixedPath.replace("plugins/WorldEdit/schematics/", ""); fixedPath = fixedPath.replace("plugins/WorldEdit/schematics/", "");
String sanitizedName = fixedPath.replaceAll("<", "&lt;").replaceAll(">", "&gt;"); String sanitizedName = fixedPath.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
sb.append(" <tr>\n" + sb.append(" <tr>\n" + " <th scope=\"row\">\n <a href=\"").append(fixedPath).append("\" download>")
" <th scope=\"row\">\n <a href=\"" + fixedPath + "\" download>" + sanitizedName + "</a>\n </th>\n" + .append(sanitizedName).append("</a>\n </th>\n").append(" <td>\n ")
" <td>\n " + formattedSize(worldeditFile.length()) + "\n </td>\n" + .append(formattedSize(worldeditFile.length())).append("\n </td>\n").append(" </tr>\n");
" </tr>\n");
} }
file = file.replace("${schematics}", sb.toString()); file = file.replace("${schematics}", sb.toString());
files.clear(); files.clear();
+1 -1
View File
@@ -1,4 +1,4 @@
name: Module-HTTPD name: Module-HTTPD
version: 1.5 version: 1.6
description: HTTPD server for Plex description: HTTPD server for Plex
main: dev.plex.HTTPDModule main: dev.plex.HTTPDModule