diff --git a/pom.xml b/pom.xml index 3e8ca8d..b0685fa 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 pw.yumc MiaoScript - 0.23.0 + 0.23.1 502647092 @@ -50,6 +50,8 @@ DEV + §622-06-21 §afeat: 兼容 1.7.10-1.19 版本; +       §afeat: 兼容 JDK17 BungeeCord; §622-05-25 §afeat: 兼容 1.7.10-1.18.2 版本; §622-05-21 §afeat: 优化 框架加载逻辑; §622-05-20 §afeat: 调整 require 主包逻辑; diff --git a/src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java b/src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java index 0f11a59..bb729b6 100644 --- a/src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java +++ b/src/main/java/pw/yumc/MiaoScript/api/MiaoScriptAPI.java @@ -8,7 +8,7 @@ import java.io.File; import java.nio.file.Paths; public class MiaoScriptAPI { - public static final String VERSION = "0.23.0"; + public static final String VERSION = "0.23.1"; private static String root; private static String libPath; private static ScriptEngine scriptEngine; diff --git a/src/main/java/pw/yumc/MiaoScript/engine/MiaoScriptEngine.java b/src/main/java/pw/yumc/MiaoScript/engine/MiaoScriptEngine.java index 65a7c6c..ca13a5c 100644 --- a/src/main/java/pw/yumc/MiaoScript/engine/MiaoScriptEngine.java +++ b/src/main/java/pw/yumc/MiaoScript/engine/MiaoScriptEngine.java @@ -35,7 +35,11 @@ public class MiaoScriptEngine implements ScriptEngine, Invocable { } private void loadGraalJS(String engineRoot) { - this.engine = this.parentLoadNetworkNashorn(engineRoot); + try { + this.engine = this.parentLoadNetworkNashorn(engineRoot); + } catch (Throwable ex) { + this.engine = this.loadNetworkNashorn(engineRoot); + } if (this.engine == null) { this.engine = this.loadNetworkGraalJS(engineRoot); } @@ -56,7 +60,7 @@ public class MiaoScriptEngine implements ScriptEngine, Invocable { ex.printStackTrace(); } try { - if (this.engine == null && engineRoot != null) { + if (this.engine == null) { this.engine = this.loadNetworkNashorn(engineRoot); } } catch (final Throwable ex) {