New message system

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

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import me.chancesd.pvpmanager.utils.TimeUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -32,10 +33,10 @@ public final boolean onCommand(final CommandSender sender, final Command command
 		if (args.length == 0 && sender instanceof final Player player) {
 			final CombatPlayer pvPlayer = ph.get(player);
 			if (!pvPlayer.isNewbie()) {
-				pvPlayer.message(Messages.getErrorNotNewbie());
+				pvPlayer.message(Messages.errorNotNewbie.getMsg());
 			} else {
-				final long timeLeft = pvPlayer.getNewbieTimeLeft() / 1000;
-				pvPlayer.message(String.format(Messages.getNewbieTimeCheck(), timeLeft));
+				final long timeLeft = pvPlayer.getNewbieTimeLeft();
+				pvPlayer.message(Messages.newbieTimeCheck.getMsg(TimeUtil.getDiffMsg(timeLeft)));
 			}
 			return true;
 		} else if (args.length >= 1) {
@@ -46,7 +47,7 @@ public final boolean onCommand(final CommandSender sender, final Command command
 					combatPlayer.setNewbie(false);
 					return true;
 				}
-				combatPlayer.message(Messages.getErrorNotNewbie());
+				combatPlayer.message(Messages.errorNotNewbie.getMsg());
 				return true;
 			} else if (Permissions.ADMIN.hasPerm(sender) && args.length == 2) {
 				if (subcommand.equalsIgnoreCase("checktime")) {
@@ -71,8 +72,8 @@ private void checkNewbieTime(final CommandSender sender, final String targetPlay
 			return;
 
 		final CombatPlayer specifiedPlayer = ph.get(Bukkit.getPlayer(targetPlayerName));
-		final long timeLeft = specifiedPlayer.getNewbieTimeLeft() / 1000;
-		sender.sendMessage(String.format(Messages.getNewbieTimeCheckOther(), specifiedPlayer.getName(), timeLeft));
+		final long timeLeft = specifiedPlayer.getNewbieTimeLeft();
+		sender.sendMessage(Messages.newbieTimeCheckOther.getMsg(specifiedPlayer.getName(), TimeUtil.getDiffMsg(timeLeft)));
 	}
 
 	private void addNewbie(final CommandSender sender, final String targetPlayerName) {

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

@@ -91,7 +91,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 				return true;
 			}
 		}
-		sender.sendMessage(Messages.getErrorCommand());
+		sender.sendMessage(Messages.errorCommand.getMsg());
 		return false;
 	}
 
@@ -257,7 +257,7 @@ private void changeConfigSetting(final String path, final String value) {
 
 	private void reload(final CommandSender sender) {
 		if (!sender.hasPermission("pvpmanager.reload")) {
-			sender.sendMessage(Messages.getErrorPermission());
+			sender.sendMessage(Messages.errorPermission.getMsg());
 			return;
 		}
 

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

@@ -13,6 +13,7 @@
 import me.chancesd.pvpmanager.setting.Settings;
 import me.chancesd.pvpmanager.utils.ChatUtils;
 import me.chancesd.pvpmanager.utils.CombatUtils;
+import me.chancesd.pvpmanager.utils.TimeUtil;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -33,7 +34,7 @@ public PvP(final PlayerManager playerHandler) {
 	@Override
 	public final boolean onCommand(final CommandSender sender, final Command cmd, final String label, final String[] args) {
 		if (!sender.hasPermission("pvpmanager.pvpstatus.change")) {
-			sender.sendMessage(Messages.getErrorPermission());
+			sender.sendMessage(Messages.errorPermission.getMsg());
 			return true;
 		}
 
@@ -69,7 +70,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 			return true;
 		}
 
-		sender.sendMessage(Messages.getErrorCommand());
+		sender.sendMessage(Messages.errorCommand.getMsg());
 		return true;
 	}
 
@@ -78,16 +79,16 @@ private void togglePvP(final CombatPlayer player, final boolean state) {
 			return;
 
 		if (player.hasPvPEnabled() == state) {
-			player.message(state ? Messages.getAlreadyEnabled() : Messages.getAlreadyDisabled());
+			player.message(state ? Messages.pvpToggleAlreadyEnabled : Messages.pvpToggleAlreadyDisabled);
 			return;
 		}
 
 		final CombatWorld combatWorld = player.getCombatWorld();
 		if (state && combatWorld.isPvPForced() == CombatWorld.WorldOptionState.OFF) {
-			player.message(Messages.getErrorPvPToggleNoPvP());
+			player.message(Messages.errorPvpToggleNoPvp);
 			return;
 		} else if (!state && combatWorld.isPvPForced() == CombatWorld.WorldOptionState.ON) {
-			player.message(Messages.getErrorPvPToggleForcePvP());
+			player.message(Messages.errorPvpToggleForcePvp);
 			return;
 		}
 
@@ -99,8 +100,8 @@ private void togglePvPAdmin(final CommandSender sender, final String playerName,
 			return;
 		final CombatPlayer specifiedPlayer = ph.get(Bukkit.getPlayer(playerName));
 		specifiedPlayer.setPvP(toggle ? !specifiedPlayer.hasPvPEnabled() : state);
-		final String stateMessage = specifiedPlayer.hasPvPEnabled() ? Messages.getEnabled() : Messages.getDisabled();
-		sender.sendMessage(Messages.getPvPToggleAdminChanged().replace("%p", playerName).replace("%state", stateMessage)); // TODO add replace variables
+		final String stateMessage = specifiedPlayer.hasPvPEnabled() ? Messages.enabled.getMsg() : Messages.disabled.getMsg();
+		sender.sendMessage(Messages.pvpToggleAdminChanged.getMsg(playerName,stateMessage));
 	}
 
 	private void togglePvPAll(final CommandSender sender, final boolean state, final boolean toggle) {
@@ -112,10 +113,8 @@ private void togglePvPAll(final CommandSender sender, final boolean state, final
 	public final boolean hasToggleCooldownPassed(final CombatPlayer player) {
 		if (!CombatUtils.hasTimePassed(player.getToggleTime(), Settings.getToggleCooldown())
 				&& !player.hasPerm(Permissions.EXEMPT_PVPTOGGLE_COOLDOWN)) {
-			final long secondsLeft = CombatUtils.getTimeLeft(player.getToggleTime(), Settings.getToggleCooldown());
-			player.message(Messages.getErrorPvpCooldown()
-					.replace("%m", Long.toString(secondsLeft <= 60 ? secondsLeft : secondsLeft - secondsLeft / 60 * 60)).replace("%t",
-							Long.toString(secondsLeft <= 60 ? 0 : secondsLeft / 60))); // TODO use replaceTime
+			final long timeLeft = CombatUtils.getTimeLeftMs(player.getToggleTime(), Settings.getToggleCooldown());
+			player.message(Messages.errorPvpCooldown.getMsg(TimeUtil.getDiffMsg(timeLeft)));
 			return false;
 		}
 		return true;

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

@@ -38,7 +38,7 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 				sendInfo(sender, ph.get(Bukkit.getPlayer(name)));
 				return true;
 			}
-			sender.sendMessage(Messages.getErrorPlayerNotFound(name));
+			sender.sendMessage(Messages.errorPlayerNotFound.getMsg(name));
 			return true;
 		}
 		return false;

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

@@ -34,22 +34,22 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 			sendList(sender, isPlayer);
 		} else if (args.length == 1 && args[0].equalsIgnoreCase("offline")) {
 			ScheduleUtils.runAsync(() -> {
-				sender.sendMessage(Messages.getPvpListTitle());
+				sender.sendMessage(Messages.pvpListTitle.getMsg());
 				sender.sendMessage(ChatColor.DARK_GRAY + "Gathering all offline players with PvP disabled, please wait...");
-				sender.sendMessage(Messages.getPvpListDisabled());
+				sender.sendMessage(Messages.pvpListDisabled.getMsg());
 				sender.sendMessage(ChatColor.GRAY + "  " + pvpListOffline());
 			});
 		}
 		return true;
 	}
 
 	private void sendList(final CommandSender sender, final boolean isPlayer) {
-		sender.sendMessage(Messages.getPvpListTitle());
+		sender.sendMessage(Messages.pvpListTitle.getMsg());
 
-		sender.sendMessage(Messages.getPvpListEnabled());
+		sender.sendMessage(Messages.pvpListEnabled.getMsg());
 		sender.sendMessage(ChatColor.GRAY + "  " + pvpList(sender, true, !isPlayer));
 
-		sender.sendMessage(Messages.getPvpListDisabled());
+		sender.sendMessage(Messages.pvpListDisabled.getMsg());
 		sender.sendMessage(ChatColor.GRAY + "  " + pvpList(sender, false, !isPlayer));
 	}
 
@@ -69,7 +69,7 @@ private String pvpListOffline() {
 				list.append(name).append(", ");
 		}
 		if (list.toString().isEmpty())
-			return Messages.getPvpListNoResults();
+			return Messages.pvpListNoResults.getMsg();
 		list.delete(list.length() - 2, list.length());
 		return list.toString();
 	}
@@ -83,7 +83,7 @@ private String pvpList(final CommandSender sender, final boolean enabled, final
 			}
 		}
 		if (list.toString().isEmpty())
-			return Messages.getPvpListNoResults();
+			return Messages.pvpListNoResults.getMsg();
 		list.delete(list.length() - 2, list.length());
 		return list.toString();
 	}

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

@@ -25,23 +25,23 @@ public final boolean onCommand(final CommandSender sender, final Command cmd, fi
 		if (args.length == 0 && sender instanceof final Player player) {
 			final CombatPlayer pvpPlayer = ph.get(player);
 			if (!pvpPlayer.hasPvPEnabled()) {
-				pvpPlayer.message(Messages.getSelfStatusDisabled());
+				pvpPlayer.message(Messages.selfStatusDisabled);
 				return true;
 			}
-			pvpPlayer.message(Messages.getSelfStatusEnabled());
+			pvpPlayer.message(Messages.selfStatusEnabled);
 			return true;
 		} else if (args.length == 1 && sender.hasPermission("pvpmanager.pvpstatus.others")) {
 			final String name = args[0];
 			if (CombatUtils.isOnline(name)) {
 				target = ph.get(Bukkit.getPlayer(name));
 				if (!target.hasPvPEnabled()) {
-					sender.sendMessage(Messages.getOthersStatusDisabled(name));
+					sender.sendMessage(Messages.othersStatusDisabled.getMsg(name));
 					return true;
 				}
-				sender.sendMessage(Messages.getOtherStatusEnabled(name));
+				sender.sendMessage(Messages.otherStatusEnabled.getMsg(name));
 				return true;
 			}
-			sender.sendMessage(Messages.getErrorPlayerNotFound(name));
+			sender.sendMessage(Messages.errorPlayerNotFound.getMsg(name));
 			return true;
 		}
 		return false;

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

@@ -12,6 +12,7 @@
 import me.chancesd.pvpmanager.setting.Permissions;
 import me.chancesd.pvpmanager.setting.Settings;
 import me.chancesd.pvpmanager.utils.CombatUtils;
+import me.chancesd.pvpmanager.utils.TimeUtil;
 
 public class Tag implements CommandExecutor {
 
@@ -26,10 +27,10 @@ public final boolean onCommand(final CommandSender sender, final Command command
 		if (args.length == 0 && sender instanceof final Player player) {
 			final CombatPlayer pvPlayer = ph.get(player);
 			if (!pvPlayer.isInCombat()) {
-				pvPlayer.message(Messages.getTagNotInCombat());
+				pvPlayer.message(Messages.tagNotInCombat.getMsg());
 			} else {
-				final long timeLeft = (pvPlayer.getTaggedTime() + Settings.getTimeInCombat() * 1000 - System.currentTimeMillis()) / 1000;
-				pvPlayer.message(String.format(Messages.getTagTimeLeft(), timeLeft));
+				final long timeLeft = pvPlayer.getTaggedTime() + Settings.getTimeInCombat() * 1000 - System.currentTimeMillis();
+				pvPlayer.message(Messages.tagTimeLeft.getMsg(TimeUtil.getDiffMsg(timeLeft)));
 			}
 			return true;
 		} else if (args.length == 1 && Permissions.ADMIN.hasPerm(sender)) {

pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook/worldguard/WorldGuardModernHook.java

@@ -103,14 +103,14 @@ public boolean shouldDisable(final Player damager, final Player defender, final
 	private void disableNewbieProtection(final CombatPlayer player) {
 		if (player.isNewbie()) {
 			player.setNewbie(false);
-			player.message(Messages.getNewbieForceRemovedWG());
+			player.message(Messages.newbieForceRemovedWG.getMsg());
 		}
 	}
 
 	private void disablePvP(final CombatPlayer player) {
 		if (!player.hasPvPEnabled()) {
 			player.setPvP(true);
-			player.message(Messages.getPvpForceEnabledWG());
+			player.message(Messages.pvpForceEnabledWG.getMsg());
 		}
 	}
 

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/EntityListener1_9.java

@@ -48,7 +48,7 @@ public void onEntityGlide(final EntityToggleGlideEvent event) {
 			return;
 		final CombatPlayer combatPlayer = ph.get((Player) event.getEntity());
 		if (combatPlayer.isInCombat()) {
-			combatPlayer.sendActionBar(Messages.getElytraBlockedInCombat(), 1000);
+			combatPlayer.sendActionBar(Messages.elytraBlockedInCombat.getMsg(), 1000);
 			event.setCancelled(true);
 		}
 	}

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/MoveListener.java

@@ -48,7 +48,7 @@ public final void onPlayerMove(final PlayerMoveEvent event) {
 			newVel.setY(newVel.getY() + 0.1).normalize().multiply(1.5);
 			player.setVelocity(newVel);
 			if (!cache.asMap().containsKey(event.getPlayer().getUniqueId())) {
-				pvplayer.message(Messages.getPushbackWarning());
+				pvplayer.message(Messages.pushbackWarning);
 				cache.put(player.getUniqueId(), player);
 			}
 		}

pvpmanager/src/main/java/me/chancesd/pvpmanager/listener/MoveListener1_9.java

@@ -56,7 +56,7 @@ public final void onPlayerMove(final PlayerMoveEvent event) {
 			CombatUtils.checkGlide(player);
 			player.setVelocity(sanitizeVector(newVel));
 			if (!cache.asMap().containsKey(player.getUniqueId())) {
-				pvplayer.message(Messages.getPushbackWarning());
+				pvplayer.message(Messages.pushbackWarning);
 				player.getWorld().playEffect(player.getEyeLocation(), Effect.SMOKE, 3);
 				cache.put(player.getUniqueId(), player);
 			}