spotless

Author: lijinhong11

src/main/java/com/oracle/truffle/api/LanguageEditor.java

@@ -61,6 +61,11 @@ public void setup(Plugin inst) {
         List<String> skip = new ArrayList<>();
 
         for (File folder : folders) {
+            if (folder.isFile()) {
+                ExceptionHandler.handleError(folder.getName() + " 不是文件夹！无法加载此附属！");
+                continue;
+            }
+
             File info = new File(folder, Constants.INFO_FILE);
             if (!info.exists()) {
                 ExceptionHandler.handleError("在名称为 " + folder.getName() + "的文件夹中有无效的附属信息，导致此附属无法加载！");

src/main/java/com/oracle/truffle/host/HostObjectCreator.java

@@ -13,7 +13,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.commands.MainCommand;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.listeners.BlockListener;
-import org.lins.mmmjjkx.rykenslimefuncustomizer.listeners.ScriptableEventListener;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.listeners.SingleItemRecipeGuideListener;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.utils.CommonUtils;
 import org.lins.mmmjjkx.rykenslimefuncustomizer.utils.ExceptionHandler;

src/main/java/com/oracle/truffle/js/builtins/JavaBuiltinsOverride.java

@@ -3,11 +3,8 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.oracle.truffle.api.TruffleFile;
 import com.oracle.truffle.api.TruffleLanguage;
-import com.oracle.truffle.api.strings.TruffleString;
-import com.oracle.truffle.js.builtins.JavaBuiltinsOverride;
 import com.oracle.truffle.js.lang.JavaScriptLanguage;
 import com.oracle.truffle.js.runtime.JSRealm;
-import com.oracle.truffle.js.runtime.java.JavaPackage;
 import com.oracle.truffle.js.runtime.objects.JSAttributes;
 import com.oracle.truffle.js.runtime.objects.JSObject;
 import com.oracle.truffle.js.runtime.objects.JSObjectUtil;
@@ -34,8 +31,8 @@
 import org.lins.mmmjjkx.rykenslimefuncustomizer.utils.ExceptionHandler;
 
 public class JavaScriptEval extends ScriptEval {
-    private static final File PLUGINS_FOLDER = RykenSlimefunCustomizer.INSTANCE.getDataFolder().getParentFile();
-    private static final String[] packages = {"io", "net"};
+    private static final File PLUGINS_FOLDER =
+            RykenSlimefunCustomizer.INSTANCE.getDataFolder().getParentFile();
 
     private GraalJSScriptEngine jsEngine;
 
@@ -69,14 +66,8 @@ private void advancedSetup() {
             }
         }
 
-        for (String packageName : packages) {
-            TruffleString str = TruffleString.fromConstant(packageName, TruffleString.Encoding.UTF_8);
-            JSObjectUtil.putDataProperty(realm.getGlobalObject(), str, JavaPackage.createInit(realm, str), JSAttributes.getDefaultNotEnumerable());
-        }
-
         JSObject java = JSObjectUtil.createOrdinaryPrototypeObject(realm);
         JSObjectUtil.putToStringTag(java, JSRealm.JAVA_CLASS_NAME);
-        JSObjectUtil.putFunctionsFromContainer(realm, java, new JavaBuiltinsOverride());
 
         JSObjectUtil.putDataProperty(realm.getGlobalObject(), "Java", java, JSAttributes.getDefaultNotEnumerable());
     }
@@ -151,8 +142,9 @@ private void reSetup() {
                         .allowValueSharing(true)
                         .allowHostClassLoading(true)
                         .allowIO(IOAccess.ALL)
-                        .allowHostClassLookup(s -> true));
+                        .allowHostClassLookup(s -> true)
+                        .hostClassLoader(ClassLoader.getSystemClassLoader()));
 
         advancedSetup();
     }
-}
+}