diff --git a/build.gradle b/build.gradle index 63d7f2d77..58c4e9518 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(21)) + languageVersion.set(JavaLanguageVersion.of(8)) } } diff --git a/dependencies.gradle b/dependencies.gradle index 6549bc534..536698a9d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,6 +49,4 @@ dependencies { exclude module: 'log4j-core' } } - - implementation('org.openjdk.nashorn:nashorn-core:15.4') } diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index ee2cf1ae5..07ddbfde4 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -7,9 +7,11 @@ import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.NpcAPI; -import org.openjdk.nashorn.api.scripting.ScriptObjectMirror; -import javax.script.*; +import javax.script.Compilable; +import javax.script.CompiledScript; +import javax.script.Invocable; +import javax.script.ScriptEngine; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; @@ -33,7 +35,6 @@ public class ScriptContainer { private static Method luaCoerce; private static Method luaCall; private CompiledScript compScript = null; - private final HashMap cachedFunctions = new HashMap<>(); public ScriptContainer(IScriptHandler handler) { this.handler = handler; @@ -172,7 +173,6 @@ public class ScriptContainer { try { if (!evaluated) { - this.cachedFunctions.clear(); engine.eval(getFullCode()); evaluated = true; } @@ -188,15 +188,7 @@ public class ScriptContainer { unknownFunctions.add(type); } } else { - if (!this.cachedFunctions.containsKey(type)) { - ScriptObjectMirror global = (ScriptObjectMirror) engine.getBindings(ScriptContext.ENGINE_SCOPE); - ScriptObjectMirror func = (ScriptObjectMirror) global.get(type); - this.cachedFunctions.put(type, func); - } - ScriptObjectMirror func = this.cachedFunctions.get(type); - if (func != null) { - func.call(null, event); - } + ((Invocable) engine).invokeFunction(type, event); } } catch (NoSuchMethodException e) { unknownFunctions.add(type); diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index e3f3a0e2a..8d9265eec 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -19,8 +19,6 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; -import org.openjdk.nashorn.api.scripting.ClassFilter; -import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory; import javax.script.ScriptContext; import javax.script.ScriptEngine; @@ -32,6 +30,8 @@ import java.io.FileReader; import java.io.IOException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.net.URL; +import java.net.URLClassLoader; import java.util.*; import static noppes.npcs.util.CustomNPCsThreader.customNPCThread; @@ -57,6 +57,7 @@ public class ScriptController { public GlobalNPCDataScript globalNpcScripts = new GlobalNPCDataScript((EntityNPCInterface) null); public long lastGlobalNpcUpdate = 0L; + private URLClassLoader loader; public ScriptController() { Instance = this; @@ -66,10 +67,16 @@ public class ScriptController { LogWriter.info("Script Engines Available:"); try { -// this.nashornFactory = new NashornScriptEngineFactory(); -// LogWriter.info("→ standalone Nashorn loaded"); - Class clazz = Class.forName("org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory"); - this.nashornFactory = (ScriptEngineFactory) clazz.newInstance(); + File nashornJar = new File("mods/nashorn.jar"); // Adjust path if needed + this.loader = new URLClassLoader(new URL[]{nashornJar.toURI().toURL()}, CustomNpcs.class.getClassLoader()); + + ClassLoader cl = CustomNpcs.class.getClassLoader(); + Thread.currentThread().setContextClassLoader(cl); + LogWriter.info("ClassLoader: " + cl); + LogWriter.info("Parent: " + cl.getParent()); + + Class factoryClass = Class.forName("jdk.nashorn.api.scripting.NashornScriptEngineFactory", true, loader); + this.nashornFactory = (ScriptEngineFactory) factoryClass.getDeclaredConstructor().newInstance(); this.languages.put("ECMAScript", ".js"); LogWriter.info("→ standalone Nashorn loaded: " + this.nashornFactory.getEngineName()); } catch (Exception e) { @@ -291,32 +298,20 @@ public class ScriptController { private static final List nashornNames = immutableList("nashorn", "Nashorn", "js", "JS", "JavaScript", "javascript", "ECMAScript", "ecmascript"); public ScriptEngine getEngineByName(String language) { - if (nashornNames.contains(language) && this.nashornFactory != null) { - ScriptEngine scriptEngine = getOpenJDKNashornEngine(); - if (scriptEngine != null) return scriptEngine; + try { - if (ConfigScript.EnableBannedClasses) { - try { - ClassFilter filter = s -> { - for (String className : ConfigScript.BannedClasses) { - if (s.compareTo(className) == 0) { - return false; - } - } - return true; - }; - NashornScriptEngineFactory nashornScriptEngineFactory = (NashornScriptEngineFactory) this.nashornFactory; - scriptEngine = nashornScriptEngineFactory.getScriptEngine(filter); - } catch (Exception e) { - scriptEngine = this.nashornFactory.getScriptEngine(); - } - } else { - scriptEngine = this.nashornFactory.getScriptEngine(); - } + ScriptEngine scriptEngine; + Class factoryClass = Class.forName("jdk.nashorn.api.scripting.NashornScriptEngineFactory", + true, this.loader); + Method getScriptEngine = factoryClass.getMethod("getScriptEngine"); + + scriptEngine = (ScriptEngine) getScriptEngine.invoke(this.nashornFactory); scriptEngine.setBindings(this.manager.getBindings(), ScriptContext.GLOBAL_SCOPE); return scriptEngine; + } catch (Exception exception) { + LogWriter.except(exception); + return null; } - return manager.getEngineByName(language); } public ScriptEngine getOpenJDKNashornEngine() {