diff --git a/src/main/java/net/kuraczyk/banhammer/cmds/Ban.java b/src/main/java/net/kuraczyk/banhammer/cmds/Ban.java index b3a85e2..0091d09 100644 --- a/src/main/java/net/kuraczyk/banhammer/cmds/Ban.java +++ b/src/main/java/net/kuraczyk/banhammer/cmds/Ban.java @@ -45,10 +45,10 @@ public class Ban implements CommandExecutor { if(args.length>=2) scope=args[1]; if(args.length>=3) { duration=args[2]; - String regex = "^\\d+:(s|m|h|d)$"; + String regex = "^(perm)|(-1)|\\d+:(s|m|h|d)$"; String regexOnlyNum = "^\\d+$"; if(!(duration.matches(regex) || duration.matches(regexOnlyNum))) { - p.sendMessage(TextUtils.colorString(plugin.translations.getString("command.ban.durationFormatError"))); + p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.ban.durationFormatError")))); return false; } char type = plugin.config.getString("defaultDurationType").charAt(0); @@ -76,7 +76,7 @@ public class Ban implements CommandExecutor { banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.SECONDS.toMillis(time)); break; default: - p.sendMessage(TextUtils.colorString(plugin.translations.getString("command.ban.durationFormatError"))); + p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.ban.durationFormatError")))); return false; } } @@ -96,7 +96,7 @@ public class Ban implements CommandExecutor { if(target!=null) if(target.isOnline()) if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanPerm"), b))); - p.sendMessage(TextUtils.colorString(resolveBanMessagePlaceholders(plugin.translations.getString("command.ban.successfulBanMessagePerm"), args[0], scope, reason, p.getName()))); + p.sendMessage(TextUtils.colorString(resolveBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.ban.successfulBanMessagePerm")), args[0], scope, reason, p.getName()))); Bukkit.broadcast(TextUtils.colorString(resolveBanMessagePlaceholders(plugin.translations.getString("command.ban.banPublicAnnouncementPerm"), args[0], scope, reason, p.getName()))); } else { @@ -113,7 +113,7 @@ public class Ban implements CommandExecutor { if(target!=null) if(target.isOnline()) if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanTemp"), b))); - p.sendMessage(TextUtils.colorString(resolveBanMessagePlaceholders(plugin.translations.getString("command.ban.successfulBanMessageTemp"), args[0], scope, reason, p.getName(), parsedBanDuration))); + p.sendMessage(TextUtils.colorString(resolveBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.ban.successfulBanMessageTemp")), args[0], scope, reason, p.getName(), parsedBanDuration))); Bukkit.broadcast(TextUtils.colorString(resolveBanMessagePlaceholders(plugin.translations.getString("command.ban.banPublicAnnouncementTemp"), args[0], scope, reason, p.getName(), parsedBanDuration))); } @@ -121,7 +121,7 @@ public class Ban implements CommandExecutor { } else { plugin.getLogger().severe("BanHammer: Something went wrong while user used ban command... Maybe DB or Technician has skill issue???"); - p.sendMessage(TextUtils.colorString(plugin.translations.getString("command.ban.unexpectedError"))); + p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.ban.unexpectedError")))); return false; } diff --git a/src/main/resources/translations.yml b/src/main/resources/translations.yml index 1e50fea..b737c9d 100644 --- a/src/main/resources/translations.yml +++ b/src/main/resources/translations.yml @@ -1,30 +1,66 @@ -prefix: 'BanHammer <#808080>- ' +prefix: "<#383838>[<#e63030>!<#383838>] " default: - reason: 'No reason provided.' + reason: "Nie podano powodu." banKickMessage: playerBanPerm: |- - <#FF5744>You are banned from this server! - Reason: <#C03221>{reason} + <#383838> BanHammer <#383838> + + <#AAAAAA>Zostałeś <#e63030>permanentnie zbanowany! + + + <#AAAAAA>Powód: <#e63030>{reason} + + + <#555555>(BanID: <#b64141>{banId}) + <#383838> playerBanTemp: |- - <#FF5744>You are banned from this server! - <#FF5744>Time left: <#C03221>{timeLeft} - <#FF5744>Reason: <#C03221>{reason} + <#383838> BanHammer <#383838> + + <#AAAAAA>Zostałeś <#e63030>tymczasowo zbanowany na <#e63030>{timeLeft}! + + + <#AAAAAA>Powód: <#e63030>{reason} + + + <#555555>(BanID: <#b64141>{banId}) + <#383838> ipBanPerm: |- - <#FF5744>You are IP-banned from this server! - Reason: <#C03221>{reason} + <#383838> BanHammer <#383838> + + <#AAAAAA>Zostałeś <#e63030>permanentnie zbanowany! + + + <#AAAAAA>Powód: <#e63030>{reason} + + + <#555555>(BanID: <#b64141>{banId}) + <#383838> ipBanTemp: |- - <#FF5744>You are IP-banned from this server! - <#FF5744>Time left: <#C03221>{timeLeft} - <#FF5744>Reason: <#C03221>{reason} + <#383838> BanHammer <#383838> + + <#AAAAAA>Zostałeś <#e63030>tymczasowo zbanowany na <#e63030>{timeLeft}! + + + <#AAAAAA>Powód: <#e63030>{reason} + + + <#555555>(BanID: <#b64141>{banId}) + <#383838> command: ban: - usage: '<#ffffff>Usage: <#FF5744>/ban ' - durationFormatError: 'Error: bad duration syntax. Available syntax: ":d", ":h", ":m", ":s"' - unexpectedError: 'Error: something went terribly wrong. Please contact someone who knows what he is doing.' - successfulBanMessagePerm: 'Successfully banned {player} in scope {scope} for reason {reason}' - successfulBanMessageTemp: 'Successfully banned {player} for {duration} in scope {scope} for reason {reason}' - banPublicAnnouncementPerm: 'Player {player} was banned by operator {operator} in scope {scope} for reason {reason}' - banPublicAnnouncementTemp: 'Player {player} was banned by operator {operator} for {duration} in scope {scope} for reason {reason}' \ No newline at end of file + usage: "<#ffffff>Użycie: <#FF5744>/ban " + durationFormatError: "<#e63030>Błąd! <#AAAAAA>Niepoprawny format <#e63030>długości kary." + unexpectedError: "<#AAAAAA>Wystąpił <#e63030>nieoczekiwany błąd! Koniecznie skontaktuj się z <#e63030>dowolnym technicznym." + successfulBanMessagePerm: "<#AAAAAA>Pomyślnie zbanowano <#e63030>{player} w zakresie <#e63030>{scope} za <#e63030>{reason}" + successfulBanMessageTemp: "<#AAAAAA>Pomyślnie zbanowano <#e63030>{player} na <#e63030>{duration} w zakresie <#e63030>{scope} za <#e63030>{reason}" + banPublicAnnouncementPerm: |- + <#383838> + <#383838>[BanHammer<#383838>] <#b64141>Gracz <#e63030>{player} został zbanowany przez <#e63030>{operator} za <#e63030>{reason} + <#383838> + banPublicAnnouncementTemp: |- + <#383838> + <#383838>[BanHammer<#383838>] <#b64141>Gracz <#e63030>{player} Został zbanowany przez <#e63030>{operator} na <#e63030>{duration} za <#e63030>{reason} + <#383838> \ No newline at end of file