diff --git a/pom.xml b/pom.xml index 2238389..04c454f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,17 +66,17 @@ com.squareup.retrofit2 retrofit - 2.9.0 + 2.11.0 com.squareup.retrofit2 converter-jackson - 2.9.0 + 2.11.0 com.squareup.retrofit2 converter-gson - 2.9.0 + 2.11.0 co.aikar @@ -86,7 +86,7 @@ org.java-websocket Java-WebSocket - 1.5.1 + 1.5.6 @@ -95,10 +95,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.13.0 - 1.8 - 1.8 + 21 + 21 @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.1 + 3.6.0 true diff --git a/src/main/java/rip/bolt/ingame/commands/AdminCommands.java b/src/main/java/rip/bolt/ingame/commands/AdminCommands.java index 4c01737..9ea0e5e 100644 --- a/src/main/java/rip/bolt/ingame/commands/AdminCommands.java +++ b/src/main/java/rip/bolt/ingame/commands/AdminCommands.java @@ -5,8 +5,8 @@ import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.format.NamedTextColor; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import rip.bolt.ingame.Ingame; import rip.bolt.ingame.api.definitions.BoltMatch; diff --git a/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java b/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java index ee15f41..f8b002f 100644 --- a/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java +++ b/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java @@ -2,7 +2,7 @@ import static net.kyori.adventure.text.Component.text; -import net.md_5.bungee.api.ChatColor; +import org.bukkit.ChatColor; import rip.bolt.ingame.config.AppData; import rip.bolt.ingame.managers.GameManager; import rip.bolt.ingame.managers.MatchManager; diff --git a/src/main/java/rip/bolt/ingame/commands/RequeueCommands.java b/src/main/java/rip/bolt/ingame/commands/RequeueCommands.java index 67af583..c09d6ad 100644 --- a/src/main/java/rip/bolt/ingame/commands/RequeueCommands.java +++ b/src/main/java/rip/bolt/ingame/commands/RequeueCommands.java @@ -1,6 +1,6 @@ package rip.bolt.ingame.commands; -import net.md_5.bungee.api.ChatColor; +import org.bukkit.ChatColor; import rip.bolt.ingame.Ingame; import rip.bolt.ingame.api.definitions.MatchStatus; import rip.bolt.ingame.config.AppData; diff --git a/src/main/java/rip/bolt/ingame/managers/MatchManager.java b/src/main/java/rip/bolt/ingame/managers/MatchManager.java index 1b25e27..e447702 100644 --- a/src/main/java/rip/bolt/ingame/managers/MatchManager.java +++ b/src/main/java/rip/bolt/ingame/managers/MatchManager.java @@ -13,8 +13,8 @@ import java.time.Instant; import java.util.Collection; import java.util.Objects; -import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; @@ -43,12 +43,13 @@ import tc.oc.pgm.events.CountdownStartEvent; import tc.oc.pgm.restart.RestartCountdown; import tc.oc.pgm.result.TieVictoryCondition; +import tc.oc.pgm.util.platform.Platform; +import tc.oc.pgm.util.platform.Supports; public class MatchManager implements Listener { private final StatsManager statsManager; private final TabManager tabManager; - private final KnockbackManager knockbackManager; private final BattlepassManager battlepassManager; private final MatchSearch poll; @@ -70,11 +71,12 @@ public MatchManager(Plugin plugin) { gameManager = new GameManager.NoopManager(this); statsManager = new StatsManager(); tabManager = new TabManager(plugin); - knockbackManager = new KnockbackManager(); battlepassManager = BattlepassUtils.createManager(); Bukkit.getPluginManager().registerEvents(this, plugin); - Bukkit.getPluginManager().registerEvents(knockbackManager, plugin); + if (Platform.VARIANT == Supports.Variant.SPORTPAPER) { + Bukkit.getPluginManager().registerEvents(new KnockbackManager(), plugin); + } MatchPreloader.create(); diff --git a/src/main/java/rip/bolt/ingame/pugs/BoltWebSocket.java b/src/main/java/rip/bolt/ingame/pugs/BoltWebSocket.java index 75f72b1..a38fab8 100644 --- a/src/main/java/rip/bolt/ingame/pugs/BoltWebSocket.java +++ b/src/main/java/rip/bolt/ingame/pugs/BoltWebSocket.java @@ -10,7 +10,6 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; -import org.bukkit.craftbukkit.libs.joptsimple.internal.Strings; import org.java_websocket.client.WebSocketClient; import org.java_websocket.framing.CloseFrame; import org.java_websocket.handshake.ServerHandshake; @@ -86,7 +85,7 @@ private void handleMessageSync(PugManager manager, PugResponse pugResponse) { ? PlayerComponent.player(null, chat.getPlayer().getUsername(), NameStyle.VERBOSE) : CONSOLE_NAME; - Component body = text(Strings.join(chat.getMessage(), ", ")); + Component body = text(String.join(", ", chat.getMessage())); switch (chat.getType()) { case PLAYER_INGAME: diff --git a/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java b/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java index 5e98862..7efa47d 100644 --- a/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java +++ b/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java @@ -4,8 +4,7 @@ import java.util.Map; import net.kyori.adventure.text.format.NamedTextColor; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.Material; +import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -18,6 +17,7 @@ import tc.oc.pgm.api.player.MatchPlayer; import tc.oc.pgm.api.player.event.ObserverInteractEvent; import tc.oc.pgm.util.bukkit.OnlinePlayerMapAdapter; +import tc.oc.pgm.util.material.Materials; public class RequeueManager implements Listener { @@ -27,7 +27,7 @@ public class RequeueManager implements Listener { private final Map lastRequeues = new OnlinePlayerMapAdapter<>(Ingame.get()); private static ItemStack createRequeueItem(int data) { - ItemStack item = new ItemStack(Material.INK_SACK, 1, (short) data); + ItemStack item = new ItemStack(Materials.DYE, 1, (short) data); ItemMeta meta = item.getItemMeta(); meta.setDisplayName(ChatColor.GOLD + "" + ChatColor.BOLD + "Click to requeue"); item.setItemMeta(meta);