Sync upstream changes (#17)

* Minor fixes (SlimefunReloadingProject#53)

* fix: 脚本监听器巨卡

* fix

* fix: armor id

* fixes (SlimefunReloadingProject#55)

* fix script

* fix machine

* Update CustomNoEnergyMachine.java

---------

Co-authored-by: balugaq <[email protected]>

Author: lijinhong11

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.lins.mmmjjkx</groupId>
 	<artifactId>RykenSlimefunCustomizer</artifactId>
-	<version>1.5.1</version>
+	<version>20</version>
 	<packaging>jar</packaging>
 
 	<name>RykenSlimefunCustomizer</name>

src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/RykenSlimefunCustomizer.java

@@ -47,7 +47,6 @@ public void onEnable() {
 
         new BlockListener();
         new SingleItemRecipeGuideListener();
-        new ScriptableEventListener();
 
         ExceptionHandler.info("RykenSlimeCustomizer loaded successfully！");
 

src/main/java/org/lins/mmmjjkx/rykenslimefuncustomizer/bulit_in/JavaScriptEval.java

@@ -13,6 +13,8 @@
 import com.oracle.truffle.js.runtime.objects.JSObjectUtil;
 import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.player.PlayerProfile;
+import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
 import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 import java.io.File;
@@ -55,6 +57,8 @@ private void advancedSetup() {
         addThing("SlimefunUtils", env.asHostSymbol(SlimefunUtils.class));
         addThing("BlockMenu", env.asHostSymbol(BlockMenu.class));
         addThing("BlockMenuUtil", env.asHostSymbol(BlockMenuUtil.class));
+        addThing("PlayerProfile", env.asHostSymbol(PlayerProfile.class));
+        addThing("Slimefun", env.asHostSymbol(Slimefun.class));
 
         for (File file : Objects.requireNonNull(PLUGINS_FOLDER.listFiles())) {
             TruffleFile truffleFile = env.getPublicTruffleFile(file.toURI());
@@ -112,17 +116,19 @@ public Object evalFunction(String funName, Object... args) {
         }
 
         try {
-            return jsEngine.invokeFunction(funName, args);
+            Object result = jsEngine.invokeFunction(funName, args);
+            ExceptionHandler.debugLog("运行了 " + getAddon().getAddonName() + "的脚本" + getFile().getName() + "中的函数 " + funName);
+            return result;
         } catch (IllegalStateException e) {
             String message = e.getMessage();
             if (!message.contains("Multi threaded access")) {
-                ExceptionHandler.handleError("在运行" + getFile().getName() + "时发生错误");
-                e.printStackTrace();
+                ExceptionHandler.handleError("An error occcured while executing script file "+ getFile().getName() + "of addon" + addon.getAddonName(), e);
             }
         } catch (ScriptException e) {
-            ExceptionHandler.handleError("An error occurred while executing script file " + getFile().getName());
-            e.printStackTrace();
+            ExceptionHandler.handleError("An error occurred while executing script file " + getFile().getName() + "of addonn" + addon.getAddonName(), e);
         } catch (NoSuchMethodException ignored) {
+        } catch (Throwable e) {
+            ExceptionHandler.handleError("An error occcured while executing script file "+ getFile().getName() + "of addon" + addon.getAddonName(), e);
         }
 
         return null;