From 82d1a1b82665c7a23b33ce32fc8a15a0e9adc957 Mon Sep 17 00:00:00 2001
From: sky <sky@asgard.me>
Date: Mon, 3 Feb 2020 18:40:13 +0800
Subject: [PATCH] Update JDK 11

---
 .../module/command/lite/CommandBuilder.java   | 33 ++++++++++---------
 .../scala/io/izzel/taboolib/util/Files.java   |  9 +++++
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/io/izzel/taboolib/module/command/lite/CommandBuilder.java b/src/main/scala/io/izzel/taboolib/module/command/lite/CommandBuilder.java
index 4bb4863..a19188d 100644
--- a/src/main/scala/io/izzel/taboolib/module/command/lite/CommandBuilder.java
+++ b/src/main/scala/io/izzel/taboolib/module/command/lite/CommandBuilder.java
@@ -18,8 +18,8 @@ import java.util.UUID;
  */
 public class CommandBuilder {
 
-    public static final CompleterTab EMPTY_COMPLETER_TAB = ((sender, args) -> new ArrayList<>());
-    public static final CompleterCommand EMPTY_COMPLETER_COMMAND = ((sender, args) -> {});
+    public static final CompleterCommand EMPTY_COMPLETER_COMMAND = ((sender, args) -> {
+    });
 
     private String command;
     private Plugin plugin;
@@ -28,7 +28,7 @@ public class CommandBuilder {
     private List<String> aliases;
     private String permission;
     private String permissionMessage;
-    private CompleterTab completerTab = EMPTY_COMPLETER_TAB;
+    private CompleterTab completerTab;
     private CompleterCommand completerCommand = EMPTY_COMPLETER_COMMAND;
     private boolean forceRegister;
     private boolean build;
@@ -106,7 +106,6 @@ public class CommandBuilder {
         Preconditions.checkNotNull(plugin, "缺少 \"plugin\" 部分");
         Preconditions.checkNotNull(command, "缺少 \"command\" 部分");
         Preconditions.checkNotNull(completerCommand, "缺少 \"CompleterCommand\" 部分");
-        Preconditions.checkNotNull(completerTab, "缺少 \"CompleterTab\" 部分");
         if (forceRegister) {
             TCommandHandler.getKnownCommands().remove(command);
         }
@@ -118,18 +117,20 @@ public class CommandBuilder {
                 aliases,
                 permission,
                 permissionMessage,
-                (sender, command, s, args) -> {
-                    completerCommand.execute(sender, args);
-                    return true;
-                },
-                (sender, command, s, args) -> {
-                    try {
-                        return completerTab.execute(sender, args);
-                    } catch (Throwable t) {
-                        t.printStackTrace();
-                    }
-                    return null;
-                });
+                completerCommand == null ? null :
+                        (sender, command, s, args) -> {
+                            completerCommand.execute(sender, args);
+                            return true;
+                        },
+                completerTab == null ? null :
+                        (sender, command, s, args) -> {
+                            try {
+                                return completerTab.execute(sender, args);
+                            } catch (Throwable t) {
+                                t.printStackTrace();
+                            }
+                            return null;
+                        });
         build = true;
         return this;
     }
diff --git a/src/main/scala/io/izzel/taboolib/util/Files.java b/src/main/scala/io/izzel/taboolib/util/Files.java
index a6d5f93..e014b8e 100644
--- a/src/main/scala/io/izzel/taboolib/util/Files.java
+++ b/src/main/scala/io/izzel/taboolib/util/Files.java
@@ -319,6 +319,15 @@ public class Files {
         }
     }
 
+    public static void write(File file, WriteHandle writeHandle, boolean append) {
+        try (FileWriter fileWriter = new FileWriter(file, append); BufferedWriter bufferedWriter = new BufferedWriter(fileWriter)) {
+            writeHandle.write(bufferedWriter);
+            bufferedWriter.flush();
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+
     public static void write(OutputStream out, WriteHandle writeHandle) {
         try (OutputStreamWriter outputStreamWriter = new OutputStreamWriter(out); BufferedWriter bufferedWriter = new BufferedWriter(outputStreamWriter)) {
             writeHandle.write(bufferedWriter);