refactor: 调整编译版本为1.8 使用lambda表达式和stream

Signed-off-by: 502647092 <admin@yumc.pw>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pw.yumc</groupId>
     <artifactId>YumCore</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
@@ -52,8 +52,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
     <repositories>
         <repository>

src/main/java/pw/yumc/YumCore/bukkit/Log.java

@@ -1,6 +1,7 @@
 package pw.yumc.YumCore.bukkit;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -276,9 +277,7 @@ public class Log {
      *            消息
      */
     public static void sender(CommandSender sender, String[] msg) {
-        for (String str : msg) {
+        Arrays.stream(msg).forEach(str -> sender(sender, str));
-            sender(sender, str);
-        }
     }
 
     /**

src/main/java/pw/yumc/YumCore/bukkit/P.java

@@ -43,7 +43,7 @@ public class P {
         try {
             getInjectConfigMethod = instance.getClass().getMethod("get" + instance.getName() + "Config");
         } catch (NoSuchMethodException e) {
-            Log.d(e);
+            Log.d("配置方法 get%sConfig 未找到 将返回getConfig 调用结果!", instance.getName());
         }
     }
 
@@ -141,13 +141,11 @@ public class P {
                 if (!je.isDirectory()) {
                     for (final String dir : dirs) {
                         if (je.getName().startsWith(dir)) {
-                            if (!new File(getDataFolder(), je.getName()).exists()) {
                             instance.saveResource(je.getName(), false);
                         }
                     }
                 }
             }
-            }
             jar.close();
         } catch (IOException ignored) {
         }

src/main/java/pw/yumc/YumCore/bukkit/compatible/C.java

@@ -12,6 +12,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.json.simple.JSONObject;
 
 import com.google.common.base.Charsets;
@@ -133,22 +134,18 @@ public class C {
          *            需要显示的时间
          */
         public static void broadcast(final String message, final int times) {
-            Bukkit.getScheduler().runTaskAsynchronously(P.instance, new Runnable() {
+            new BukkitRunnable() {
+                int time = times;
+
                 @Override
                 public void run() {
-                    int time = times;
+                    C.Player.getOnlinePlayers().forEach(player -> send(player, message));
-                    do {
-                        for (org.bukkit.entity.Player player : C.Player.getOnlinePlayers()) {
-                            send(player, message);
-                        }
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException ignored) {
-                        }
                     time--;
-                    } while (time > 0);
+                    if (time <= 0) {
+                        cancel();
                     }
-            });
+                }
+            }.runTaskTimerAsynchronously(P.instance, 0, 20);
         }
 
         /**
@@ -162,25 +159,18 @@ public class C {
          *            需要显示的时间
          */
         public static void broadcast(final World world, final String message, final int times) {
-            Bukkit.getScheduler().runTaskAsynchronously(P.instance, new Runnable() {
+            new BukkitRunnable() {
+                int time = times;
+
                 @Override
                 public void run() {
-                    int time = times;
+                    C.Player.getOnlinePlayers().stream().filter(player -> player.getWorld().getName().equalsIgnoreCase(world.getName())).forEach(player -> send(player, message));
-                    do {
-                        for (org.bukkit.entity.Player player : C.Player.getOnlinePlayers()) {
-                            if (player.getWorld().getName().equalsIgnoreCase(world.getName())) {
-                                send(player, message);
-                            }
-                        }
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException ignored) {
-                        }
                     time--;
-                    } while (time > 0);
+                    if (time <= 0) {
-
+                        cancel();
                     }
-            });
+                }
+            }.runTaskTimerAsynchronously(P.instance, 0, 20);
         }
 
         /**
@@ -206,20 +196,18 @@ public class C {
          *            需要显示的时间
          */
         public static void send(final org.bukkit.entity.Player receivingPacket, final String msg, final int times) {
-            Bukkit.getScheduler().runTaskAsynchronously(P.instance, new Runnable() {
+            new BukkitRunnable() {
+                int time = times;
+
                 @Override
                 public void run() {
-                    int time = times;
-                    do {
                     send(receivingPacket, msg);
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException ignored) {
-                        }
                     time--;
-                    } while (time > 0);
+                    if (time <= 0) {
+                        cancel();
                     }
-            });
+                }
+            }.runTaskTimerAsynchronously(P.instance, 0, 20);
         }
     }
 
@@ -369,11 +357,7 @@ public class C {
          *            子标题
          */
         public static void broadcast(World world, String title, String subtitle) {
-            for (org.bukkit.entity.Player player : Player.getOnlinePlayers()) {
+            C.Player.getOnlinePlayers().stream().filter(player -> player.getWorld().getName().equalsIgnoreCase(world.getName())).forEach(player -> send(player, title, subtitle));
-                if (player.getWorld().getName().equalsIgnoreCase(world.getName())) {
-                    send(player, title, subtitle);
-                }
-            }
         }
 
         /**

src/main/java/pw/yumc/YumCore/commands/CommandHelp.java

@@ -1,14 +1,21 @@
 package pw.yumc.YumCore.commands;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.bukkit.command.CommandSender;
+
 import pw.yumc.YumCore.bukkit.Log;
 import pw.yumc.YumCore.commands.annotation.Help;
 import pw.yumc.YumCore.commands.info.CommandInfo;
 import pw.yumc.YumCore.commands.interfaces.HelpGenerator;
 import pw.yumc.YumCore.commands.interfaces.HelpParse;
 
-import java.util.*;
-
 /**
  * 命令帮助生成类
  *
@@ -63,8 +70,8 @@ public class CommandHelp {
     public CommandHelp(CommandInfo defCmd, Collection<? extends CommandInfo> list) {
         this.defCmd = defCmd;
         cmdlist = new LinkedList<>(list);
-        Collections.sort(cmdlist, new CommandNameComparator());
+        cmdlist.sort(new CommandNameComparator());
-        Collections.sort(cmdlist, new CommandComparator());
+        cmdlist.sort(new CommandComparator());
         HELPPAGECOUNT = (int) Math.ceil((double) cmdlist.size() / LINES_PER_PAGE);
     }
 

src/main/java/pw/yumc/YumCore/commands/CommandParse.java

@@ -1,18 +1,23 @@
 package pw.yumc.YumCore.commands;
 
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+
 import pw.yumc.YumCore.bukkit.Log;
 import pw.yumc.YumCore.commands.annotation.Option;
 import pw.yumc.YumCore.commands.exception.ParseException;
 
-import java.io.File;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.*;
-
 /**
  * 命令参数解析
  *
@@ -275,11 +280,11 @@ public class CommandParse {
         }
 
         public void throwRange() {
-            throwRange(null);
+            throwRange("");
         }
 
         public void throwRange(String str) {
-            throw new ParseException(String.format(str == null ? "范围必须在 %s 到 %s 之间!" : str, min, max));
+            throw new ParseException(String.format(str.isEmpty() ? "范围必须在 %s 到 %s 之间!" : str, min, max));
         }
     }
 

src/main/java/pw/yumc/YumCore/commands/CommandSub.java

@@ -3,7 +3,6 @@ package pw.yumc.YumCore.commands;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -110,10 +109,10 @@ public class CommandSub implements TabExecutor {
      */
     private void buildCmdNameCache() {
         cmdNameCache.clear();
-        for (CommandInfo cmd : cmds) {
+        cmds.forEach(cmd -> {
             cmdNameCache.add(cmd.getName());
             cmdNameCache.addAll(Arrays.asList(cmd.getCommand().aliases()));
-        }
+        });
         cmdNameCache.add("help");
     }
 
@@ -156,12 +155,8 @@ public class CommandSub implements TabExecutor {
         String lastWord = args[args.length - 1];
         Player senderPlayer = sender instanceof Player ? (Player) sender : null;
         List<String> matchedPlayers = new ArrayList<>();
-        for (Player player : C.Player.getOnlinePlayers()) {
+        C.Player.getOnlinePlayers().stream().filter(player -> (senderPlayer == null || senderPlayer.canSee(player)) && StringUtil.startsWithIgnoreCase(player.getName(), lastWord)).forEach(
-            String name = player.getName();
+                player -> matchedPlayers.add(player.getName()));
-            if ((senderPlayer == null || senderPlayer.canSee(player)) && StringUtil.startsWithIgnoreCase(name, lastWord)) {
-                matchedPlayers.add(name);
-            }
-        }
         return matchedPlayers;
     }
 
@@ -208,11 +203,9 @@ public class CommandSub implements TabExecutor {
         if (args.length == 1) {
             StringUtil.copyPartialMatches(token, cmdNameCache, completions);
         }
-        for (CommandTabInfo tab : tabs) {
+        tabs.forEach(tab -> StringUtil.copyPartialMatches(token, tab.execute(sender, token, args), completions));
-            StringUtil.copyPartialMatches(token, tab.execute(sender, token, args), completions);
-        }
         StringUtil.copyPartialMatches(token, getPlayerTabComplete(sender, command, alias, args), completions);
-        Collections.sort(completions, String.CASE_INSENSITIVE_ORDER);
+        completions.sort(String.CASE_INSENSITIVE_ORDER);
         return completions;
     }
 

src/main/java/pw/yumc/YumCore/commands/info/CommandInfo.java

@@ -1,7 +1,15 @@
 package pw.yumc.YumCore.commands.info;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+
 import pw.yumc.YumCore.bukkit.Log;
 import pw.yumc.YumCore.bukkit.P;
 import pw.yumc.YumCore.commands.CommandParse;
@@ -10,14 +18,11 @@ import pw.yumc.YumCore.commands.annotation.Cmd;
 import pw.yumc.YumCore.commands.annotation.Cmd.Executor;
 import pw.yumc.YumCore.commands.annotation.Help;
 import pw.yumc.YumCore.commands.annotation.Sort;
-import pw.yumc.YumCore.commands.exception.*;
+import pw.yumc.YumCore.commands.exception.ArgumentException;
-
+import pw.yumc.YumCore.commands.exception.CommandException;
-import java.lang.annotation.Annotation;
+import pw.yumc.YumCore.commands.exception.ParseException;
-import java.lang.reflect.InvocationTargetException;
+import pw.yumc.YumCore.commands.exception.PermissionException;
-import java.lang.reflect.Method;
+import pw.yumc.YumCore.commands.exception.SenderException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * 命令信息存储类
@@ -122,9 +127,7 @@ public class CommandInfo {
     public boolean execute(final CommandSender sender, final String label, final String[] args) {
         if (method == null) { return false; }
         check(sender, label, args);
-        Runnable runnable = new Runnable() {
+        Runnable runnable = () -> {
-            @Override
-            public void run() {
             try {
                 method.invoke(origin, parse.parse(sender, label, args));
             } catch (ParseException | ArgumentException e) {
@@ -132,7 +135,6 @@ public class CommandInfo {
             } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
                 throw new CommandException(e);
             }
-            }
         };
         if (async) {
             Bukkit.getScheduler().runTaskAsynchronously(P.instance, runnable);

src/main/java/pw/yumc/YumCore/global/I18N.java

@@ -53,9 +53,7 @@ public class I18N {
      * 载入数据
      */
     private static void load() {
-        new Thread(new Runnable() {
+        new Thread(() -> {
-            @Override
-            public void run() {
             try {
                 Map<String, String> local = YumConfig.getLocal(LANG).getContentMap();
                 Map<String, String> remote = YumConfig.getRemote(LANG).getContentMap();
@@ -70,7 +68,6 @@ public class I18N {
                 Log.w("本地化工具初始化失败: %s %s", e.getClass().getName(), e.getMessage());
                 Log.d(LANG, e);
             }
-            }
         }).start();
     }
 }

src/main/java/pw/yumc/YumCore/global/L10N.java

@@ -115,9 +115,7 @@ public class L10N {
      * 载入数据
      */
     private static void load() {
-        new Thread(new Runnable() {
+        new Thread(() -> {
-            @Override
-            public void run() {
             try {
                 Map<String, String> local = YumConfig.getLocal(CONFIG_NAME).getContentMap();
                 if (local != null) {
@@ -134,7 +132,6 @@ public class L10N {
                 Log.w("本地化工具初始化失败: %s %s", e.getClass().getName(), e.getMessage());
                 Log.d(CONFIG_NAME, e);
             }
-            }
         }).start();
     }
 }

src/main/java/pw/yumc/YumCore/kit/ExKit.java

@@ -14,7 +14,7 @@ public class ExKit {
      *            异常
      */
     public static void throwException(final Throwable exception) {
-        ExKit.<RuntimeException> throwExceptionT(exception);
+        ExKit.throwExceptionT(exception);
     }
 
     /**
@@ -29,6 +29,6 @@ public class ExKit {
      */
     @SuppressWarnings("unchecked")
     private static <T extends Throwable> void throwExceptionT(final Throwable exception) throws T {
-        throw (T) exception;
+        if (exception != null) { throw (T) exception; }
     }
 }

src/main/java/pw/yumc/YumCore/mail/XMail.java

@@ -9,7 +9,12 @@ import javax.activation.DataContentHandler;
 import javax.activation.DataContentHandlerFactory;
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
-import javax.mail.*;
+import javax.mail.Authenticator;
+import javax.mail.BodyPart;
+import javax.mail.Message;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
@@ -36,14 +41,11 @@ public class XMail {
         handlers.put("message/rfc822", new com.sun.mail.handlers.message_rfc822());
         handlers.put("image/gif", new com.sun.mail.handlers.image_gif());
         handlers.put("image/jpeg", new com.sun.mail.handlers.image_jpeg());
-        defaultDataContentHandlerFactory = new DataContentHandlerFactory() {
+        defaultDataContentHandlerFactory = type -> {
-            @Override
-            public DataContentHandler createDataContentHandler(String type) {
             DataContentHandler handler = handlers.get(type);
             if (handler != null) { return handler; }
             System.out.println("*************  Unknown Type: " + type + "  *************");
             return null;
-            }
         };
     }
 

src/main/java/pw/yumc/YumCore/mc/ServerInfo.java

@@ -55,8 +55,7 @@ public class ServerInfo {
      * @return 是否获取成功
      */
     public boolean fetchData() {
-        try {
+        try (Socket socket = new Socket()) {
-            Socket socket = new Socket();
             OutputStream outputStream;
             DataOutputStream dataOutputStream;
             InputStream inputStream;

src/main/java/pw/yumc/YumCore/reflect/Reflect.java

@@ -1,6 +1,12 @@
 package pw.yumc.YumCore.reflect;
 
-import java.lang.reflect.*;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -283,9 +289,7 @@ public class Reflect {
      */
     public <P> P as(final Class<P> proxyType) {
         final boolean isMap = (object instanceof Map);
-        final InvocationHandler handler = new InvocationHandler() {
+        final InvocationHandler handler = (proxy, method, args) -> {
-            @Override
-            public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
             final String name = method.getName();
 
             // Actual method name matches always come first
@@ -311,7 +315,6 @@ public class Reflect {
 
                 throw e;
             }
-            }
         };
 
         return (P) Proxy.newProxyInstance(proxyType.getClassLoader(), new Class[] { proxyType }, handler);

src/main/java/pw/yumc/YumCore/sql/DataBase.java

@@ -263,29 +263,6 @@ public class DataBase {
         return kvlist;
     }
 
-    // @SuppressWarnings("unchecked")
-    // public <M> List<M> dbSelect( Class<? extends Model<?>> model, KeyValue selCondition) {
-    // List<M> modellist = new ArrayList<>();
-    // String sql = "SELECT " + toKeys(model) + " FROM `" + model.getAnnotation(Entity.class).name() + "`" + (selCondition == null ? "" : " WHERE " + selCondition.toWhereString());
-    // try {
-    // ResultSet dbresult = this.dataBaseCore.execute(sql);
-    // while (dbresult.next()) {
-    // M m = (M) model.newInstance();
-    // Field[] fields = model.getDeclaredFields();
-    // for ( Field col : fields) {
-    // col.set(m, dbresult.getObject(col.getName()));
-    // }
-    // modellist.add(m);
-    // }
-    // } catch ( InstantiationException e) {
-    // info("模型类实例化失败!");
-    // e.printStackTrace();
-    // } catch ( Exception e) {
-    // sqlerr(sql, e);
-    // }
-    // return modellist;
-    // }
-
     /**
      * 对数据库表进行选择操作！
      *
@@ -500,16 +477,4 @@ public class DataBase {
             return DataBase.create(P.instance, config.getConfigurationSection(path));
         }
     }
-
-    // private String toKeys( Class<? extends Model<?>> model) {
-    // Field[] fields = model.getDeclaredFields();
-    // StringBuilder sb = new StringBuilder();
-    // for ( Field next : fields) {
-    // sb.append("`");
-    // sb.append(next.getName());
-    // sb.append("`, ");
-    // }
-    // return sb.toString().substring(0, sb.length() - 2);
-    // }
-
 }

src/main/java/pw/yumc/YumCore/sql/core/KeyValue.java

@@ -54,7 +54,7 @@ public class KeyValue {
      * @return 所有的键
      */
     public String[] getKeys() {
-        return this.keyvalues.keySet().toArray(new String[0]);
+        return this.keyvalues.keySet().toArray(new String[] {});
     }
 
     /**
@@ -79,7 +79,7 @@ public class KeyValue {
         for (Entry<Object, Object> next : this.keyvalues.entrySet()) {
             keys.add(next.getValue());
         }
-        return keys.toArray(new Object[0]);
+        return keys.toArray(new Object[keys.size()]);
     }
 
     /**

src/main/java/pw/yumc/YumCore/statistic/Statistics.java

@@ -3,17 +3,11 @@
  */
 package pw.yumc.YumCore.statistic;
 
-import org.bukkit.Bukkit;
+import java.io.BufferedReader;
-import org.bukkit.configuration.file.YamlConfiguration;
+import java.io.File;
-import org.bukkit.entity.Player;
+import java.io.IOException;
-import org.bukkit.plugin.Plugin;
+import java.io.InputStreamReader;
-import org.bukkit.plugin.PluginDescriptionFile;
+import java.io.PrintWriter;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitTask;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
-import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -25,6 +19,16 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
 /**
  * Yum数据中心 数据统计类
  *
@@ -209,9 +213,7 @@ public class Statistics {
         // 开启TPS统计线程
         Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, timer, 0, 20);
         // 开启发送数据线程
-        task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
+        task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, () -> {
-            @Override
-            public void run() {
             try {
                 postPlugin();
             } catch (Throwable e) {
@@ -219,7 +221,6 @@ public class Statistics {
                     e.printStackTrace();
                 }
             }
-            }
         }, 50, 25 * 1200);
         return true;
     }

src/main/java/pw/yumc/YumCore/tellraw/Tellraw.java

@@ -268,9 +268,7 @@ public class Tellraw implements Cloneable {
     public Tellraw tip(List<String> texts) {
         if (texts.isEmpty()) { return this; }
         StringBuilder text = new StringBuilder();
-        for (String t : texts) {
+        texts.forEach(t -> text.append(t).append("\n"));
-            text.append(t).append("\n");
-        }
         return tip(text.toString().substring(0, text.length() - 1));
     }
 
@@ -344,9 +342,7 @@ public class Tellraw implements Cloneable {
      */
     public String toOldMessageFormat() {
         StringBuilder result = new StringBuilder();
-        for (MessagePart part : messageParts) {
+        messageParts.forEach(part -> result.append(part.text));
-            result.append(part.text);
-        }
         return result.toString();
     }
 

src/main/java/pw/yumc/YumCore/update/SubscribeTask.java

@@ -135,12 +135,7 @@ public class SubscribeTask implements Runnable, Listener {
     public void onJoin(PlayerJoinEvent e) {
         final Player player = e.getPlayer();
         if (player.isOp() && updateFile.isUpdated()) {
-            Bukkit.getScheduler().runTaskLater(instance, new Runnable() {
+            Bukkit.getScheduler().runTaskLater(instance, () -> versionInfo.notify(player), 10);
-                @Override
-                public void run() {
-                    versionInfo.notify(player);
-                }
-            }, 10);
         }
     }