From 7d2c44975d79d4ca10ba28c9b83960c5d64733d3 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 8 Jun 2022 14:37:16 -0500 Subject: [PATCH 1/5] Update for 1.19 --- api/build.gradle | 2 +- build.gradle | 1 + server/build.gradle | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index e678f6e..b840e70 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -27,6 +27,6 @@ publishing { dependencies { compileOnly "org.projectlombok:lombok:1.18.24" annotationProcessor "org.projectlombok:lombok:1.18.24" - compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT" + compileOnly "io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT" compileOnly "org.json:json:20220320" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index a09c085..3086bfe 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ subprojects { } mavenCentral() + mavenLocal() } java { diff --git a/server/build.gradle b/server/build.gradle index 12a11f3..23cf77b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -22,7 +22,7 @@ dependencies { library "org.eclipse.jetty:jetty-servlet:11.0.9" library "org.eclipse.jetty:jetty-proxy:11.0.9" library "com.google.code.gson:gson:2.9.0" - compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT" + compileOnly "io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT" compileOnly("com.github.MilkBowl:VaultAPI:1.7") { exclude group: "org.bukkit", module: "bukkit" } From a1c009909db0fcd5e705daca45461b8ff01f0381 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 8 Jun 2022 15:09:42 -0500 Subject: [PATCH 2/5] Lang to lang3 --- server/src/main/java/dev/plex/command/impl/AdminCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/AdminChatCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/BanCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/KickCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/PlexCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/RawSayCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/SayCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/SmiteCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/TagCMD.java | 2 +- server/src/main/java/dev/plex/command/impl/TempbanCMD.java | 2 +- .../src/main/java/dev/plex/listener/impl/CommandListener.java | 2 +- server/src/main/java/dev/plex/util/GameRuleUtil.java | 2 +- server/src/main/java/dev/plex/util/TimeUtils.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/src/main/java/dev/plex/command/impl/AdminCMD.java b/server/src/main/java/dev/plex/command/impl/AdminCMD.java index 5a83549..a7588ff 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminCMD.java @@ -18,7 +18,7 @@ import dev.plex.util.PlexUtils; import java.util.Arrays; import java.util.List; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java index 88c9767..cd7434d 100644 --- a/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java +++ b/server/src/main/java/dev/plex/command/impl/AdminChatCMD.java @@ -8,7 +8,7 @@ import dev.plex.player.PlexPlayer; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/command/impl/BanCMD.java b/server/src/main/java/dev/plex/command/impl/BanCMD.java index 0cbd629..04f0c3f 100644 --- a/server/src/main/java/dev/plex/command/impl/BanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/BanCMD.java @@ -22,7 +22,7 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.UUID; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java b/server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java index 34588c4..78aceee 100644 --- a/server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java +++ b/server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java @@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/dev/plex/command/impl/KickCMD.java b/server/src/main/java/dev/plex/command/impl/KickCMD.java index 6953a18..431c233 100644 --- a/server/src/main/java/dev/plex/command/impl/KickCMD.java +++ b/server/src/main/java/dev/plex/command/impl/KickCMD.java @@ -18,7 +18,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.UUID; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/command/impl/PlexCMD.java b/server/src/main/java/dev/plex/command/impl/PlexCMD.java index 4cc7a5b..c0aea76 100644 --- a/server/src/main/java/dev/plex/command/impl/PlexCMD.java +++ b/server/src/main/java/dev/plex/command/impl/PlexCMD.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/server/src/main/java/dev/plex/command/impl/RawSayCMD.java b/server/src/main/java/dev/plex/command/impl/RawSayCMD.java index d942fc9..5d356be 100644 --- a/server/src/main/java/dev/plex/command/impl/RawSayCMD.java +++ b/server/src/main/java/dev/plex/command/impl/RawSayCMD.java @@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/dev/plex/command/impl/SayCMD.java b/server/src/main/java/dev/plex/command/impl/SayCMD.java index ac9509b..29a1573 100644 --- a/server/src/main/java/dev/plex/command/impl/SayCMD.java +++ b/server/src/main/java/dev/plex/command/impl/SayCMD.java @@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource; import dev.plex.rank.enums.Rank; import dev.plex.util.PlexUtils; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/dev/plex/command/impl/SmiteCMD.java b/server/src/main/java/dev/plex/command/impl/SmiteCMD.java index 38dfc20..dc3ce8d 100644 --- a/server/src/main/java/dev/plex/command/impl/SmiteCMD.java +++ b/server/src/main/java/dev/plex/command/impl/SmiteCMD.java @@ -17,7 +17,7 @@ import java.util.List; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.title.Title; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ArrayUtils; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/server/src/main/java/dev/plex/command/impl/TagCMD.java b/server/src/main/java/dev/plex/command/impl/TagCMD.java index 5f70123..14237a3 100644 --- a/server/src/main/java/dev/plex/command/impl/TagCMD.java +++ b/server/src/main/java/dev/plex/command/impl/TagCMD.java @@ -11,7 +11,7 @@ import dev.plex.util.minimessage.SafeMiniMessage; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java index dc923df..bf099db 100644 --- a/server/src/main/java/dev/plex/command/impl/TempbanCMD.java +++ b/server/src/main/java/dev/plex/command/impl/TempbanCMD.java @@ -18,7 +18,7 @@ import dev.plex.util.WebUtils; import java.util.List; import java.util.UUID; import net.kyori.adventure.text.Component; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/listener/impl/CommandListener.java b/server/src/main/java/dev/plex/listener/impl/CommandListener.java index 905fb87..156115a 100644 --- a/server/src/main/java/dev/plex/listener/impl/CommandListener.java +++ b/server/src/main/java/dev/plex/listener/impl/CommandListener.java @@ -11,7 +11,7 @@ import java.util.Locale; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/server/src/main/java/dev/plex/util/GameRuleUtil.java b/server/src/main/java/dev/plex/util/GameRuleUtil.java index 40a6bbb..5b20d15 100644 --- a/server/src/main/java/dev/plex/util/GameRuleUtil.java +++ b/server/src/main/java/dev/plex/util/GameRuleUtil.java @@ -2,7 +2,7 @@ package dev.plex.util; import dev.plex.Plex; import java.util.Locale; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.bukkit.GameRule; import org.bukkit.World; diff --git a/server/src/main/java/dev/plex/util/TimeUtils.java b/server/src/main/java/dev/plex/util/TimeUtils.java index 1eb2490..1d538bb 100644 --- a/server/src/main/java/dev/plex/util/TimeUtils.java +++ b/server/src/main/java/dev/plex/util/TimeUtils.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.TimeZone; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; public class TimeUtils { From 4aa3ae7c50e11f4ecf49f0fba5a3b6f82d0759d5 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Wed, 8 Jun 2022 17:20:44 -0500 Subject: [PATCH 3/5] Update Blossom (cherry picked from commit 08e2f31eae5436ef572acfd80171537d7d4942f3) --- proxy/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/build.gradle.kts b/proxy/build.gradle.kts index 68bd339..1af8ab8 100644 --- a/proxy/build.gradle.kts +++ b/proxy/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("net.kyori.blossom") version "1.2.0" + id("net.kyori.blossom") version "1.3.0" } group = rootProject.group From f1ebbc36643bb2efe3b506f8cc0185d8431b0711 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Thu, 9 Jun 2022 21:12:19 -0500 Subject: [PATCH 4/5] Fix incorrect permission --- server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java b/server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java index 67a973e..e318b21 100644 --- a/server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java +++ b/server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @CommandParameters(name = "localspawn", description = "Teleport to the spawnpoint of the world you are in") -@CommandPermissions(level = Rank.OP, permission = "plex.spawnpoint", source = RequiredCommandSource.IN_GAME) +@CommandPermissions(level = Rank.OP, permission = "plex.localspawn", source = RequiredCommandSource.IN_GAME) public class LocalSpawnCMD extends PlexCommand { @Override From 9c67911c1b2322783d18b0a1039dbb595dd0a65f Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Mon, 13 Jun 2022 23:17:10 -0500 Subject: [PATCH 5/5] Plex v1.1.1 --- build.gradle | 2 +- server/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 3086bfe..d1f731e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group = "dev.plex" -version = "1.2-SNAPSHOT" +version = "1.1.1" description = "Plex" subprojects { diff --git a/server/build.gradle b/server/build.gradle index 23cf77b..e91abd5 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -7,9 +7,9 @@ dependencies { annotationProcessor "org.projectlombok:lombok:1.18.24" library "org.json:json:20220320" library "commons-io:commons-io:2.11.0" - library "dev.morphia.morphia:morphia-core:2.2.6" - library "redis.clients:jedis:4.2.2" - library "org.mariadb.jdbc:mariadb-java-client:3.0.4" + library "dev.morphia.morphia:morphia-core:2.2.7" + library "redis.clients:jedis:4.2.3" + library "org.mariadb.jdbc:mariadb-java-client:3.0.5" library "com.zaxxer:HikariCP:5.0.1" library "org.apache.httpcomponents:httpclient:4.5.13" library "org.apache.commons:commons-lang3:3.12.0"