From 0264cf62b46773bb95b8e341a720a8405853506a Mon Sep 17 00:00:00 2001
From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
Date: Sun, 5 Jun 2022 12:20:07 -0700
Subject: [PATCH] Update PGM dependency to 0.14-SNAPSHOT (#36)
Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
---
pom.xml | 2 +-
.../rip/bolt/ingame/api/definitions/MatchResult.java | 6 +++---
.../rip/bolt/ingame/commands/ForfeitCommands.java | 2 +-
.../bolt/ingame/commands/RankedAdminCommands.java | 4 ++--
.../java/rip/bolt/ingame/ranked/CancelManager.java | 4 ++--
.../java/rip/bolt/ingame/ranked/ForfeitManager.java | 4 ++--
.../java/rip/bolt/ingame/ranked/RankManager.java | 12 ++++++------
.../java/rip/bolt/ingame/ranked/RequeueManager.java | 4 ++--
src/main/java/rip/bolt/ingame/utils/Components.java | 12 ++++++------
src/main/java/rip/bolt/ingame/utils/Messages.java | 12 ++++++------
.../rip/bolt/ingame/utils/RankedTeamTabEntry.java | 6 +++---
11 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6759548..a09ce95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
tc.oc.pgm
core
- 0.13-SNAPSHOT
+ 0.14-SNAPSHOT
provided
diff --git a/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java b/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java
index 6d6b07e..52ed9d2 100644
--- a/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java
+++ b/src/main/java/rip/bolt/ingame/api/definitions/MatchResult.java
@@ -3,9 +3,9 @@
import static rip.bolt.ingame.utils.Components.matchResult;
import javax.annotation.Nonnull;
-import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
-import tc.oc.pgm.lib.net.kyori.adventure.text.ComponentLike;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.format.NamedTextColor;
public enum MatchResult implements ComponentLike {
WIN(matchResult(NamedTextColor.GREEN)),
diff --git a/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java b/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java
index fb128c3..ec27ff2 100644
--- a/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java
+++ b/src/main/java/rip/bolt/ingame/commands/ForfeitCommands.java
@@ -1,6 +1,6 @@
package rip.bolt.ingame.commands;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
import net.md_5.bungee.api.ChatColor;
import rip.bolt.ingame.config.AppData;
diff --git a/src/main/java/rip/bolt/ingame/commands/RankedAdminCommands.java b/src/main/java/rip/bolt/ingame/commands/RankedAdminCommands.java
index 0eb1814..98c7165 100644
--- a/src/main/java/rip/bolt/ingame/commands/RankedAdminCommands.java
+++ b/src/main/java/rip/bolt/ingame/commands/RankedAdminCommands.java
@@ -1,8 +1,9 @@
package rip.bolt.ingame.commands;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
import javax.annotation.Nullable;
+import net.kyori.adventure.text.format.NamedTextColor;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -21,7 +22,6 @@
import tc.oc.pgm.lib.app.ashcon.intake.CommandException;
import tc.oc.pgm.lib.app.ashcon.intake.parametric.annotation.Switch;
import tc.oc.pgm.lib.app.ashcon.intake.parametric.annotation.Text;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
import tc.oc.pgm.util.Audience;
public class RankedAdminCommands {
diff --git a/src/main/java/rip/bolt/ingame/ranked/CancelManager.java b/src/main/java/rip/bolt/ingame/ranked/CancelManager.java
index 060cd68..81d69c2 100644
--- a/src/main/java/rip/bolt/ingame/ranked/CancelManager.java
+++ b/src/main/java/rip/bolt/ingame/ranked/CancelManager.java
@@ -1,6 +1,6 @@
package rip.bolt.ingame.ranked;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
import com.google.common.collect.Ordering;
import java.time.Duration;
@@ -12,13 +12,13 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
+import net.kyori.adventure.text.format.NamedTextColor;
import rip.bolt.ingame.config.AppData;
import rip.bolt.ingame.utils.CancelReason;
import rip.bolt.ingame.utils.Messages;
import tc.oc.pgm.api.match.Match;
import tc.oc.pgm.api.match.MatchScope;
import tc.oc.pgm.api.player.MatchPlayer;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
public class CancelManager {
diff --git a/src/main/java/rip/bolt/ingame/ranked/ForfeitManager.java b/src/main/java/rip/bolt/ingame/ranked/ForfeitManager.java
index 92a6c73..0bc7e91 100644
--- a/src/main/java/rip/bolt/ingame/ranked/ForfeitManager.java
+++ b/src/main/java/rip/bolt/ingame/ranked/ForfeitManager.java
@@ -1,6 +1,6 @@
package rip.bolt.ingame.ranked;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
import dev.pgm.events.Tournament;
import dev.pgm.events.team.TournamentPlayer;
@@ -15,6 +15,7 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
+import net.kyori.adventure.text.format.NamedTextColor;
import rip.bolt.ingame.config.AppData;
import rip.bolt.ingame.utils.Messages;
import tc.oc.pgm.api.match.Match;
@@ -23,7 +24,6 @@
import tc.oc.pgm.api.party.Party;
import tc.oc.pgm.api.party.VictoryCondition;
import tc.oc.pgm.api.player.MatchPlayer;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
import tc.oc.pgm.result.CompetitorVictoryCondition;
import tc.oc.pgm.result.TieVictoryCondition;
import tc.oc.pgm.teams.Team;
diff --git a/src/main/java/rip/bolt/ingame/ranked/RankManager.java b/src/main/java/rip/bolt/ingame/ranked/RankManager.java
index 40d6f71..a2ed0c0 100644
--- a/src/main/java/rip/bolt/ingame/ranked/RankManager.java
+++ b/src/main/java/rip/bolt/ingame/ranked/RankManager.java
@@ -1,7 +1,7 @@
package rip.bolt.ingame.ranked;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.empty;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.empty;
+import static net.kyori.adventure.text.Component.text;
import java.util.ArrayList;
import java.util.Collection;
@@ -10,6 +10,10 @@
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -33,10 +37,6 @@
import tc.oc.pgm.api.party.Party;
import tc.oc.pgm.api.player.MatchPlayer;
import tc.oc.pgm.events.PlayerPartyChangeEvent;
-import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.TextColor;
-import tc.oc.pgm.lib.net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import tc.oc.pgm.util.bukkit.OnlinePlayerMapAdapter;
public class RankManager implements Listener {
diff --git a/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java b/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java
index f1ab489..91b4a62 100644
--- a/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java
+++ b/src/main/java/rip/bolt/ingame/ranked/RequeueManager.java
@@ -1,8 +1,9 @@
package rip.bolt.ingame.ranked;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
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.entity.Player;
@@ -16,7 +17,6 @@
import rip.bolt.ingame.utils.Messages;
import tc.oc.pgm.api.player.MatchPlayer;
import tc.oc.pgm.api.player.event.ObserverInteractEvent;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
import tc.oc.pgm.util.bukkit.OnlinePlayerMapAdapter;
public class RequeueManager implements Listener {
diff --git a/src/main/java/rip/bolt/ingame/utils/Components.java b/src/main/java/rip/bolt/ingame/utils/Components.java
index 382fdf5..8616044 100644
--- a/src/main/java/rip/bolt/ingame/utils/Components.java
+++ b/src/main/java/rip/bolt/ingame/utils/Components.java
@@ -1,12 +1,12 @@
package rip.bolt.ingame.utils;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.Component.text;
-import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
-import tc.oc.pgm.lib.net.kyori.adventure.text.event.ClickEvent;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.Style;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextColor;
public class Components {
diff --git a/src/main/java/rip/bolt/ingame/utils/Messages.java b/src/main/java/rip/bolt/ingame/utils/Messages.java
index 6bfa7b0..9a6436e 100644
--- a/src/main/java/rip/bolt/ingame/utils/Messages.java
+++ b/src/main/java/rip/bolt/ingame/utils/Messages.java
@@ -1,17 +1,17 @@
package rip.bolt.ingame.utils;
+import static net.kyori.adventure.text.Component.newline;
+import static net.kyori.adventure.text.Component.text;
import static rip.bolt.ingame.utils.Components.command;
import static rip.bolt.ingame.utils.Components.link;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.newline;
-import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextDecoration;
import rip.bolt.ingame.api.definitions.BoltMatch;
import rip.bolt.ingame.config.AppData;
import tc.oc.pgm.api.player.MatchPlayer;
-import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.Style;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.TextDecoration;
public class Messages {
diff --git a/src/main/java/rip/bolt/ingame/utils/RankedTeamTabEntry.java b/src/main/java/rip/bolt/ingame/utils/RankedTeamTabEntry.java
index ad1b21b..e0e023e 100644
--- a/src/main/java/rip/bolt/ingame/utils/RankedTeamTabEntry.java
+++ b/src/main/java/rip/bolt/ingame/utils/RankedTeamTabEntry.java
@@ -4,10 +4,10 @@
import dev.pgm.events.team.TournamentTeam;
import java.util.Optional;
import javax.annotation.Nullable;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
import rip.bolt.ingame.api.definitions.Team;
-import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
-import tc.oc.pgm.lib.net.kyori.adventure.text.format.TextDecoration;
import tc.oc.pgm.tablist.TeamTabEntry;
import tc.oc.pgm.util.tablist.TabView;