From 2777e7d9aab3123da6bc92aa5ffcb8eac068b525 Mon Sep 17 00:00:00 2001 From: j502647092 Date: Thu, 30 Apr 2015 16:14:10 +0800 Subject: [PATCH] add auto fix message.yml function... --- src/com/me/tft_02/soulbound/Soulbound.java | 10 +++- .../soulbound/commands/BindCommand.java | 4 -- .../commands/BindOnEquipCommand.java | 2 - .../commands/BindOnPickupCommand.java | 2 - .../soulbound/commands/BindOnUseCommand.java | 2 - .../soulbound/commands/SoulboundCommand.java | 56 ++----------------- .../soulbound/commands/UnbindCommand.java | 3 - src/message.yml | 52 ++++++++--------- 8 files changed, 41 insertions(+), 90 deletions(-) diff --git a/src/com/me/tft_02/soulbound/Soulbound.java b/src/com/me/tft_02/soulbound/Soulbound.java index 55bf84f..50af87d 100644 --- a/src/com/me/tft_02/soulbound/Soulbound.java +++ b/src/com/me/tft_02/soulbound/Soulbound.java @@ -47,7 +47,15 @@ public class Soulbound extends JavaPlugin { public void onLoad() { this.saveResource("message.yml", false); msgfile = new File(this.getDataFolder(), "message.yml"); - msgConfig = Loadcfg(msgfile); + try { + LoadConfig (msgConfig ,msgfile); + } catch (FileNotFoundException e) { + this.saveResource("message.yml", false); + } catch (IOException e) { + this.getLogger().info("语言文件读取错误..."); + } catch (InvalidConfigurationException e) { + this.saveResource("message.yml", true); + } } diff --git a/src/com/me/tft_02/soulbound/commands/BindCommand.java b/src/com/me/tft_02/soulbound/commands/BindCommand.java index 458d4e0..f1dd19d 100644 --- a/src/com/me/tft_02/soulbound/commands/BindCommand.java +++ b/src/com/me/tft_02/soulbound/commands/BindCommand.java @@ -43,7 +43,6 @@ public class BindCommand implements CommandExecutor { case 2: if (!args[1].equalsIgnoreCase("inventory")) { sender.sendMessage(Soulbound.p.getlang("BIND_INVENTORY")); - //sender.sendMessage(ChatColor.RED + "Proper usage: " + ChatColor.GREEN + "/bind inventory"); return true; } @@ -67,7 +66,6 @@ public class BindCommand implements CommandExecutor { if ((itemInHand.getType() == Material.AIR) || ItemUtils.isSoulbound(itemInHand)) { sender.sendMessage(Soulbound.p.getlang("CAN_NOT_BIND")); - //sender.sendMessage(ChatColor.GRAY + "You can't " + soulbound + ChatColor.GRAY + "this item."); return false; } @@ -75,7 +73,6 @@ public class BindCommand implements CommandExecutor { if (ItemUtils.isSoulbound(itemInHand) && Config.getInstance().getFeedbackEnabled()) { sender.sendMessage(Soulbound.p.getlang("BINDED").replace("%target%", target.getName())); - //sender.sendMessage(ChatColor.GRAY + "Item is now " + soulbound + ChatColor.GRAY + "to " + ChatColor.DARK_AQUA + target.getName()); } return true; } @@ -91,7 +88,6 @@ public class BindCommand implements CommandExecutor { player.sendMessage(Soulbound.p.getlang("BIND_FULL_INEVNTORY"). replace("%player%", player.getName()). replace("%target%", target.getName())); - //player.sendMessage(ChatColor.GRAY + "All items in " + ChatColor.DARK_AQUA + player.getName() + ChatColor.GRAY + "'s inventory are now " + soulbound + ChatColor.GRAY + "to " + ChatColor.DARK_AQUA + target.getName()); } return true; } diff --git a/src/com/me/tft_02/soulbound/commands/BindOnEquipCommand.java b/src/com/me/tft_02/soulbound/commands/BindOnEquipCommand.java index f0dd8c9..bb3ef72 100644 --- a/src/com/me/tft_02/soulbound/commands/BindOnEquipCommand.java +++ b/src/com/me/tft_02/soulbound/commands/BindOnEquipCommand.java @@ -38,11 +38,9 @@ public class BindOnEquipCommand implements CommandExecutor { if (ItemUtils.isBindOnEquip(itemInHand)) { player.sendMessage(Soulbound.p.getlang("BIND_ON_EQUIP")); - //player.sendMessage(ChatColor.GRAY + "Item is now " + ChatColor.DARK_RED + "Bind on Equip"); } else { player.sendMessage(Soulbound.p.getlang("CAN_NOT_BIND_ON_EQUIP")); - //player.sendMessage(ChatColor.RED + "Cannot mark this item as " + ChatColor.DARK_RED + "Bind on Equip"); } return true; diff --git a/src/com/me/tft_02/soulbound/commands/BindOnPickupCommand.java b/src/com/me/tft_02/soulbound/commands/BindOnPickupCommand.java index 0d2b664..448940f 100644 --- a/src/com/me/tft_02/soulbound/commands/BindOnPickupCommand.java +++ b/src/com/me/tft_02/soulbound/commands/BindOnPickupCommand.java @@ -30,14 +30,12 @@ public class BindOnPickupCommand implements CommandExecutor { if ((itemInHand.getType() == Material.AIR) || ItemUtils.isSoulbound(itemInHand)) { sender.sendMessage(Soulbound.p.getlang("CAN_NOT_BIND_ON_PICKUP")); - //player.sendMessage(ChatColor.GRAY + "You can't " + ChatColor.GOLD + "Soulbound " + ChatColor.GRAY + "this item."); return false; } ItemUtils.unbindItem(itemInHand); ItemUtils.bopItem(itemInHand); sender.sendMessage(Soulbound.p.getlang("BIND_ON_PICKUP")); - //player.sendMessage(ChatColor.GRAY + "Item is now " + ChatColor.DARK_RED + "Bind on pickup"); return true; default: diff --git a/src/com/me/tft_02/soulbound/commands/BindOnUseCommand.java b/src/com/me/tft_02/soulbound/commands/BindOnUseCommand.java index 7267d2d..60caea7 100644 --- a/src/com/me/tft_02/soulbound/commands/BindOnUseCommand.java +++ b/src/com/me/tft_02/soulbound/commands/BindOnUseCommand.java @@ -30,14 +30,12 @@ public class BindOnUseCommand implements CommandExecutor { if ((itemInHand.getType() == Material.AIR) || ItemUtils.isSoulbound(itemInHand)) { sender.sendMessage(Soulbound.p.getlang("CAN_NOT_BIND_ON_USE")); - //player.sendMessage(ChatColor.GRAY + "You can't " + ChatColor.GOLD + "Soulbound " + ChatColor.GRAY + "this item."); return false; } ItemUtils.unbindItem(itemInHand); ItemUtils.bouItem(itemInHand); sender.sendMessage(Soulbound.p.getlang("BIND_ON_USE")); - //player.sendMessage(ChatColor.GRAY + "Item is now " + ChatColor.DARK_RED + "Bind on Use"); return true; default: return false; diff --git a/src/com/me/tft_02/soulbound/commands/SoulboundCommand.java b/src/com/me/tft_02/soulbound/commands/SoulboundCommand.java index 33e73f4..0cbf025 100644 --- a/src/com/me/tft_02/soulbound/commands/SoulboundCommand.java +++ b/src/com/me/tft_02/soulbound/commands/SoulboundCommand.java @@ -21,6 +21,11 @@ public class SoulboundCommand implements CommandExecutor { if (args[0].equalsIgnoreCase("reload")) { return reloadConfiguration(sender); } + if (args[0].equalsIgnoreCase("help") + || args[0].equalsIgnoreCase("?")) { + getHelpPage(1, sender); + return true; + } default: if (args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("?")) { @@ -60,15 +65,8 @@ public class SoulboundCommand implements CommandExecutor { if (page > maxPages) { sender.sendMessage(Soulbound.p.getlang("PAGE_NOT_EXIST". replace("%maxPages%", maxPages+""))); - //sender.sendMessage(ChatColor.RED + "This page does not exist." - //+ ChatColor.GOLD + " /help [0-" + maxPages + "]"); return; } - - //String dot = ChatColor.DARK_RED + "* "; -// sender.sendMessage(ChatColor.GRAY + "-----[ " + ChatColor.GOLD -// + "Soulbound Help" + ChatColor.GRAY + " ]----- Page " + page -// + "/" + maxPages); sender.sendMessage(Soulbound.p.getlang("HELP_TITLE"). replace("%page%", page+""). replace("%maxPages%", maxPages+"") @@ -81,79 +79,37 @@ public class SoulboundCommand implements CommandExecutor { sender.sendMessage(Soulbound.p.getlang("HOW_DOES_IT_WORK_4")); sender.sendMessage(Soulbound.p.getlang("HOW_DOES_IT_WORK_5")); sender.sendMessage(Soulbound.p.getlang("HOW_DOES_IT_WORK_6")); - -// sender.sendMessage(ChatColor.GOLD + "How does it work?"); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "Soulbound items are special items which are bound to a sender."); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "Players are prevented from doing certain actions with Soulbound items, such as:"); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "dropping them on the ground, storing them in chests or giving them to other players."); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "Items marked as 'Bind on Pickup' will get Soulbound as soon as they get picked up."); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "Items marked as 'Bind on Use' will get Soulbound as soon as they get used."); -// sender.sendMessage(dot -// + ChatColor.GRAY -// + "Items marked as 'Bind on Equip' will get Soulbound as soon as they get equipped."); + } if (page == 2) { sender.sendMessage(Soulbound.p.getlang("CMD")); - //sender.sendMessage(ChatColor.GOLD + "Commands:"); if (sender.hasPermission("soulbound.commands.bind")) { sender.sendMessage(Soulbound.p.getlang("CMDVERSION")); - //sender.sendMessage(dot + ChatColor.GREEN + "/soulbound" - //+ ChatColor.GRAY + " Check the status of the plugin."); } if (sender.hasPermission("soulbound.commands.bind")) { sender.sendMessage(Soulbound.p.getlang("CMD_BIND")); - //sender.sendMessage(dot + ChatColor.GREEN + "/bind " - //+ ChatColor.GRAY - //+ " Soulbound the item currently in hand."); sender.sendMessage(Soulbound.p.getlang("CMD_BIND_FULL_INVENTORY")); - //sender.sendMessage(dot + ChatColor.GREEN - //+ "/bind inventory" + ChatColor.GRAY - //+ " Soulbound an entire inventory."); } if (sender.hasPermission("soulbound.commands.bindonpickup")) { sender.sendMessage(Soulbound.p.getlang("CMD_BIND_ON_PICKUP")); - //sender.sendMessage(dot + ChatColor.GREEN + "/bindonpickup" - //+ ChatColor.GRAY - //+ " Mark the item in hand as 'Bind on Pickup'"); } if (sender.hasPermission("soulbound.commands.bindonuse")) { sender.sendMessage(Soulbound.p.getlang("CMD_BIND_ON_USE")); - //sender.sendMessage(dot + ChatColor.GREEN + "/bindonuse" - //+ ChatColor.GRAY - //+ " Mark the item in hand as 'Bind on Use'"); } if (sender.hasPermission("soulbound.commands.bindonequip")) { sender.sendMessage(Soulbound.p.getlang("CMD_BIND_ON_EQUIP")); - //sender.sendMessage(dot + ChatColor.GREEN + "/bindonequip" - //+ ChatColor.GRAY - //+ " Mark the item in hand as 'Bind on Equip'"); } if (sender.hasPermission("soulbound.commands.unbind")) { sender.sendMessage(Soulbound.p.getlang("CMD_UNBIND")); - //sender.sendMessage(dot + ChatColor.GREEN + "/unbind" - //+ ChatColor.GRAY + " Unbind the item in hand."); } } if (nextPage <= maxPages) { sender.sendMessage(Soulbound.p.getlang("CMD_NEXT").replace("%nextPage%", nextPage+"")); - //sender.sendMessage(ChatColor.GOLD + "Type /soulbound help " - //+ nextPage + " for more"); } } private boolean printUsage(CommandSender sender) { sender.sendMessage(Soulbound.p.getlang("CMD_USE")); - //sender.sendMessage("Usage: /soulbound [reload | help]"); return false; } } diff --git a/src/com/me/tft_02/soulbound/commands/UnbindCommand.java b/src/com/me/tft_02/soulbound/commands/UnbindCommand.java index 109f063..c67268b 100644 --- a/src/com/me/tft_02/soulbound/commands/UnbindCommand.java +++ b/src/com/me/tft_02/soulbound/commands/UnbindCommand.java @@ -30,17 +30,14 @@ public class UnbindCommand implements CommandExecutor { if ((itemInHand.getType() == Material.AIR) || !ItemUtils.isSoulbound(itemInHand)) { player.sendMessage(Soulbound.p.getlang("CAN_NOT_UNBIND")); - //player.sendMessage(ChatColor.GRAY + "You can't " + ChatColor.GOLD + "Unbind " + ChatColor.GRAY + "this item."); return false; } if (ItemUtils.unbindItem(itemInHand)==null ){ player.sendMessage(Soulbound.p.getlang("CAN_NOT_UNBIND")); - //player.sendMessage(ChatColor.GRAY + "You can't " + ChatColor.GOLD + "Unbind " + ChatColor.GRAY + "this item."); return false; } player.sendMessage(Soulbound.p.getlang("UNBINDED")); - //player.sendMessage(ChatColor.GRAY + "Item no longer Soulbound."); return true; default: return false; diff --git a/src/message.yml b/src/message.yml index 88205a1..d53adaf 100644 --- a/src/message.yml +++ b/src/message.yml @@ -1,40 +1,40 @@ #ʾϢ Message: - CAN_NOT_BIND: '&8㲻&c&8Ʒ' - CAN_NOT_UNBIND: '&8㲻&6&8Ʒ' + CAN_NOT_BIND: '&7㲻&c&7Ʒ' + CAN_NOT_UNBIND: '&7㲻&6&7Ʒ' - BINDED: '&8ƷѾ&a&8&c%target%' - UNBINDED: '&8ƷѾ' + BINDED: '&7ƷѾ&a&7&c%target%' + UNBINDED: '&7ƷѾ' BIND_FULL_INEVNTORY: '&a&c%player%&aڵƷѰ󶨵&6%target%' - BIND_INVENTORY: '&4Ҫ: &a/bind inventory' + BIND_INVENTORY: '&cҪ: &a/bind inventory' - BIND_ON_EQUIP: '&8ǰƷѱΪ &4װ' - BIND_ON_PICKUP: '&8ǰƷѱΪ &4ʰȡ' - BIND_ON_USE: '&8ǰƷѱΪ &4ʹú' + BIND_ON_EQUIP: '&7ǰƷѱΪ &4װ' + BIND_ON_PICKUP: '&7ǰƷѱΪ &4ʰȡ' + BIND_ON_USE: '&7ǰƷѱΪ &4ʹú' - CAN_NOT_BIND_ON_EQUIP: '&8ǰƷܱΪ &4װ' - CAN_NOT_BIND_ON_PICKUP: '&8ǰƷܱΪ &4ʰȡ' - CAN_NOT_BIND_ON_USE: '&8ǰƷܱΪ &4ʹú' + CAN_NOT_BIND_ON_EQUIP: '&7ǰƷܱΪ &4װ' + CAN_NOT_BIND_ON_PICKUP: '&7ǰƷܱΪ &4ʰȡ' + CAN_NOT_BIND_ON_USE: '&7ǰƷܱΪ &4ʹú' VERSION: '(޸by) 汾ţ' CAN_NOT_USE_ON_CONSOLE: 'Ǹ ڿ̨ʹ' PAGE_NOT_EXIST: '&cҳ治 /Soulbound help [0-%maxPages%]' - HELP_TITLE: '&8--[ & -by -޸by &8 ]-- ҳ %page%/%maxPages%' - HOW_DOES_IT_WORK: '&4* ιģ' - HOW_DOES_IT_WORK_1: '&4* 󶨵ƷֻԼʹá' - HOW_DOES_IT_WORK_2: '&4* 󶨺ƷijЩΪᱻֹ:' - HOW_DOES_IT_WORK_3: '&4* ڵϡ߷ŵá' - HOW_DOES_IT_WORK_4: '&4* Ϊ ʰȡ ƷһҼͻ󶨳ΪҵƷ' - HOW_DOES_IT_WORK_5: '&4* Ϊ ʹú ƷֻҪҼͻ󶨳ΪҵƷ' - HOW_DOES_IT_WORK_6: '&4* Ϊ װ ƷװϺ󶨳ΪҵƷ' + HELP_TITLE: '&7--[ &6 &a-by &c-޸by &7 ]-- ҳ %page%/%maxPages%' + HOW_DOES_IT_WORK: '&c* ιģ' + HOW_DOES_IT_WORK_1: '&c* 󶨵ƷֻԼʹá' + HOW_DOES_IT_WORK_2: '&c* 󶨺ƷijЩΪᱻֹ:' + HOW_DOES_IT_WORK_3: '&c* ڵϡ߷ŵá' + HOW_DOES_IT_WORK_4: '&c* Ϊ ʰȡ Ʒ\nһҼͻ󶨳ΪҵƷ' + HOW_DOES_IT_WORK_5: '&c* Ϊ ʹú Ʒ\nֻҪҼͻ󶨳ΪҵƷ' + HOW_DOES_IT_WORK_6: '&c* Ϊ װ Ʒ\nװϺ󶨳ΪҵƷ' CMD: '&6ָ:' - CMDVERSION: '&4* &a/soulbound &8鿴汾' - CMD_BIND: '&4* &a/bind &8ϵƷ' - CMD_BIND_FULL_INVENTORY: '&4* &a/bind inventory &8ұƷ' - CMD_BIND_ON_EQUIP: '&4* &a/bindonequip &8ǰƷΪ &4װ' - CMD_BIND_ON_PICKUP: '&4* &a/bindonpickup &8ǰƷΪ &4ʰȡ' - CMD_BIND_ON_USE: '&4* &a/bindonuse &8ǰƷΪ &4ʹú' - CMD_UNBIND: '&4* &a/unbind &8Ʒİ󶨡' + CMDVERSION: '&4* &a/soulbound &7鿴汾' + CMD_BIND: '&4* &a/bind &7ϵƷ' + CMD_BIND_FULL_INVENTORY: '&4* &a/bind inventory &7ұƷ' + CMD_BIND_ON_EQUIP: '&4* &a/bindonequip &7ǰƷΪ &4װ' + CMD_BIND_ON_PICKUP: '&4* &a/bindonpickup &7ǰƷΪ &4ʰȡ' + CMD_BIND_ON_USE: '&4* &a/bindonuse &7ǰƷΪ &4ʹú' + CMD_UNBIND: '&4* &a/unbind &7Ʒİ󶨡' CMD_NEXT: '&6ʹ /soulbound help %nextPage% 鿴' CMD_USE: 'ʹ: /soulbound [reload | help]' \ No newline at end of file