From b5cb881d6afc59e4053fc78b1bc81a884b3148da Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Mon, 6 Jun 2022 17:29:01 -0400 Subject: [PATCH 1/7] Bstats, Velocity-api and viaversion bump --- platforms/bungeecord/build.gradle.kts | 4 ++-- platforms/velocity/build.gradle.kts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index 3827d38..a51f879 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/platforms/bungeecord/build.gradle.kts @@ -25,9 +25,9 @@ dependencies { implementation("net.kyori:adventure-platform-bungeecord:4.0.0") compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3") - compileOnly("com.viaversion:viaversion-api:4.2.0-SNAPSHOT") + compileOnly("com.viaversion:viaversion-api:4.2.1") - implementation("org.bstats:bstats-bungeecord:2.2.1") + implementation("org.bstats:bstats-bungeecord:3.0.0") implementation(project(":common")) implementation(project(":api")) diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index 9909cca..a2dacbb 100644 --- a/platforms/velocity/build.gradle.kts +++ b/platforms/velocity/build.gradle.kts @@ -18,13 +18,13 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") compileOnly("us.ajg0702:ajUtils:1.1.22") - compileOnly("com.velocitypowered:velocity-api:3.0.0") - annotationProcessor("com.velocitypowered:velocity-api:3.0.0") + compileOnly("com.velocitypowered:velocity-api:3.1.0") + annotationProcessor("com.velocitypowered:velocity-api:3.1.0") implementation("net.kyori:adventure-text-minimessage:4.10.0") - compileOnly("com.viaversion:viaversion-api:4.2.0-SNAPSHOT") + compileOnly("com.viaversion:viaversion-api:4.2.1") - implementation("org.bstats:bstats-velocity:2.2.1") + implementation("org.bstats:bstats-velocity:3.0.0") implementation(project(":common")) implementation(project(":api")) From 79845fd8b642c3fb6701bfe9b31540f7b2bee8f5 Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Wed, 8 Jun 2022 18:22:07 -0400 Subject: [PATCH 2/7] viaversion bump --- platforms/bungeecord/build.gradle.kts | 2 +- platforms/velocity/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index a51f879..37980af 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/platforms/bungeecord/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { implementation("net.kyori:adventure-platform-bungeecord:4.0.0") compileOnly("net.kyori:adventure-text-serializer-plain:4.9.3") - compileOnly("com.viaversion:viaversion-api:4.2.1") + compileOnly("com.viaversion:viaversion-api:4.3.1") implementation("org.bstats:bstats-bungeecord:3.0.0") diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index a2dacbb..334bfb9 100644 --- a/platforms/velocity/build.gradle.kts +++ b/platforms/velocity/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { annotationProcessor("com.velocitypowered:velocity-api:3.1.0") implementation("net.kyori:adventure-text-minimessage:4.10.0") - compileOnly("com.viaversion:viaversion-api:4.2.1") + compileOnly("com.viaversion:viaversion-api:4.3.1") implementation("org.bstats:bstats-velocity:3.0.0") From de86b8a57aae0ce3e61165182baf27332d3ce8dd Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Wed, 8 Jun 2022 18:27:11 -0400 Subject: [PATCH 3/7] lp bump and yaml bump --- premium/build.gradle.kts | 2 +- spigot/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index 2019d31..b3369e8 100644 --- a/premium/build.gradle.kts +++ b/premium/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { compileOnly(fileTree(mapOf("dir" to "../libs/private", "include" to listOf("*.jar")))) compileOnly(fileTree(mapOf("dir" to "../libs/public", "include" to listOf("*.jar")))) - compileOnly("net.luckperms:api:5.0") + compileOnly("net.luckperms:api:5.4") } tasks.shadowJar { diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index e5916bd..73d2a20 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { implementation("net.kyori:adventure-api:4.9.3") compileOnly("com.google.guava:guava:30.1.1-jre") - compileOnly("org.spongepowered:configurate-yaml:4.0.0") + compileOnly("org.spongepowered:configurate-yaml:4.1.2") compileOnly("us.ajg0702:ajUtils:1.1.22") From 33c48f480c46c920dae686d1ace18242be9b229e Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Wed, 8 Jun 2022 18:30:59 -0400 Subject: [PATCH 4/7] Clean up --- .../commands/commands/SlashServer/SlashServerCommand.java | 1 - .../java/us/ajg0702/queue/commands/commands/manage/Kick.java | 3 --- .../us/ajg0702/queue/commands/commands/manage/KickAll.java | 1 - .../queue/platforms/velocity/server/VelocityServer.java | 1 - .../ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java | 3 +-- spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java | 4 +--- .../main/java/us/ajg0702/queue/spigot/utils/ActionBar.java | 2 +- 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java index c43a8d0..0f1c93f 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/SlashServer/SlashServerCommand.java @@ -8,7 +8,6 @@ import us.ajg0702.utils.common.Messages; import java.util.ArrayList; import java.util.List; -import java.util.Locale; public class SlashServerCommand extends BaseCommand { diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java index ceec116..e0d5197 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/Kick.java @@ -1,9 +1,6 @@ package us.ajg0702.queue.commands.commands.manage; import com.google.common.collect.ImmutableList; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.format.NamedTextColor; -import org.spongepowered.configurate.ConfigurateException; import us.ajg0702.queue.api.commands.ICommandSender; import us.ajg0702.queue.api.players.QueuePlayer; import us.ajg0702.queue.api.queues.QueueServer; diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java index 88cb327..57ff453 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/manage/KickAll.java @@ -9,7 +9,6 @@ import us.ajg0702.queue.common.QueueMain; import us.ajg0702.utils.common.Messages; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class KickAll extends SubCommand { diff --git a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/server/VelocityServer.java b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/server/VelocityServer.java index 7af2d64..dd316a0 100644 --- a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/server/VelocityServer.java +++ b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/server/VelocityServer.java @@ -12,7 +12,6 @@ import us.ajg0702.queue.platforms.velocity.players.VelocityPlayer; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; public class VelocityServer implements AdaptedServer { diff --git a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java index 794465f..49f9d31 100644 --- a/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java +++ b/premium/src/main/java/us/ajg0702/queue/logic/permissions/hooks/LuckPermsHook.java @@ -6,11 +6,10 @@ import net.luckperms.api.context.Context; import net.luckperms.api.model.user.User; import net.luckperms.api.node.Node; import net.luckperms.api.node.NodeType; -import net.luckperms.api.query.QueryMode; import net.luckperms.api.query.QueryOptions; import us.ajg0702.queue.api.players.AdaptedPlayer; -import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.api.premium.PermissionHook; +import us.ajg0702.queue.common.QueueMain; import java.util.*; diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java index 0a8783b..130120e 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java @@ -207,9 +207,7 @@ public class SpigotMain extends JavaPlugin implements PluginMessageListener,List @EventHandler public void onJoin(PlayerJoinEvent e) { if(hasProxy) return; - Bukkit.getScheduler().runTask(this, () -> { - sendMessage(e.getPlayer(), "ack", ""); - }); + Bukkit.getScheduler().runTask(this, () -> sendMessage(e.getPlayer(), "ack", "")); } @EventHandler(priority = EventPriority.HIGH) diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/utils/ActionBar.java b/spigot/src/main/java/us/ajg0702/queue/spigot/utils/ActionBar.java index acc3c60..c22e3dc 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/utils/ActionBar.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/utils/ActionBar.java @@ -8,7 +8,7 @@ import java.lang.reflect.Method; /** * A cross-version actionbar class - * @author Based on ActionBarAPI from https://github.com/ConnorLinfoot + * @author Based on ActionBarAPI from ... * */ public class ActionBar { From 34ab3d0da0c5d3a5f50167a75e1d2a441fd882f4 Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Tue, 14 Jun 2022 10:42:07 -0400 Subject: [PATCH 5/7] Move Velocity repo to PaperMC and update to latest --- platforms/velocity/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index 334bfb9..e1a9331 100644 --- a/platforms/velocity/build.gradle.kts +++ b/platforms/velocity/build.gradle.kts @@ -8,7 +8,7 @@ group = "us.ajg0702.queue.platforms.velocity" repositories { //mavenLocal() maven { url = uri("https://repo.ajg0702.us") } - maven { url = uri("https://nexus.velocitypowered.com/repository/maven-public/") } + maven { url = uri("https://repo.papermc.io/repository/maven-public/") } maven { url = uri("https://repo.viaversion.com/") } mavenCentral() } @@ -18,8 +18,8 @@ dependencies { compileOnly("com.google.guava:guava:30.1.1-jre") compileOnly("us.ajg0702:ajUtils:1.1.22") - compileOnly("com.velocitypowered:velocity-api:3.1.0") - annotationProcessor("com.velocitypowered:velocity-api:3.1.0") + compileOnly("com.velocitypowered:velocity-api:3.1.1") + annotationProcessor("com.velocitypowered:velocity-api:3.1.1") implementation("net.kyori:adventure-text-minimessage:4.10.0") compileOnly("com.viaversion:viaversion-api:4.3.1") From 860706f9a21df566a01478f6f1b12f451534844e Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Mon, 20 Jun 2022 19:56:17 -0400 Subject: [PATCH 6/7] Update Gradle to 7.4.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 48b10777e24fb817d85a6815f79eefca47c2a4cc Mon Sep 17 00:00:00 2001 From: "J.T. McQuigg" Date: Sun, 17 Jul 2022 10:48:31 -0400 Subject: [PATCH 7/7] Gradle 7.5 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fc..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists