Skip to content

Commit a06ef2e

Browse files
committed
Update dependencies and Gradle
1 parent c30bc7a commit a06ef2e

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "dev.plex"
8-
version = "1.5"
8+
version = "1.6"
99
description = "Module-HTTPD"
1010

1111
repositories {
@@ -30,21 +30,21 @@ repositories {
3030
}
3131

3232
dependencies {
33-
implementation("org.projectlombok:lombok:1.18.38")
34-
annotationProcessor("org.projectlombok:lombok:1.18.38")
35-
implementation("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
36-
implementation("dev.plex:server:1.5")
33+
implementation("org.projectlombok:lombok:1.18.42")
34+
annotationProcessor("org.projectlombok:lombok:1.18.42")
35+
implementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT")
36+
implementation("dev.plex:server:1.6")
3737
implementation("org.json:json:20250517")
3838
implementation("org.reflections:reflections:0.10.2")
39-
implementation("org.eclipse.jetty:jetty-server:12.0.14")
40-
implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.14")
41-
implementation("org.eclipse.jetty:jetty-proxy:12.0.14")
39+
implementation("org.eclipse.jetty:jetty-server:12.1.3")
40+
implementation("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.3")
41+
implementation("org.eclipse.jetty:jetty-proxy:12.1.3")
4242
implementation("com.github.MilkBowl:VaultAPI:1.7.1") {
4343
exclude("org.bukkit", "bukkit")
4444
}
45-
implementation(platform("com.intellectualsites.bom:bom-newest:1.52")) // Ref: https://github.com/IntellectualSites/bom
45+
implementation(platform("com.intellectualsites.bom:bom-newest:1.55")) // Ref: https://github.com/IntellectualSites/bom
4646
compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core")
47-
implementation("commons-io:commons-io:2.19.0")
47+
implementation("commons-io:commons-io:2.20.0")
4848
}
4949

5050
tasks.getByName<Jar>("jar") {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/java/dev/plex/HTTPDModule.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public void disable()
134134
private boolean setupPermissions()
135135
{
136136
RegisteredServiceProvider<Permission> rsp = Bukkit.getServicesManager().getRegistration(Permission.class);
137-
permissions = rsp.getProvider();
137+
if (rsp != null) {
138+
permissions = rsp.getProvider();
139+
}
138140
return permissions != null;
139141
}
140142

src/main/java/dev/plex/logging/Log.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package dev.plex.logging;
22

33
import dev.plex.HTTPDModule;
4+
import net.kyori.adventure.text.Component;
5+
import net.kyori.adventure.text.format.NamedTextColor;
46
import org.bukkit.Bukkit;
57
import org.bukkit.ChatColor;
68

@@ -18,7 +20,7 @@ public static void log(String message, Object... strings)
1820

1921
if (HTTPDModule.moduleConfig.getBoolean("server.logging"))
2022
{
21-
Bukkit.getConsoleSender().sendMessage(String.format(ChatColor.DARK_AQUA + "[Plex HTTPD] " + ChatColor.GRAY + "%s", message));
23+
Bukkit.getConsoleSender().sendMessage(Component.text("[Plex HTTPD] ").color(NamedTextColor.DARK_AQUA).append(Component.text(message).color(NamedTextColor.GRAY)));
2224
}
2325
}
2426
}

src/main/java/dev/plex/request/impl/SchematicDownloadEndpoint.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ private String schematicHTML()
8383
String fixedPath = worldeditFile.getPath().replace("plugins/FastAsyncWorldEdit/schematics/", "");
8484
fixedPath = fixedPath.replace("plugins/WorldEdit/schematics/", "");
8585
String sanitizedName = fixedPath.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
86-
sb.append(" <tr>\n" +
87-
" <th scope=\"row\">\n <a href=\"" + fixedPath + "\" download>" + sanitizedName + "</a>\n </th>\n" +
88-
" <td>\n " + formattedSize(worldeditFile.length()) + "\n </td>\n" +
89-
" </tr>\n");
86+
sb.append(" <tr>\n" + " <th scope=\"row\">\n <a href=\"").append(fixedPath).append("\" download>")
87+
.append(sanitizedName).append("</a>\n </th>\n").append(" <td>\n ")
88+
.append(formattedSize(worldeditFile.length())).append("\n </td>\n").append(" </tr>\n");
9089
}
9190
file = file.replace("${schematics}", sb.toString());
9291
files.clear();

src/main/resources/module.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: Module-HTTPD
2-
version: 1.5
2+
version: 1.6
33
description: HTTPD server for Plex
44
main: dev.plex.HTTPDModule

0 commit comments

Comments
 (0)