Update to latest PGM

Signed-off-by: Austin L Mayes <[email protected]>
PGMDev · Jan 1, 2021 · 6460162 · 6460162
1 parent bdb9ddd
commit 6460162
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
 		<dependency>
 			<groupId>tc.oc.pgm</groupId>
 			<artifactId>core</artifactId>
-			<version>0.10-SNAPSHOT</version>
+			<version>0.11-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>tc.oc.pgm</groupId>
 			<artifactId>util</artifactId>
-			<version>0.10-SNAPSHOT</version>
+			<version>0.11-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/dev/pgm/events/format/rounds/veto/VetoCountdown.java b/src/main/java/dev/pgm/events/format/rounds/veto/VetoCountdown.java
@@ -1,13 +1,14 @@
 package dev.pgm.events.format.rounds.veto;
 
+import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+
 import dev.pgm.events.team.TournamentTeam;
 import java.time.Duration;
 import java.util.Optional;
 import net.md_5.bungee.api.chat.BaseComponent;
 import tc.oc.pgm.api.match.Match;
 import tc.oc.pgm.countdowns.MatchCountdown;
-import tc.oc.pgm.lib.net.kyori.text.Component;
-import tc.oc.pgm.lib.net.kyori.text.TextComponent;
+import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
 
 public class VetoCountdown extends MatchCountdown {
 
@@ -25,7 +26,7 @@ public VetoCountdown(
 
   @Override
   protected Component formatText() {
-    return TextComponent.of(message);
+    return text(message);
   }
 
   @Override

diff --git a/src/main/java/dev/pgm/events/format/shutdown/ShutdownCountdown.java b/src/main/java/dev/pgm/events/format/shutdown/ShutdownCountdown.java
@@ -1,18 +1,21 @@
 package dev.pgm.events.format.shutdown;
 
+import static tc.oc.pgm.lib.net.kyori.adventure.key.Key.key;
+import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+
 import dev.pgm.events.utils.TimeFormatter;
 import java.time.Duration;
 import org.bukkit.Bukkit;
 import tc.oc.pgm.api.match.Match;
 import tc.oc.pgm.countdowns.MatchCountdown;
-import tc.oc.pgm.lib.net.kyori.text.Component;
-import tc.oc.pgm.lib.net.kyori.text.TextComponent;
-import tc.oc.pgm.lib.net.kyori.text.format.TextColor;
-import tc.oc.pgm.util.chat.Sound;
+import tc.oc.pgm.lib.net.kyori.adventure.sound.Sound;
+import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
+import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
 
 public class ShutdownCountdown extends MatchCountdown {
 
-  protected static final Sound COUNT_SOUND = new Sound("note.pling", 1f, 1.19f);
+  protected static final Sound COUNT_SOUND =
+      Sound.sound(key("note.pling"), Sound.Source.MASTER, 1f, 1.19f);
 
   public ShutdownCountdown(Match match) {
     super(match);
@@ -32,8 +35,8 @@ protected boolean showTitle() {
 
   @Override
   protected Component formatText() {
-    return TextComponent.of(
-        "Server will shut down in " + TimeFormatter.seconds(remaining), TextColor.AQUA);
+    return text(
+        "Server will shut down in " + TimeFormatter.seconds(remaining), NamedTextColor.AQUA);
   }
 
   @Override

diff --git a/src/main/java/dev/pgm/events/listeners/PlayerJoinListen.java b/src/main/java/dev/pgm/events/listeners/PlayerJoinListen.java
@@ -1,5 +1,7 @@
 package dev.pgm.events.listeners;
 
+import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+
 import dev.pgm.events.team.TournamentTeamManager;
 import java.util.Optional;
 import org.bukkit.Bukkit;
@@ -13,8 +15,7 @@
 import tc.oc.pgm.blitz.BlitzMatchModule;
 import tc.oc.pgm.events.PlayerParticipationStartEvent;
 import tc.oc.pgm.events.PlayerParticipationStopEvent;
-import tc.oc.pgm.lib.net.kyori.text.TextComponent;
-import tc.oc.pgm.lib.net.kyori.text.format.TextColor;
+import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
 import tc.oc.pgm.teams.Team;
 
 public class PlayerJoinListen implements Listener {
@@ -86,15 +87,15 @@ public void onParticipate(PlayerParticipationStartEvent event) {
       if (!isFull(team)) return;
     }
 
-    event.cancel(TextComponent.of("You may not join in a tournament setting!", TextColor.RED));
+    event.cancel(text("You may not join in a tournament setting!", NamedTextColor.RED));
   }
 
   @EventHandler
   public void onLeaveParticipate(PlayerParticipationStopEvent event) {
     Optional<Team> playerTeam = manager.playerTeam(event.getPlayer().getId());
     // check if the player is on one of the teams
     if (playerTeam.isPresent())
-      event.cancel(TextComponent.of("You may not leave in a tournament setting!", TextColor.RED));
+      event.cancel(text("You may not leave in a tournament setting!", NamedTextColor.RED));
 
     BlitzMatchModule blitz = event.getMatch().getModule(BlitzMatchModule.class);
     if (blitz != null) {