Color refactor

Author: ChanceSD

build.gradle

@@ -8,6 +8,12 @@ group = 'me.chancesd.pvpmanager'
 subprojects {
     apply plugin: 'java'
 
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
+    }
+
     repositories {
         mavenCentral()
         mavenLocal()

pom.xml

@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sonar.organization>chancesd</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
-		<revision>4.0-SNAPSHOT</revision>
+		<revision>4.0</revision>
 	</properties>
 
 	<distributionManagement>

pvpmanager/build.gradle

@@ -10,8 +10,8 @@ version = '3.18.30'
 description = 'A powerful plugin to manage various PvP combat features'
 
 dependencies {
-    compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT'
-    compileOnly 'org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.21.8-R0.1-SNAPSHOT'
     compileOnly 'net.sacredlabyrinth.phaed.simpleclans:SimpleClans:2.19.2'
     compileOnly('com.github.EssentialsX.Essentials:EssentialsX:2.20.0') {
         exclude group: '*', module: '*'
@@ -34,7 +34,7 @@ dependencies {
     }
     compileOnly 'com.github.cryptomorin:kingdoms:1.16.8.1.1'
     compileOnly 'com.github.TechFortress:GriefPrevention:17.0.0'
-    compileOnly 'me.neznamy:tab-api:4.0.2'
+    compileOnly 'com.github.NEZNAMY:TAB-API:5.2.5'
 
     compileOnly 'com.zaxxer:HikariCP:4.0.3'
     compileOnly 'org.apache.logging.log4j:log4j-core:2.23.1'
@@ -100,9 +100,6 @@ processResources {
 test {
     useJUnitPlatform()
     include '**/*InstanceCreator.class'
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
 }
 
 tasks.build {

pvpmanager/pom.xml

@@ -16,7 +16,7 @@
 	<url>https://github.com/ChanceSD/PvPManager</url>
 
 	<properties>
-		<config.version>117</config.version>
+		<config.version>200</config.version>
 		<database.version>1</database.version>
 	</properties>
 

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Help.java

@@ -16,6 +16,7 @@ public class Help {
 	private static final String STAFF_COMMAND_COLOR = "#FF5722";
 	private static final String DESCRIPTION_COLOR = "#9E9E9E";
 
+
 	// Category constants
 	private static final String PLAYER_CATEGORY = "player";
 	private static final String STAFF_CATEGORY = "staff";
@@ -39,8 +40,8 @@ private String buildHoverText(final String actionText, final String description,
 		final String usage = command.getUsage() != null && !command.getUsage().isEmpty() ? command.getUsage() : null;
 
 		final StringBuilder hoverText = new StringBuilder();
-		hoverText.append("&7").append(actionText);
-		hoverText.append("\n#812c6c► ").append(description);
+	hoverText.append("#90A4AE").append(actionText);
+	hoverText.append("\n#455A64► #CFD8DC").append(description);
 
 		final boolean hasUsage = usage != null;
 		final boolean hasPermissions = !permissions.isEmpty();
@@ -50,11 +51,12 @@ private String buildHoverText(final String actionText, final String description,
 		}
 
 		if (hasUsage) {
-			hoverText.append("\n#4CAF50&lUsage: &8").append(usage);
+			hoverText.append("\n#78909C&lUsage: #607D8B").append(usage);
 		}
 
 		if (hasPermissions) {
-			hoverText.append("\n#FF5722&lRequires: &c").append(permissions.stream().findFirst().get());
+			final String perms = String.join(", ", permissions);
+			hoverText.append("\n#78909C&lRequires: #546E7A").append(perms);
 		}
 
 		return hoverText.toString();
@@ -178,7 +180,7 @@ private void addPmrSubcommandIfAvailable(final StaticContentProvider content, fi
 		final String usage = "/pmr " + subcommandName;
 		final String hoverText = buildAutoHoverText(subcommand, description);
 		final String displayText = String.format("  %s%s %s&8- &7%s", STAFF_COMMAND_COLOR, usage, DESCRIPTION_COLOR, description);
-		content.addLine(displayText, subcommandName, hoverText);
+		content.addLine(displayText, usage, hoverText);
 	}
 
 	private ChatMenu createHelpMenu(final CommandSender sender) {
@@ -216,16 +218,14 @@ private ChatMenu createHelpMenu(final CommandSender sender) {
 			addPmrSubcommandIfAvailable(contentProvider, sender, "locale");
 		}
 
+		final String pluginVersion = plugin.getDescription().getVersion();
 		return ChatMenu.builder()
-				.header("#607D8B&l╔══════ §4§lPvP§8§lManager #f7e758&lv4.10" + "" + " #9E9E9E(Page {page}/{total}) #607D8B&l══════╗")
+				.header("#607D8B&l╔══════ §4§lPvP§8§lManager #f7e758&lv" + pluginVersion
+						+ " #9E9E9E({page}/{total}) #607D8B&l══════╗")
 				.footer("#607D8B&l╚══════════════════════════════╝")
 				.linesPerPage(15)
 				.contentProvider(contentProvider)
-				.navigation(NavigationButtons.builder()
-						.navigationPrefix("/pmr")
-						.previousText("&7[&c« Previous Page&7]")
-						.nextText("&7[&cNext Page »&7]")
-						.build())
+				.navigation(NavigationButtons.builder().navigationPrefix("/pmr").build())
 				.build();
 	}
 }

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Newbie.java

@@ -82,7 +82,7 @@ public void execute(final CommandSender sender, final String label, final List<C
 			// If no player argument provided, check own time (for players only)
 			if (args.isEmpty()) {
 				if (!(sender instanceof Player)) {
-					sender.sendMessage("§cConsole must specify a player: /newbie checktime <player>");
+					ChatUtils.send(sender, "&#FF5555Console must specify a player: &#FFFFFF/newbie checktime <player>");
 					return;
 				}
 
@@ -99,7 +99,7 @@ public void execute(final CommandSender sender, final String label, final List<C
 
 			// Check another player's time (requires admin permission)
 			if (!sender.hasPermission(Permissions.COMMAND_NEWBIE.getPermission())) {
-				sender.sendMessage("§cYou don't have permission to check other players' newbie time.");
+				ChatUtils.send(sender, "&#FF5555You don't have permission to check other players' newbie time.");
 				return;
 			}
 
@@ -127,7 +127,7 @@ public void execute(final CommandSender sender, final String label, final List<C
 			final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayerOrNull();
 			final CombatPlayer target = ph.get(targetPlayer);
 			target.setNewbie(true);
-			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Added newbie protection to &e " + target.getName()));
+			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Added newbie protection to &#FFFF55" + target.getName()));
 		}
 	}
 
@@ -148,7 +148,7 @@ public void execute(final CommandSender sender, final String label, final List<C
 			final Player targetPlayer = getArgument(args, ARG_PLAYER).getAsPlayerOrNull();
 			final CombatPlayer target = ph.get(targetPlayer);
 			target.setNewbie(false);
-			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Removed newbie protection from &e " + target.getName()));
+			sender.sendMessage(ChatUtils.colorize(Lang.PREFIX + " Removed newbie protection from &#FFFF55" + target.getName()));
 		}
 	}
 }