From ecfd140ca802ff41cb0fc93ac45eb8ab4e4f98ed Mon Sep 17 00:00:00 2001
From: MiaoWoo <admin@yumc.pw>
Date: Tue, 27 Aug 2019 09:58:18 +0800
Subject: [PATCH] feat: support mc 1.14.4

Signed-off-by: MiaoWoo <admin@yumc.pw>
---
 pom.xml                                       | 129 +++++++-------
 .../yumc/Yum/events/PluginNetworkEvent.java   | 167 +++++++++---------
 2 files changed, 149 insertions(+), 147 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5427160..f72d744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,64 +1,65 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>Yum</artifactId>
-    <version>2.8.0</version>
-    <packaging>jar</packaging>
-
-    <description>Minecraft 服务器插件管理系统</description>
-
-    <parent>
-        <groupId>pw.yumc</groupId>
-        <artifactId>minecraft-plugin-parent</artifactId>
-        <version>1.0</version>
-        <relativePath/>
-    </parent>
-
-    <properties>
-        <update.description>§a补丁包 2.8 版本</update.description>
-        <update.changes>
-            §619-02-23 §cfix: 修复不兼容 1.13 的问题;
-        </update.changes>
-        <update.changelog>
-            §617-07-29 §cfix: 修复不兼容 1.12 的问题;
-            §6- §cfix: §7修复仓库数据读取错误的问题;
-            §6- §cfix: §7修复一个tab补全产生的错误
-            §6- §btip: §a本插件最后一次更新 2.7.8 版本;
-            §6- §afeat: §7线程中断只显示一次调试信息;
-            §6- §afeat: §7更新线程检查 添加调试;
-            §6- §afeat: §7修改显示前缀;
-            §6- §afeat: §7更新类库版本 完善网络调试;
-            §6- §drefactor: §7使用新类库;
-            §6- §afeat: §7使用新版本API;
-            §6- §afeat: §7去除加载器注入 异步获取主线程;
-            §6- §afeat: §7添加网络状态详细错误;
-            §6- §afeat: §7新增307跳转支持;
-            §6- §cfix: §7修复lasterror命令显示问题;
-            §6- §afeat: §7使用SimpleJson解析仓库数据;
-            §6- §afeat: §7使用新的类库处理Tellraw;
-            §6- §cfix: §7当仓库未找到插件时没有提示的BUG;
-        </update.changelog>
-        <env.GIT_COMMIT>DEV</env.GIT_COMMIT>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>pw.yumc</groupId>
-            <artifactId>BukkitInjectedTools</artifactId>
-            <type>jar</type>
-            <version>[1.1,)</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Yum</artifactId>
+    <version>2.8.1</version>
+    <packaging>jar</packaging>
+
+    <description>Minecraft 服务器插件管理系统</description>
+
+    <parent>
+        <groupId>pw.yumc</groupId>
+        <artifactId>minecraft-plugin-parent</artifactId>
+        <version>1.0</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <update.description>§a补丁包 2.8.1 版本</update.description>
+        <update.changes>
+            §619-08-26 §cfix: 修复不兼容 1.14.4 的问题;
+            §619-02-23 §cfix: 修复不兼容 1.13 的问题;
+        </update.changes>
+        <update.changelog>
+            §617-07-29 §cfix: 修复不兼容 1.12 的问题;
+            §6- §cfix: §7修复仓库数据读取错误的问题;
+            §6- §cfix: §7修复一个tab补全产生的错误
+            §6- §btip: §a本插件最后一次更新 2.7.8 版本;
+            §6- §afeat: §7线程中断只显示一次调试信息;
+            §6- §afeat: §7更新线程检查 添加调试;
+            §6- §afeat: §7修改显示前缀;
+            §6- §afeat: §7更新类库版本 完善网络调试;
+            §6- §drefactor: §7使用新类库;
+            §6- §afeat: §7使用新版本API;
+            §6- §afeat: §7去除加载器注入 异步获取主线程;
+            §6- §afeat: §7添加网络状态详细错误;
+            §6- §afeat: §7新增307跳转支持;
+            §6- §cfix: §7修复lasterror命令显示问题;
+            §6- §afeat: §7使用SimpleJson解析仓库数据;
+            §6- §afeat: §7使用新的类库处理Tellraw;
+            §6- §cfix: §7当仓库未找到插件时没有提示的BUG;
+        </update.changelog>
+        <env.GIT_COMMIT>DEV</env.GIT_COMMIT>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>pw.yumc</groupId>
+            <artifactId>BukkitInjectedTools</artifactId>
+            <type>jar</type>
+            <version>[1.1,)</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/pw/yumc/Yum/events/PluginNetworkEvent.java b/src/main/java/pw/yumc/Yum/events/PluginNetworkEvent.java
index 3cb60db..feb6d15 100644
--- a/src/main/java/pw/yumc/Yum/events/PluginNetworkEvent.java
+++ b/src/main/java/pw/yumc/Yum/events/PluginNetworkEvent.java
@@ -1,83 +1,84 @@
-package pw.yumc.Yum.events;
-
-import java.net.URI;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-import org.bukkit.plugin.Plugin;
-
-public class PluginNetworkEvent extends Event implements Cancellable {
-
-    private static HandlerList handlers = new HandlerList();
-
-    private boolean isPrimaryThread;
-    private Plugin plugin;
-    private boolean cancel;
-    private URI url;
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * 插件联网事件
-     *
-     * @param plugin
-     *            插件
-     * @param url
-     *            地址
-     * @param isMainThread
-     *            是否为主线程
-     */
-    public PluginNetworkEvent(Plugin plugin, URI url, boolean isPrimaryThread) {
-        this.plugin = plugin;
-        this.url = url;
-        this.isPrimaryThread = isPrimaryThread;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    /**
-     * @return 插件
-     */
-    public Plugin getPlugin() {
-        return plugin;
-    }
-
-    /**
-     * @return 网址
-     */
-    public URI getUrl() {
-        return url;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancel;
-    }
-
-    /**
-     * @return 是否在主线程
-     */
-    public boolean isPrimaryThread() {
-        return isPrimaryThread;
-    }
-
-    @Override
-    public void setCancelled(boolean value) {
-        cancel = value;
-    }
-
-    /**
-     * @param url
-     *            设置新的URL地址
-     */
-    public void setUrl(URI url) {
-        this.url = url;
-    }
-
-}
+package pw.yumc.Yum.events;
+
+import java.net.URI;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.bukkit.plugin.Plugin;
+
+public class PluginNetworkEvent extends Event implements Cancellable {
+
+    private static HandlerList handlers = new HandlerList();
+
+    private boolean isPrimaryThread;
+    private Plugin plugin;
+    private boolean cancel;
+    private URI url;
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * 插件联网事件
+     *
+     * @param plugin
+     *         插件
+     * @param url
+     *         地址
+     * @param isPrimaryThread
+     *         是否为主线程
+     */
+    public PluginNetworkEvent(Plugin plugin, URI url, boolean isPrimaryThread) {
+        super(true);
+        this.plugin = plugin;
+        this.url = url;
+        this.isPrimaryThread = isPrimaryThread;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    /**
+     * @return 插件
+     */
+    public Plugin getPlugin() {
+        return plugin;
+    }
+
+    /**
+     * @return 网址
+     */
+    public URI getUrl() {
+        return url;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancel;
+    }
+
+    /**
+     * @return 是否在主线程
+     */
+    public boolean isPrimaryThread() {
+        return isPrimaryThread;
+    }
+
+    @Override
+    public void setCancelled(boolean value) {
+        cancel = value;
+    }
+
+    /**
+     * @param url
+     *         设置新的URL地址
+     */
+    public void setUrl(URI url) {
+        this.url = url;
+    }
+
+}