Merge remote-tracking branch 'origin/fabric' into fabric

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/script/ScriptBuiltins.java

@@ -65,10 +65,8 @@ static void addBuiltinVariables(ScriptEngine engine) {
             @Override
             public Object newObject(Object... args) {
                 if (args.length < 1 || args.length > 2)
-                    throw new UnsupportedOperationException("new Thread() called with wrong number of arguments");
-                JSObject action;
-                if (!(args[0] instanceof JSObject) || !(action = (JSObject) args[0]).isFunction())
-                    throw new IllegalArgumentException("action is not a function");
+                    throw new UnsupportedOperationException("new Thread() called with " + args.length + " arguments, but expected 1 or 2");
+                JSObject action = ScriptUtil.asFunction(args[0]);
                 boolean daemon = args.length < 2 ? true : (Boolean) ScriptUtils.convert(args[1], Boolean.class);
                 return ScriptManager.createThread(() -> {
                         action.call(null);

src/main/java/net/earthcomputer/clientcommands/script/ScriptInventory.java

@@ -1,6 +1,6 @@
 package net.earthcomputer.clientcommands.script;
 
-import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import jdk.nashorn.api.scripting.JSObject;
 import jdk.nashorn.api.scripting.ScriptUtils;
 import net.earthcomputer.clientcommands.interfaces.ISlot;
 import net.minecraft.client.MinecraftClient;
@@ -66,7 +66,7 @@ public void click(Integer slot) {
         click(slot, null);
     }
 
-    public void click(Integer slot, ScriptObjectMirror options) {
+    public void click(Integer slot, JSObject options) {
         String typeStr = options == null || !options.hasMember("type") ? null : ScriptUtil.asString(options.getMember("type"));
         SlotActionType type = typeStr == null ? SlotActionType.PICKUP :
                 Arrays.stream(SlotActionType.values()).filter(it -> it.name().equalsIgnoreCase(typeStr)).findAny().orElse(SlotActionType.PICKUP);

src/main/java/net/earthcomputer/clientcommands/script/ScriptManager.java

@@ -115,7 +115,11 @@ static ThreadInstance createThread(Callable<Void> task, boolean daemon) {
                     e.getCause().printStackTrace();
                 }
             } catch (Throwable e) {
-                ClientCommandManager.sendError(new LiteralText(e.getMessage()));
+                try {
+                    ClientCommandManager.sendError(new LiteralText(e.getMessage()));
+                } catch (Throwable e1) {
+                    LOGGER.error("Error sending error to chat");
+                }
                 e.printStackTrace();
             }
             runningThreads.remove(thread);

src/main/java/net/earthcomputer/clientcommands/script/ScriptPlayer.java

@@ -189,8 +189,8 @@ public boolean pick(Object itemStack) {
         if (itemStack instanceof String) {
             Item item = Registry.ITEM.get(new Identifier((String) itemStack));
             predicate = stack -> stack.getItem() == item;
-        } else if (itemStack instanceof JSObject && ((JSObject) itemStack).isFunction()) {
-            JSObject jsObject = (JSObject) itemStack;
+        } else if (ScriptUtil.isFunction(itemStack)) {
+            JSObject jsObject = ScriptUtil.asFunction(itemStack);
             predicate = stack -> {
                 Object result = jsObject.call(null, ScriptUtil.fromNbt(stack.toTag(new CompoundTag())));
                 return (Boolean) ScriptUtils.convert(result, Boolean.class);

src/main/java/net/earthcomputer/clientcommands/script/ScriptUtil.java

@@ -2,6 +2,7 @@
 
 import jdk.nashorn.api.scripting.AbstractJSObject;
 import jdk.nashorn.api.scripting.JSObject;
+import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import jdk.nashorn.api.scripting.ScriptUtils;
 import net.minecraft.nbt.*;
 import net.minecraft.util.Identifier;
@@ -254,13 +255,52 @@ public static String simplifyIdentifier(Identifier id) {
             return id.toString();
     }
 
+    public static Object safeWrap(Object obj) {
+        try {
+            return ScriptUtils.wrap(obj);
+        } catch (NoSuchMethodError e) {
+            // hackfix for older Java 8 builds
+            return ScriptObjectMirror.wrap(obj, getGlobalContext());
+        } catch (IllegalArgumentException e) {
+            return obj;
+        }
+    }
+
     public static String asString(Object obj) {
         if (obj == null) return null;
+        obj = safeWrap(obj);
         if (obj instanceof JSObject) {
             return (String) AbstractJSObject.getDefaultValue((JSObject) obj, String.class);
         } else {
             return String.valueOf(obj);
         }
     }
 
+    public static boolean isFunction(Object obj) {
+        try {
+            asFunction(obj);
+            return true;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+    public static JSObject asFunction(Object obj) {
+        obj = safeWrap(obj);
+        if (obj instanceof JSObject && ((JSObject) obj).isFunction())
+            return (JSObject) obj;
+        throw new IllegalArgumentException("Cannot interpret " + obj + " as a function");
+    }
+
+    // unsafe function, should only be used for compatibility with older Java releases
+    private static Object getGlobalContext() {
+        try {
+            return Class.forName("jdk.nashorn.internal.runtime.Context")
+                    .getMethod("getGlobal")
+                    .invoke(null);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException("Unable to get global context", e);
+        }
+    }
+
 }