Linux support & English Answer Support

Author: xiaohuihui1022

src/main/java/top/mpt/huihui/answerit/Main.java

@@ -38,10 +38,9 @@ public void onEnable() {
         // config
         getConfig().options().copyDefaults();
         saveDefaultConfig();
-        File file = new File(getDataFolder() + "\\lang\\", getConfig().getString("lang"));
+        File file = new File(getDataFolder() + "/lang/", getConfig().getString("lang"));
         saveResource("lang/zh_cn.yml", false);
         saveResource("lang/en_us.yml", false);
-
         config = YamlConfiguration.loadConfiguration(file);
         i18N.setYaml(config);
 

src/main/java/top/mpt/huihui/answerit/commands/impl/q.java

@@ -53,11 +53,15 @@ public boolean onCommand(CommandSender sender, String[] args) {
             // 接收问答的人
             // 给event传参用
             target = Bukkit.getPlayer(args[0]);
+            if (target == null){
+                PlayerUtils.send(sender, i18N.getLang("player_err"));
+                return true;
+            }
 
             if (Objects.equals(args[2], "select") || Objects.equals(args[2], "Select")){
                 // 给玩家发送消息
                 PlayerUtils.send(sender, i18N.getLang("select.player_choose_answer"));
-                // 定义回答文本
+                // 定义回答文本(仅程序，不影响玩家)
                 StringBuilder answerText = new StringBuilder();
                 // 判断回答文本
                 for (int a = 3; a <= args.length - 1; a++){
@@ -70,9 +74,9 @@ public boolean onCommand(CommandSender sender, String[] args) {
                 // for循环
                 for (int i = 3; i <= args.length - 1; i++){
                     TextComponent single = new TextComponent(
-                            ChatUtils.translateColor("#BLUE#[#GREEN#" + args[i] + "#BLUE#]#RESET#  ")
+                            ChatUtils.translateColor("#BLUE#[#GREEN#" + args[i].replace("-", " ") + "#BLUE#]#RESET#  ")
                     );
-                    ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/answer setanswer " + target.getName() + " " + args[i] + " select " + args[1] + " " + answerText);
+                    ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/answer setanswer " + target.getName() + " " + args[i] + " Select " + args[1] + " " + answerText);
                     single.setClickEvent(clickEvent);
                     // 判断TextComponent应该怎么叠
                     if (i == 3){

src/main/java/top/mpt/huihui/answerit/commands/impl/reload.java

@@ -19,7 +19,7 @@ public reload(){
     public boolean onCommand(CommandSender sender, String[] args) {
         JavaPlugin main = getPlugin(Main.class);
         main.reloadConfig();
-        File file = new File(main.getDataFolder() + "\\lang", main.getConfig().getString("lang"));
+        File file = new File(main.getDataFolder() + "/lang/", main.getConfig().getString("lang"));
         config = YamlConfiguration.loadConfiguration(file);
         i18N.setYaml(config);
         sender.sendMessage("[AnswerIt] Plugin Reload Completed");

src/main/java/top/mpt/huihui/answerit/commands/impl/send.java

@@ -22,6 +22,7 @@ public send(){
     public boolean onCommand(CommandSender sender, String[] args){
         // args[0] == 答对啦！
         // args[1] == NameFlying(提问者)
+        System.out.println(prize.canPrize);
         if (sender instanceof Player){
             if (!prize.canPrize){
                 PlayerUtils.send(sender, i18N.getLang("global.player_cant_answer"));

src/main/java/top/mpt/huihui/answerit/commands/impl/setAnswer.java

@@ -82,7 +82,7 @@ public void sendQuestion(Player sender, String type, String text){
 
             for (int i = 0; i <= answerText.length - 1; i++){
                 TextComponent single = new TextComponent(
-                        ChatUtils.translateColor("#BLUE#[#GREEN#" + answerText[i] + "#BLUE#]#RESET#  ")
+                        ChatUtils.translateColor("#BLUE#[#GREEN#" + answerText[i].replace("-", " ") + "#BLUE#]#RESET#  ")
                 );
                 ClickEvent clickEvent;
                 if (answerText[i].equals(answer)){

src/main/java/top/mpt/huihui/answerit/listener/InvOpen.java

@@ -10,7 +10,7 @@ public class InvOpen implements Listener {
     /* from prize.prize */
     @EventHandler
     public void onInvClicked(InventoryClickEvent event){
-        if(event.getInventory().equals(prize.getTargetPlayer().getInventory())){
+        if (event.getInventory().equals(prize.getTargetPlayer().getInventory())){
             Player prizePlayer = prize.getPrizePlayer();
             Player targetPlayer = prize.getTargetPlayer();
             // 添加物品

src/main/resources/lang/en_us.yml

@@ -5,6 +5,7 @@
 
 sender_err: "Please let the player to execute the command!"
 mode_err: "#RED#Mode is wrong, please ask %s to check about."
+player_err: "#RED#Cannot find players who named that. Or maybe the player isn't online."
 
 global:
   receiver_info:

src/main/resources/lang/zh_cn.yml

@@ -4,6 +4,7 @@
 
 sender_err: "请让玩家执行指令！"
 mode_err: "#RED#提问类型有误，请让%s检查一下。"
+player_err: "#RED#找不到玩家或玩家不在线"
 
 global:
   receiver_info: