From 73b052a81d5544edd98d470d2281b9ef1fce8a81 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Tue, 26 Mar 2024 09:10:03 +0000
Subject: [PATCH] cleanup

---
 .../fascinated/playercolor/PlayerColor.java   | 25 +++----------------
 .../playercolor/PlayerColorManager.java       | 20 +++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/java/cc/fascinated/playercolor/PlayerColor.java b/src/main/java/cc/fascinated/playercolor/PlayerColor.java
index 0c0e961..e6de096 100644
--- a/src/main/java/cc/fascinated/playercolor/PlayerColor.java
+++ b/src/main/java/cc/fascinated/playercolor/PlayerColor.java
@@ -5,13 +5,11 @@ import cc.fascinated.account.Profile;
 import lombok.Getter;
 import lombok.Setter;
 import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
 @Getter @Setter
@@ -42,7 +40,7 @@ public class PlayerColor extends Profile {
     public void setColor(NamedTextColor color) {
         this.color = color;
 
-        Team team = getScoreboardTeam(this.color);
+        Team team = PlayerColorManager.getScoreboardTeam(this.color);
         team.addEntry(getAccount().getName());
     }
 
@@ -55,7 +53,7 @@ public class PlayerColor extends Profile {
     public void onLogin(PlayerLoginEvent event) {
         Player player = event.getPlayer();
 
-        Team team = getScoreboardTeam(this.color);
+        Team team = PlayerColorManager.getScoreboardTeam(this.color);
         team.addEntry(player.getName());
     }
 
@@ -63,24 +61,7 @@ public class PlayerColor extends Profile {
     public void onQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
 
-        Team team = getScoreboardTeam(this.color);
+        Team team = PlayerColorManager.getScoreboardTeam(this.color);
         team.removeEntry(player.getName());
     }
-
-    /**
-     * Gets the scoreboard team for this color.
-     *
-     * @param color the color to get the team for
-     * @return the team
-     */
-    private Team getScoreboardTeam(NamedTextColor color) {
-        Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
-        Team team = scoreboard.getTeam(color.toString().toLowerCase());
-        if (team == null) {
-            team = scoreboard.registerNewTeam(color.toString().toLowerCase());
-            team.color(color);
-        }
-
-        return team;
-    }
 }
diff --git a/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java b/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
index 7da10b4..b4e75a0 100644
--- a/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
+++ b/src/main/java/cc/fascinated/playercolor/PlayerColorManager.java
@@ -8,8 +8,11 @@ import io.papermc.paper.event.player.AsyncChatEvent;
 import lombok.Getter;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.scoreboard.Scoreboard;
+import org.bukkit.scoreboard.Team;
 
 import java.util.List;
 
@@ -60,6 +63,23 @@ public class PlayerColorManager extends Manager {
         return null;
     }
 
+    /**
+     * Gets the scoreboard team for this color.
+     *
+     * @param color the color to get the team for
+     * @return the team
+     */
+    public static Team getScoreboardTeam(NamedTextColor color) {
+        Scoreboard scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
+        Team team = scoreboard.getTeam(color.toString().toLowerCase());
+        if (team == null) {
+            team = scoreboard.registerNewTeam(color.toString().toLowerCase());
+            team.color(color);
+        }
+
+        return team;
+    }
+
     @EventHandler
     public void onChat(AsyncChatEvent event) {
         Player player = event.getPlayer();