From 72a05bedcee766a169f724073270c01f44f6e575 Mon Sep 17 00:00:00 2001 From: Thijs Wiefferink Date: Sat, 11 Jun 2016 22:40:09 +0200 Subject: [PATCH] Merge personal/all help messages. --- .../areashop/commands/AddfriendCommand.java | 4 +--- .../areashop/commands/DelfriendCommand.java | 4 +--- .../areashop/commands/ResellCommand.java | 4 +--- .../areashop/commands/SellCommand.java | 4 +--- .../areashop/commands/SetteleportCommand.java | 4 +--- .../areashop/commands/StopresellCommand.java | 4 +--- .../areashop/commands/TeleportCommand.java | 4 +--- .../areashop/commands/UnrentCommand.java | 4 +--- AreaShop/src/main/resources/lang/EN.yml | 20 ++++++------------- 9 files changed, 14 insertions(+), 38 deletions(-) diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java index 1e828c1..6c313b8 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java @@ -26,9 +26,7 @@ public class AddfriendCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.addfriendall")) { - return "help-addFriendAll"; - } else if(target.hasPermission("areashop.addfriend")) { + if(target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) { return "help-addFriend"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java index cc85f0c..d20e92f 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java @@ -26,9 +26,7 @@ public class DelfriendCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.delfriendall")) { - return "help-delFriendAll"; - } else if(target.hasPermission("areashop.delfriend")) { + if(target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) { return "help-delFriend"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java index 393786b..c7ba306 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java @@ -22,9 +22,7 @@ public class ResellCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.resellall")) { - return "help-resellAll"; - } else if(target.hasPermission("areashop.resell")) { + if(target.hasPermission("areashop.resellall") || target.hasPermission("areashop.resell")) { return "help-resell"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java index 64109f6..19e8385 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java @@ -23,10 +23,8 @@ public class SellCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.sell")) { + if(target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) { return "help-sell"; - } else if(target.hasPermission("areashop.sellown")) { - return "help-sellOwn"; } return null; } diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java index 471bd94..77a7230 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java @@ -25,9 +25,7 @@ public class SetteleportCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.teleportall")) { - return "help-setteleportAll"; - } else if(target.hasPermission("areashop.teleport")) { + if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) { return "help-setteleport"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java index 21f81f3..99925ff 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java @@ -22,9 +22,7 @@ public class StopresellCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.stopresellall")) { - return "help-stopResellAll"; - } else if(target.hasPermission("areashop.stopresell")) { + if(target.hasPermission("areashop.stopresellall") || target.hasPermission("areashop.stopresell")) { return "help-stopResell"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java index 9049958..dcbc9c1 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java @@ -21,9 +21,7 @@ public class TeleportCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.teleportall")) { - return "help-teleportAll"; - } else if(target.hasPermission("areashop.teleport")) { + if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) { return "help-teleport"; } return null; diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java index 95494bc..b9425cc 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java @@ -23,10 +23,8 @@ public class UnrentCommand extends CommandAreaShop { @Override public String getHelp(CommandSender target) { - if(target.hasPermission("areashop.unrent")) { + if(target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) { return "help-unrent"; - } else if(target.hasPermission("areashop.unrentown")) { - return "help-unrentOwn"; } return null; } diff --git a/AreaShop/src/main/resources/lang/EN.yml b/AreaShop/src/main/resources/lang/EN.yml index a38bfb0..9892a28 100644 --- a/AreaShop/src/main/resources/lang/EN.yml +++ b/AreaShop/src/main/resources/lang/EN.yml @@ -62,17 +62,13 @@ help-info: "%lang:helpCommand|/as info|% Get info about current regions." help-rent: "%lang:helpCommand|/as rent|% Rent a region or extend your current rent." help-buy: "%lang:helpCommand|/as buy|% Buy a region." help-unrent: "%lang:helpCommand|/as unrent|% Unrent a region." -help-unrentOwn: "%lang:helpCommand|/as unrent|% Unrent your own region." help-sell: "%lang:helpCommand|/as sell|% Sell a region." -help-sellOwn: "%lang:helpCommand|/as sell|% Sell your own region." help-reload: "%lang:helpCommand|/as reload|% Reload all files and update the regions." help-setrestore: "%lang:helpCommand|/as setrestore|% Set restoring on/off and choose profile." help-setprice: "%lang:helpCommand|/as setprice|% Change the price of a region." help-setduration: "%lang:helpCommand|/as setduration|% Change the duration of a rent region." -help-teleport: "%lang:helpCommand|/as tp|% Teleport to your bought/rented regions." -help-teleportAll: "%lang:helpCommand|/as tp|% Teleport to a rent/buy region." -help-setteleport: "%lang:helpCommand|/as settp|% Set teleport position for bought/rented regions." -help-setteleportAll: "%lang:helpCommand|/as settp|% Set teleport position for a region." +help-teleport: "%lang:helpCommand|/as tp|% Teleport to a rent/buy region." +help-setteleport: "%lang:helpCommand|/as settp|% Set teleport position for a region." help-find: "%lang:helpCommand|/as find|% Find an empty buy or rent." help-groupadd: "%lang:helpCommand|/as groupadd|% Add a region to a group." help-groupdel: "%lang:helpCommand|/as groupdel|% Delete a region from a group." @@ -85,14 +81,10 @@ help-addsign: "%lang:helpCommand|/as addsign|% Add a sign to an existing region. help-delsign: "%lang:helpCommand|/as delsign|% Delete the sign you are looking at." help-me: "%lang:helpCommand|/as me|% Check which regions you have (+expiration)." help-setowner: "%lang:helpCommand|/as setowner|% Set region owner or extend the rent." -help-resell: "%lang:helpCommand|/as resell|% Put one of your regions into resell mode." -help-resellAll: "%lang:helpCommand|/as resell|% Put a region into resell mode." -help-stopResell: "%lang:helpCommand|/as stopresell|% Put your region back into sold mode." -help-stopResellAll: "%lang:helpCommand|/as stopresell|% Put a region back into sold mode." -help-addFriend: "%lang:helpCommand|/as addfriend|% Add a friend to your region." -help-addFriendAll: "%lang:helpCommand|/as addfriend|% Add a friend to a region." -help-delFriend: "%lang:helpCommand|/as delfriend|% Delete a friend from your region." -help-delFriendAll: "%lang:helpCommand|/as delfriend|% Delete a friend from a region." +help-resell: "%lang:helpCommand|/as resell|% Put a region into resell mode." +help-stopResell: "%lang:helpCommand|/as stopresell|% Put a region back into sold mode." +help-addFriend: "%lang:helpCommand|/as addfriend|% Add a friend to a region." +help-delFriend: "%lang:helpCommand|/as delfriend|% Delete a friend from a region." help-linksigns: "%lang:helpCommand|/as linksigns|% Use bulk sign linking mode." help-stack: "%lang:helpCommand|/as stack|% Create multiple regions and add them." help-setlandlord: "%lang:helpCommand|/as setlandlord|% Set the landlord of a region."