diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java index 0ccde73d..15b1d032 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java @@ -26,7 +26,7 @@ public class CmdFocus extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("ffocus.Enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Focus"); return; } FPlayer target = context.argAsFPlayer(0); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java b/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java index 74a9826d..9d2a18e5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java @@ -27,7 +27,7 @@ public class CmdGetVault extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) { - context.fPlayer.sendMessage("This command is disabled!"); + context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults"); return; } Location vaultLocation = context.faction.getVault(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java b/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java index d4017bb7..e971aa85 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java @@ -36,7 +36,7 @@ public class CmdInventorySee extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-inventory-see.Enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Inventory See"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java index 251367ec..f41ea8e6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java @@ -25,7 +25,7 @@ public class CmdPaypalSee extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fpaypal.Enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Paypals"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java index 2f6bd70f..13fefc9b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java @@ -29,7 +29,7 @@ public class CmdPaypalSet extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fpaypal.Enabled")) { - context.fPlayer.msg(TL.GENERIC_DISABLED); + context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Paypals"); return; } if (context.fPlayer.getRole() != Role.LEADER && !context.fPlayer.isAdminBypassing()) { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java b/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java index 4522466d..60c2685e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java @@ -25,7 +25,7 @@ public class CmdSeeDiscord extends FCommand{ @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fdiscord.Enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Discords"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdVault.java b/src/main/java/com/massivecraft/factions/cmd/CmdVault.java index 0041951f..f6f7015a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdVault.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdVault.java @@ -32,7 +32,7 @@ public class CmdVault extends FCommand { public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) { - context.fPlayer.sendMessage("This command is disabled!"); + context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java b/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java index 4cbd7456..90e7add7 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java @@ -26,7 +26,7 @@ public class CmdViewChest extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fchest.Enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Chests"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java index 5ec4b905..18946d43 100644 --- a/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java +++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdAlts.java @@ -37,7 +37,7 @@ public class CmdAlts extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-alts.Enabled", false)) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Alts"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java index 7968ef7a..5f507fd4 100644 --- a/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java +++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdInviteAlt.java @@ -34,7 +34,7 @@ public class CmdInviteAlt extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-alts.Enabled", false)) { - context.fPlayer.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Alts"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java b/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java index 17f3cbcd..bf036482 100644 --- a/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java +++ b/src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java @@ -37,7 +37,7 @@ public class CmdKickAlt extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-alts.Enabled", false)) { - context.fPlayer.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Alts"); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/chest/CmdChest.java b/src/main/java/com/massivecraft/factions/cmd/chest/CmdChest.java index 89dba5a0..6c85c2db 100644 --- a/src/main/java/com/massivecraft/factions/cmd/chest/CmdChest.java +++ b/src/main/java/com/massivecraft/factions/cmd/chest/CmdChest.java @@ -30,7 +30,7 @@ public class CmdChest extends FCommand { if (!FactionsPlugin.getInstance().getConfig().getBoolean("fchest.Enabled")) { - context.fPlayer.sendMessage("This command is disabled!"); + context.msg(TL.GENERIC_DISABLED, "Faction Chests"); return; } // This permission check is way too explicit but it's clean diff --git a/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java index 6a243c29..058551a8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java +++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java @@ -36,7 +36,7 @@ public class CmdCorner extends FCommand { @Override public void perform(CommandContext context) { if (FactionsPlugin.getInstance().mc17) { - context.player.sendMessage(ChatColor.RED + "This command is disabled!"); + context.msg(TL.GENERIC_DISABLED, "Faction Corners"); return; } FLocation to = new FLocation(context.player.getLocation()); diff --git a/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java index 58ab2028..fa8ae079 100644 --- a/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java +++ b/src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java @@ -35,7 +35,7 @@ public class CmdPoints extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-points.Enabled", true)) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.GENERIC_DISABLED, "Faction Points"); return; } context.commandChain.add(this); diff --git a/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java b/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java index 66223b0b..4a106d0d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java +++ b/src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java @@ -43,7 +43,7 @@ public class CmdTntFill extends FCommand { @Override public void perform(CommandContext context) { if (!FactionsPlugin.instance.getConfig().getBoolean("Tntfill.enabled")) { - context.msg(TL.GENERIC_DISABLED); + context.msg(TL.COMMAND_TNT_DISABLED_MSG); return; } diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index 72b6722a..8f75c318 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -1031,7 +1031,7 @@ public enum TL { GENERIC_FACTIONLESS("factionless"), GENERIC_SERVERADMIN("A server admin"), GENERIC_SERVER("Server"), - GENERIC_DISABLED("disabled"), + GENERIC_DISABLED("&c&l[!] &7The feature &b%1$s &7is currently disabled."), GENERIC_ENABLED("enabled"), GENERIC_INFINITY("∞"), GENERIC_NULLPLAYER("null player"),