diff --git a/codegen/src/main/java/org/innercore/codegen/JavaBindingGenerator.java b/codegen/src/main/java/org/innercore/codegen/JavaBindingGenerator.java index bf62b634..5bbb4387 100644 --- a/codegen/src/main/java/org/innercore/codegen/JavaBindingGenerator.java +++ b/codegen/src/main/java/org/innercore/codegen/JavaBindingGenerator.java @@ -989,7 +989,7 @@ public final class JavaBindingGenerator { 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 + ")"; diff --git a/src/main/java/com/reider745/InnerCoreServer.java b/src/main/java/com/reider745/InnerCoreServer.java index d834bee9..6186ff6a 100644 --- a/src/main/java/com/reider745/InnerCoreServer.java +++ b/src/main/java/com/reider745/InnerCoreServer.java @@ -10,6 +10,7 @@ import com.reider745.behavior.BehaviorPack; 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; @@ -204,6 +205,7 @@ public class InnerCoreServer { 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() + "'"); diff --git a/src/main/java/com/zhekasmirnov/innercore/mod/executable/Compiler.java b/src/main/java/com/zhekasmirnov/innercore/mod/executable/Compiler.java index d1344d03..2c894276 100644 --- a/src/main/java/com/zhekasmirnov/innercore/mod/executable/Compiler.java +++ b/src/main/java/com/zhekasmirnov/innercore/mod/executable/Compiler.java @@ -189,12 +189,10 @@ public class Compiler { jarInputStream.close(); } catch (IOException e) { } - System.out.println(script + " " + jarFile.getAbsolutePath()); return script; } public static Script loadScriptFromDex(File dexFile) throws IOException { - System.out.println("GOIDAAA " + dexFile.getAbsolutePath()); String dexFileAbsolute = dexFile.getAbsolutePath(); File jarFile = new File( (dexFileAbsolute.endsWith(".dex") ? dexFileAbsolute.substring(0, dexFileAbsolute.length() - 4) diff --git a/src/main/java/com/zhekasmirnov/innercore/mod/executable/Executable.java b/src/main/java/com/zhekasmirnov/innercore/mod/executable/Executable.java index 9232712e..276aa117 100644 --- a/src/main/java/com/zhekasmirnov/innercore/mod/executable/Executable.java +++ b/src/main/java/com/zhekasmirnov/innercore/mod/executable/Executable.java @@ -171,7 +171,6 @@ public class Executable implements Runnable { result = new NativeJavaClass(parent, ZoteClassLoaderPool.forName(name), false); } catch (ClassNotFoundException e) { result = new NativeJavaPackage(name); - ICLog.e("WRAP_JAVA", e.getMessage(), e); } javaWrapCache.put(name, result); return result;