diff --git a/build.gradle b/build.gradle index 52b5c47..7eb3fd4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "maven-publish" - id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.github.johnrengelman.shadow" version "8.1.0" } group = "dev.plex" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c7205e..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..fc10b60 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-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 300b134..8fd252b 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -7,7 +7,7 @@ version = rootProject.version description = "Plex-Velocity" repositories { - maven { url = uri("https://papermc.io/repo/repository/maven-public/") } + maven { url = uri("https://repo.papermc.io/repository/maven-public/") } } tasks.getByName("jar") { @@ -37,9 +37,9 @@ publishing { } dependencies { - compileOnly("org.projectlombok:lombok:1.18.24") - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.json:json:20220924") + compileOnly("org.projectlombok:lombok:1.18.26") + annotationProcessor("org.projectlombok:lombok:1.18.26") + compileOnly("org.json:json:20230227") compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT") } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 0f5a139..636c6fc 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,33 +1,33 @@ plugins { - id "net.minecrell.plugin-yml.bukkit" version "0.5.2" + id "net.minecrell.plugin-yml.bukkit" version "0.5.3" } dependencies { - library "org.projectlombok:lombok:1.18.24" - annotationProcessor "org.projectlombok:lombok:1.18.24" - library "org.json:json:20220924" + library "org.projectlombok:lombok:1.18.26" + annotationProcessor "org.projectlombok:lombok:1.18.26" + library "org.json:json:20230227" library "commons-io:commons-io:2.11.0" - library "dev.morphia.morphia:morphia-core:2.2.10" + library "dev.morphia.morphia:morphia-core:2.3.0" library "redis.clients:jedis:4.3.1" - library "org.mariadb.jdbc:mariadb-java-client:3.1.0" + library "org.mariadb.jdbc:mariadb-java-client:3.1.2" library "com.zaxxer:HikariCP:5.0.1" - library "org.apache.httpcomponents.client5:httpclient5:5.2" + library "org.apache.httpcomponents.client5:httpclient5:5.2.1" library "org.apache.commons:commons-lang3:3.12.0" - library "org.apache.maven.resolver:maven-resolver-api:1.9.1" - library "org.apache.maven.resolver:maven-resolver-impl:1.9.1" - library "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.1" - library "org.apache.maven.resolver:maven-resolver-transport-http:1.9.1" - library "org.apache.maven:maven-resolver-provider:3.8.5" - library "org.eclipse.jetty:jetty-server:11.0.12" - library "org.eclipse.jetty:jetty-servlet:11.0.12" - library "org.eclipse.jetty:jetty-proxy:11.0.12" - library "com.google.code.gson:gson:2.10" - compileOnly "io.papermc.paper:paper-api:1.19.2-R0.1-SNAPSHOT" + library "org.apache.maven.resolver:maven-resolver-api:1.9.5" + library "org.apache.maven.resolver:maven-resolver-impl:1.9.5" + library "org.apache.maven.resolver:maven-resolver-connector-basic:1.9.5" + library "org.apache.maven.resolver:maven-resolver-transport-http:1.9.5" + library "org.apache.maven:maven-resolver-provider:3.9.0" + library "org.eclipse.jetty:jetty-server:11.0.14" + library "org.eclipse.jetty:jetty-servlet:11.0.14" + library "org.eclipse.jetty:jetty-proxy:11.0.14" + library "com.google.code.gson:gson:2.10.1" + compileOnly "io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT" compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") { exclude group: "org.bukkit", module: "bukkit" } - implementation "org.bstats:bstats-base:3.0.0" - implementation "org.bstats:bstats-bukkit:3.0.0" + implementation "org.bstats:bstats-base:3.0.1" + implementation "org.bstats:bstats-bukkit:3.0.1" } group = rootProject.group diff --git a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java index 5b2e8d2..adea435 100644 --- a/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java +++ b/server/src/main/java/dev/plex/storage/player/MongoPlayerData.java @@ -3,8 +3,8 @@ package dev.plex.storage.player; import dev.morphia.Datastore; import dev.morphia.query.Query; import dev.morphia.query.Update; -import dev.morphia.query.experimental.filters.Filters; -import dev.morphia.query.experimental.updates.UpdateOperators; +import dev.morphia.query.filters.Filters; +import dev.morphia.query.updates.UpdateOperators; import dev.plex.Plex; import dev.plex.player.PlexPlayer; import java.util.Collections; @@ -111,19 +111,18 @@ public class MongoPlayerData Query filter = datastore.find(PlexPlayer.class) .filter(Filters.eq("uuid", player.getUuid())); - Update updateOps = filter - .update( - UpdateOperators.set("name", player.getName()), - UpdateOperators.set("loginMessage", player.getLoginMessage()), - UpdateOperators.set("prefix", player.getPrefix()), - UpdateOperators.set("vanished", player.isVanished()), - UpdateOperators.set("commandSpy", player.isCommandSpy()), - UpdateOperators.set("adminActive", player.isAdminActive()), - UpdateOperators.set("rank", player.getRank().toLowerCase()), - UpdateOperators.set("ips", player.getIps()), - UpdateOperators.set("coins", player.getCoins()), - UpdateOperators.set("punishments", player.getPunishments()), - UpdateOperators.set("notes", player.getNotes())); + Update updateOps = filter.update( + UpdateOperators.set("name", player.getName()), + UpdateOperators.set("loginMessage", player.getLoginMessage()), + UpdateOperators.set("prefix", player.getPrefix()), + UpdateOperators.set("vanished", player.isVanished()), + UpdateOperators.set("commandSpy", player.isCommandSpy()), + UpdateOperators.set("adminActive", player.isAdminActive()), + UpdateOperators.set("rank", player.getRank().toLowerCase()), + UpdateOperators.set("ips", player.getIps()), + UpdateOperators.set("coins", player.getCoins()), + UpdateOperators.set("punishments", player.getPunishments()), + UpdateOperators.set("notes", player.getNotes())); updateOps.execute(); }