feat: remove spring support & optimize require

Author: 502647092

.gitignore

@@ -53,3 +53,6 @@ vendor/
 # Minecraft Data
 /world
 **/node_modules/
+
+# Gradle
+.gradle

CHANGELOG.md

@@ -2,13 +2,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>pw.yumc</groupId>
     <artifactId>MiaoScript</artifactId>
-    <version>0.23.1</version>
+    <version>0.28.0</version>
     <developers>
         <developer>
             <id>502647092</id>
             <name>MiaoWoo</name>
             <email>admin@yumc.pw</email>
-            <url>http://www.yumc.pw</url>
+            <url>https://www.yumc.pw</url>
         </developer>
     </developers>
     <build>
@@ -19,29 +19,6 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <artifactSet>
-                        <includes>
-                            <include>org.kamranzafar:jtar</include>
-                        </includes>
-                    </artifactSet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
     <ciManagement>
         <system>Jenkins</system>
@@ -50,6 +27,16 @@
     <properties>
         <env.GIT_COMMIT>DEV</env.GIT_COMMIT>
         <update.changes>
+            §623-07-30 §afeat: 优化 require 性能;
+            　　　　　　§cfix: 修复 require 加载特殊文件异常;
+            §623-07-22 §afeat: 网络加载 jtar 优化包大小;
+            　　　　　　§afeat: 移除 Spring 相关支持;
+            　　　　　　§aremove: 移除 Spring 相关支持;
+            　　　　　　§adeps: 更新 Nashorn 和 GraalvmJS 引擎版本
+        </update.changes>
+        <update.changelog>
+            §622-11-22 §afeat: 兼容 1.7.10-1.19.2 版本;
+            　　　　　　§afeat: 新增 MiaoScriptAPI 相关方法;
             §622-06-21 §afeat: 兼容 1.7.10-1.19 版本;
             　　　　　　§afeat: 兼容 JDK17 BungeeCord;
             §622-05-25 §afeat: 兼容 1.7.10-1.18.2 版本;
@@ -61,7 +48,7 @@
             　　　　　　§afeat: 新增 自定义类型加载逻辑;
             §622-02-16 §afeat: 新增 MiaoScriptAPI;
             　　　　　　§afeat: 新增 ScriptEvent;
-            　　　　　　§afeat: 新增 .mjs.json 类型加载;
+            　　　　　　§afeat: 新增 .mjs .json 类型加载;
             §622-02-16 §afeat: 优化 初始化逻辑 加快引擎加载速度;
             　　　　　　§afeat: 新增 root 目录变更检测 变更后重新生成缓存;
             　　　　　　§afeat: 添加常用库的软依赖;
@@ -71,9 +58,7 @@
             §621-06-25 §afeat: 调整启动逻辑 兼容 Arclight;
             §621-06-22 §afeat: 新增本地版本锁定功能;
             §621-06-19 §afeat: 兼容JDK16 反射异常;
-            §621-05-15 §afeat: 兼容JDK15+ 自动下载Nashorn类库
-        </update.changes>
-        <update.changelog>
+            §621-05-15 §afeat: 兼容JDK15+ 自动下载Nashorn类库;
             §621-03-25 §afeat: 异步加载 polyfill 并且同步加载 @ccms/core;
             §621-03-25 §cfix: 修改 ployfill 为 polyfill;
             §620-12-22 §cfix: 增加 require 效验;
@@ -202,11 +187,6 @@
             <version>1.18.24</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.kamranzafar</groupId>
-            <artifactId>jtar</artifactId>
-            <version>2.3</version>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -231,17 +211,5 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-websocket</artifactId>
-            <version>5.3.19</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-websocket</artifactId>
-            <version>9.0.35</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

pom.xml

@@ -21,7 +21,7 @@
  * @author 喵♂呜
  * Created on 2017/10/25 20:35.
  */
-@Plugin(id = "miaoscript", name = "MiaoScript", version = MiaoScriptAPI.VERSION, authors = "MiaoWoo")
+@Plugin(id = "miaoscript", name = "MiaoScript", description = "MiaoScript runtime in Sponge", version = MiaoScriptAPI.VERSION, authors = "MiaoWoo")
 public class MiaoScriptSponge {
     private ScriptEngine engine;
     @Inject

src/main/java/pw/yumc/MiaoScript/MiaoScriptSponge.java

@@ -1,5 +1,7 @@
 package pw.yumc.MiaoScript.api;
 
+import lombok.Getter;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -13,6 +15,7 @@
  * @author 喵♂呜
  * Created on 2017/10/9 12:40.
  */
+@Getter
 public class Base {
     private final Object instance;
 
@@ -36,10 +39,6 @@ public Class<?> getClass(String name) throws ClassNotFoundException {
         }
     }
 
-    public Object getInstance() {
-        return this.instance;
-    }
-
     public Class<?> getProxyClass() {
         return ProxyClass.class;
     }

src/main/java/pw/yumc/MiaoScript/MiaoScriptSpring.java

@@ -1,8 +1,11 @@
 package pw.yumc.MiaoScript.api;
 
+import lombok.Getter;
+
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
+@Getter
 public class JavaScriptTask implements Delayed {
     private final long id;
     private final Object task;
@@ -35,20 +38,4 @@ public int compareTo(Delayed delayed) {
             return (int) (this.id - task.getId());
         }
     }
-
-    public long getId() {
-        return this.id;
-    }
-
-    public Object getTask() {
-        return this.task;
-    }
-
-    public long getStartTime() {
-        return this.startTime;
-    }
-
-    public long getExecuteTime() {
-        return this.executeTime;
-    }
 }

src/main/java/pw/yumc/MiaoScript/api/Base.java

@@ -1,5 +1,6 @@
 package pw.yumc.MiaoScript.api;
 
+import lombok.Getter;
 import pw.yumc.MiaoScript.api.loader.MavenDependLoader;
 import pw.yumc.MiaoScript.api.plugin.PluginManager;
 import pw.yumc.MiaoScript.engine.MiaoScriptEngine;
@@ -8,22 +9,20 @@
 import java.nio.file.Paths;
 
 public class MiaoScriptAPI {
-    public static final String VERSION = "0.23.1";
+    public static final String VERSION = "0.28.0";
+    @Getter
     private static String root;
     private static String libPath;
     private static ScriptEngine scriptEngine;
+    @Getter
     private static PluginManager pluginManager;
 
     public static ScriptEngine createEngine(String root, Object logger, Object instance) {
         MiaoScriptAPI.scriptEngine = new ScriptEngine(root, logger, instance);
         return MiaoScriptAPI.scriptEngine;
     }
 
-    public static String getRoot() {
-        return root;
-    }
-
-    public static void setRoot(String root) {
+    static void setRoot(String root) {
         MiaoScriptAPI.root = root;
         MiaoScriptAPI.libPath = Paths.get(root, "libs").toString();
     }
@@ -32,14 +31,10 @@ public static MiaoScriptEngine getEngine() {
         return MiaoScriptAPI.scriptEngine.getEngine();
     }
 
-    public static void setEngine(ScriptEngine scriptEngine) {
+    static void setEngine(ScriptEngine scriptEngine) {
         MiaoScriptAPI.scriptEngine = scriptEngine;
     }
 
-    public static PluginManager getPluginManager() {
-        return pluginManager;
-    }
-
     public static void setPluginManager(Object pluginManager) {
         MiaoScriptAPI.pluginManager = getEngine().getInterface(pluginManager, PluginManager.class);
     }

src/main/java/pw/yumc/MiaoScript/api/JavaScriptTask.java

@@ -0,0 +1,39 @@
+package pw.yumc.MiaoScript.api.bukkit;
+
+import lombok.Getter;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import javax.script.Bindings;
+
+@Getter
+public class EngineEvent extends Event implements Cancellable {
+    private final String event;
+    private final Bindings data;
+
+    private boolean cancelled = false;
+
+    public EngineEvent(String event, Bindings data) {
+        this.event = event;
+        this.data = data;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
+    }
+
+    @Getter
+    private static final HandlerList handlerList = new HandlerList();
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlerList;
+    }
+}

src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java

@@ -1,15 +1,18 @@
 package pw.yumc.MiaoScript.api.bukkit;
 
+import lombok.Getter;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
 import javax.script.Bindings;
 
+@Getter
 public class ScriptEvent extends Event implements Cancellable {
     private final Bindings plugin;
     private final String event;
     private final Bindings data;
+
     private boolean cancelled = false;
 
     public ScriptEvent(Bindings plugin, String event, Bindings data) {
@@ -18,33 +21,6 @@ public ScriptEvent(Bindings plugin, String event, Bindings data) {
         this.data = data;
     }
 
-    /**
-     * Which Plugin Call Event
-     *
-     * @return PluginName
-     */
-    public Bindings getPlugin() {
-        return plugin;
-    }
-
-    /**
-     * Plugin Event Name
-     *
-     * @return EventName
-     */
-    public String getEvent() {
-        return event;
-    }
-
-    /**
-     * Plugin Event Data
-     *
-     * @return EventData
-     */
-    public Bindings getData() {
-        return data;
-    }
-
     @Override
     public boolean isCancelled() {
         return this.cancelled;
@@ -55,12 +31,9 @@ public void setCancelled(boolean b) {
         this.cancelled = b;
     }
 
+    @Getter
     private static final HandlerList handlerList = new HandlerList();
 
-    public static HandlerList getHandlerList() {
-        return handlerList;
-    }
-
     @Override
     public HandlerList getHandlers() {
         return handlerList;