feature: update rhino

build.gradle

@@ -19,6 +19,10 @@ repositories {
     maven {
         url 'https://repo.opencollab.dev/maven-snapshots/'
     }
+    maven {
+        name "innercoreSnapshots"
+        url "https://maven.inner-core.org/snapshots"
+    }
 }
 
 configurations {
@@ -39,8 +43,7 @@ dependencies {
 
     // https://central.sonatype.com/artifact/com.google.code.gson/gson/versions
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.7'
-    // https://central.sonatype.com/artifact/org.mozilla/rhino/versions
-    // implementation group: 'org.mozilla', name: 'rhino', version: '1.7.14'
+    implementation group: 'org.mozilla.innercore', name: 'rhino', version: '1.7.15.1'
     // https://central.sonatype.com/artifact/org.json/json/versions
     implementation group: 'org.json', name: 'json', version: '20231013'
 

codegen/src/main/java/org/innercore/codegen/JavaBindingGenerator.java

@@ -989,7 +989,7 @@ private String convertScriptableToJava(VarDecl arg, String expr, BindingOverload
             return expr + " instanceof Wrapper ? (long) ((Wrapper) " + expr + ").unwrap() : ((Number) "
                     + expr + ").longValue()";
         } else if (arg.type.equals(BASE_TYPE_STRING)) {
-            return expr + " instanceof String ? " + expr + ".toString() : (" + expr + " != null && " + expr
+            return expr + " instanceof CharSequence ? " + expr + ".toString() : (" + expr + " != null && " + expr
                     + " != Undefined.instance ? ScriptRuntime.toString(" + expr + ") : " + nullCase + ")";
         } else if (arg.type.equals(BASE_TYPE_BOOL)) {
             return expr + " instanceof Boolean ? (Boolean) " + expr + " : ScriptRuntime.toBoolean(" + expr + ")";

src/main/java/com/reider745/InnerCoreServer.java

@@ -10,6 +10,7 @@
 import com.reider745.commands.CommandsHelper;
 import com.reider745.event.EventListener;
 import com.reider745.event.InnerCorePlugin;
+import com.reider745.hooks.ZoteClassLoaderPool;
 import com.reider745.hooks.item.RuntimeItemsHooks;
 import com.reider745.hooks.SnowfallEverywhere;
 import com.reider745.item.CustomItem;
@@ -35,6 +36,7 @@
 import com.zhekasmirnov.mcpe161.InnerCore;
 import org.json.JSONObject;
 import org.mozilla.javascript.Context;
+import org.mozilla.javascript.ScriptRuntime;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -200,6 +202,11 @@ static File unpackResources(String targetPath, String outputPath) {
     public void preload(Server server) throws Exception {
         final long startupMillis = System.currentTimeMillis();
 
+        org.mozilla.javascript.Logger.DEBUG = Logger::debug;
+        Class.forName("org.mozilla.javascript.Context");
+        ScriptRuntime.GET_MESSAGES = () -> FileTools.getAssetInputStream("rhino/Messages.properties");
+        Context.BUILD_LOADER = ZoteClassLoaderPool::new;
+
         Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
         server.getLogger().info("Initiating target directory '" + server.getDataPath() + "'");
         // BiomesHooks.init();

src/main/java/com/zhekasmirnov/innercore/mod/executable/Executable.java

@@ -2,6 +2,7 @@
 
 import com.reider745.InnerCoreServer;
 import com.reider745.hooks.ZoteClassLoaderPool;
+import com.zhekasmirnov.horizon.runtime.logger.Logger;
 import com.zhekasmirnov.innercore.api.NativeJavaScript;
 import com.zhekasmirnov.innercore.api.log.ICLog;
 import com.zhekasmirnov.innercore.api.mod.API;