sync upstream changes

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

Author: lijinhong11

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

@@ -4,7 +4,6 @@
 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;
@@ -77,7 +76,6 @@ private void advancedSetup() {
 
         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());
     }

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

@@ -154,7 +154,7 @@ public ProjectAddonLoader(File dir, Map<String, File> ids) {
                         Bukkit.getPluginManager().registerEvents(listenerObj, RykenSlimefunCustomizer.INSTANCE);
 
                         addon.setEventListener(listenerObj);
-                        ExceptionHandler.info("成功注册附属 " + addon.getAddonId() + " 的监听脚本 " + file.getName() + "!");
+                        ExceptionHandler.info("Added script listener (file: " + file.getName() + ") for addon " + addon.getAddonId() + " successfully!");
                     } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
                         throw new RuntimeException(e);
                     }
@@ -203,7 +203,7 @@ public ProjectAddonLoader(File dir, Map<String, File> ids) {
                 if (idPattern.contains("%0")) {
                     addon.setIdPattern(idPattern);
                 } else {
-                    ExceptionHandler.handleError("在名称为 " + file.getName() + "的文件夹中有无效的配置: idPattern，idPattern 必须包含 %0（原id）");
+                    ExceptionHandler.handleError("There is an invalid configuration in the folder named ' + file.getName() + ': idPattern must include %0 (the original id).");
                 }
             }
         } else {