default imports java.lang, java.util and org.bukkit

caoli5288 · Mar 12, 2020 · c791f21 · c791f21
1 parent 2985a79
commit c791f21
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/com/mengcraft/script/ScriptBootstrap.java b/src/main/java/com/mengcraft/script/ScriptBootstrap.java
@@ -67,7 +67,7 @@ public static Object require(File required) {
             case "js":
                 ScriptEngine ctx = jsEngine();
                 Bindings bindings = ctx.createBindings();
-                ctx.eval("exports = {}", bindings);
+                ctx.eval("exports = {}; load(\"nashorn:mozilla_compat.js\"); importPackage(java.lang, java.util, org.bukkit);", bindings);
                 ctx.eval(Files.newReader(required, StandardCharsets.UTF_8), bindings);
                 return ctx.eval("exports", bindings);
             case "json":
@@ -84,7 +84,7 @@ public static ScriptEngine jsEngine() {
     @Override
     public void onLoad() {
         plugin = this;
-        jsEngine = new ScriptEngineManager(getClassLoader()).getEngineByExtension("js");
+        jsEngine = new ScriptEngineManager(getClassLoader()).getEngineByName("nashorn");
     }
 
     @Override

diff --git a/src/main/java/com/mengcraft/script/loader/ScriptLoader.java b/src/main/java/com/mengcraft/script/loader/ScriptLoader.java
@@ -36,6 +36,7 @@ public ScriptBinding load(ScriptInfo info) throws ScriptPluginException {
         ctx.put("loader", info.loader);
         Object scriptObj = null;
         try {
+            ctx.eval("load(\"nashorn:mozilla_compat.js\"); importPackage(java.lang, java.util, org.bukkit);");
             ctx.eval(info.contend);
             scriptObj = ctx.eval("this");
         } catch (ScriptException e) {

diff --git a/src/main/java/com/mengcraft/script/plugin/ScriptingLoader.java b/src/main/java/com/mengcraft/script/plugin/ScriptingLoader.java
@@ -176,6 +176,7 @@ public void onEnable() {
         Object global = ctx.eval("this", bindings);
         Object jsObject = ctx.eval("Object", bindings);
         ((Invocable) ctx).invokeMethod(jsObject, "bindProperties", global, this);
+        ctx.eval("load(\"nashorn:mozilla_compat.js\"); importPackage(java.lang, java.util, org.bukkit);", bindings);
         ctx.eval(new FileReader(jsFile), bindings);
     }