Adapt to upstream

Signed-off-by: BT (calcastor/mame) <[email protected]>

pom.xml

@@ -66,17 +66,17 @@
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>retrofit</artifactId>
-            <version>2.9.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-jackson</artifactId>
-            <version>2.9.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>co.aikar</groupId>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.6</version>
         </dependency>
     </dependencies>
 
@@ -95,10 +95,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
 
@@ -123,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>true</createDependencyReducedPom>
                     <filters>

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;

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;

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;

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();
 

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:

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<Player, Long> 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);