From d68dfb5b0156a55b6607f4acb82baa4c037975eb Mon Sep 17 00:00:00 2001
From: Allink <arclicious@vivaldi.net>
Date: Sun, 2 Apr 2023 00:29:39 +0100
Subject: [PATCH] Refactor static final fields in PlayerPrefix module to be
 consistent

---
 .../extras/modules/player/PlayerPrefix.java   | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java
index ab7a8c1..d67e59b 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java
@@ -23,14 +23,14 @@ import java.util.Map;
 import java.util.UUID;
 
 public final class PlayerPrefix implements Listener {
-	private static final Main plugin = JavaPlugin.getPlugin(Main.class);
-	private static final File PREFIX_CONFIG_FILE = plugin.getPrefixConfigFile();
-	private static final FileConfiguration PREFIX_CONFIG = plugin.getPrefixConfig();
-	private static final FileConfiguration PLUGIN_CONFIGURATION = plugin.getConfig();
-	private static final Component opTag;
-	private static final Component deOpTag;
-	private static final Map<Player, Boolean> opMap = new HashMap<>();
-	private static final Map<Player, Component> displayNameMap = new HashMap<>();
+	private static final Main PLUGIN = JavaPlugin.getPlugin(Main.class);
+	private static final File PREFIX_CONFIG_FILE = PLUGIN.getPrefixConfigFile();
+	private static final FileConfiguration PREFIX_CONFIG = PLUGIN.getPrefixConfig();
+	private static final FileConfiguration PLUGIN_CONFIGURATION = PLUGIN.getConfig();
+	private static final Component OP_TAG;
+	private static final Component DE_OP_TAG;
+	private static final Map<Player, Boolean> OP_MAP = new HashMap<>();
+	private static final Map<Player, Component> DISPLAY_NAME_MAP = new HashMap<>();
 
 	static {
 		final String legacyOpTag = PLUGIN_CONFIGURATION.getString("opTag");
@@ -40,14 +40,14 @@ public final class PlayerPrefix implements Listener {
 			throw new RuntimeException("Invalid plugin configuration!");
 		}
 
-		opTag = LegacyComponentSerializer.legacySection().deserialize(legacyOpTag);
-		deOpTag = LegacyComponentSerializer.legacySection().deserialize(legacyDeOpTag);
+		OP_TAG = LegacyComponentSerializer.legacySection().deserialize(legacyOpTag);
+		DE_OP_TAG = LegacyComponentSerializer.legacySection().deserialize(legacyDeOpTag);
 
 		final BukkitScheduler scheduler = Bukkit.getScheduler();
 
-		scheduler.runTaskTimerAsynchronously(plugin, PlayerPrefix::checkOpStatus,
+		scheduler.runTaskTimerAsynchronously(PLUGIN, PlayerPrefix::checkOpStatus,
 			0L, 1L);
-		scheduler.runTaskTimerAsynchronously(plugin, PlayerPrefix::checkDisplayNames,
+		scheduler.runTaskTimerAsynchronously(PLUGIN, PlayerPrefix::checkDisplayNames,
 			0L, 1L);
 	}
 
@@ -80,7 +80,7 @@ public final class PlayerPrefix implements Listener {
 		final String legacyPrefix = PREFIX_CONFIG.getString(stringifiedUUID);
 
 		if (legacyPrefix == null) {
-			return player.isOp() ? opTag : deOpTag;
+			return player.isOp() ? OP_TAG : DE_OP_TAG;
 		}
 
 		return LegacyComponentSerializer.legacyAmpersand()
@@ -89,7 +89,7 @@ public final class PlayerPrefix implements Listener {
 	}
 
 	public static Component getDefaultPrefix(Player player) {
-		return player.isOp() ? opTag : deOpTag;
+		return player.isOp() ? OP_TAG : DE_OP_TAG;
 	}
 
 	private static void onUpdate(Player player) throws IOException {
@@ -105,8 +105,8 @@ public final class PlayerPrefix implements Listener {
 		final Player player = event.getPlayer();
 		final boolean isOp = player.isOp();
 
-		opMap.put(player, isOp);
-		displayNameMap.put(player, player.displayName());
+		OP_MAP.put(player, isOp);
+		DISPLAY_NAME_MAP.put(player, player.displayName());
 		onUpdate(player);
 	}
 
@@ -114,8 +114,8 @@ public final class PlayerPrefix implements Listener {
 	public void onPlayerQuitEvent(PlayerQuitEvent event) {
 		final Player player = event.getPlayer();
 
-		opMap.remove(player);
-		displayNameMap.remove(player);
+		OP_MAP.remove(player);
+		DISPLAY_NAME_MAP.remove(player);
 	}
 
 	private static void checkOpStatus() {
@@ -125,17 +125,17 @@ public final class PlayerPrefix implements Listener {
 		for (Player player : players) {
 			final boolean isOp = player.isOp();
 
-			if (!opMap.containsKey(player)) {
+			if (!OP_MAP.containsKey(player)) {
 				return;
 			}
 
-			final boolean storedOp = opMap.get(player);
+			final boolean storedOp = OP_MAP.get(player);
 
 			if (isOp == storedOp) {
 				continue;
 			}
 
-			opMap.put(player, isOp);
+			OP_MAP.put(player, isOp);
 
 			try {
 				onUpdate(player);
@@ -152,17 +152,17 @@ public final class PlayerPrefix implements Listener {
 		for (Player player : players) {
 			final Component displayName = player.displayName();
 
-			if (!displayNameMap.containsKey(player)) {
+			if (!DISPLAY_NAME_MAP.containsKey(player)) {
 				return;
 			}
 
-			final Component storedDisplayName = displayNameMap.get(player);
+			final Component storedDisplayName = DISPLAY_NAME_MAP.get(player);
 
 			if (displayName.equals(storedDisplayName)) {
 				continue;
 			}
 
-			displayNameMap.put(player, displayName);
+			DISPLAY_NAME_MAP.put(player, displayName);
 
 			try {
 				onUpdate(player);