Moved try/catch handling to ScriptablePluginEngine.loadMainScript

Added ScriptablePluginEngine.getStartupErrors() to get startup errors inside the script engine.

Author: astorks

ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineConfig.kt

@@ -22,6 +22,7 @@ abstract class ScriptEngineConfig(private val config: FileConfiguration) {
     val debugger: ScriptEngineDebuggerConfig
         get() = ScriptEngineDebuggerConfig(this)
 
+    @JvmOverloads
     fun readConfigString(path: String, def: String = ""): String {
         val input = config.getString(path, def).orEmpty()
         val regex = Regex("\\\$\\{(.*)}")
@@ -32,6 +33,7 @@ abstract class ScriptEngineConfig(private val config: FileConfiguration) {
         }
     }
 
+    @JvmOverloads
     fun readConfigStringList(path: String, def: List<String> = listOf()): List<String> {
         val inputList = config.getStringList(path)
         val regex = Regex("\\\$\\{(.*)}")
@@ -50,6 +52,7 @@ abstract class ScriptEngineConfig(private val config: FileConfiguration) {
         return inputList
     }
 
+    @JvmOverloads
     fun readConfigBoolean(path: String, def: Boolean = false): Boolean {
         return readConfigString(path, def.toString()).equals("true", true)
     }

ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt

@@ -32,9 +32,7 @@ abstract class ScriptablePluginEngine {
     var enabledAllPlugins: Boolean = false
         internal set
 
-    private val _startupErrors = mutableListOf<Exception>()
-    val startupErrors: Array<Exception>
-        get() = _startupErrors.toTypedArray()
+    val startupErrors: MutableList<Exception> = mutableListOf()
 
     open fun start() {
         inventoryManager.init()
@@ -43,12 +41,7 @@ abstract class ScriptablePluginEngine {
         loadAllHelperClasses()
 
         for(mainScriptFile in config.mainScriptFiles) {
-            try {
-                loadMainScript(mainScriptFile)
-            }
-            catch(ex: Exception) {
-                _startupErrors.add(ex)
-            }
+            loadMainScript(mainScriptFile)
         }
 
         if(!enabledAllPlugins && config.autoEnablePlugins) {

ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt

@@ -93,29 +93,34 @@ class JavaScriptPluginEngine(override val bootstrapPlugin: ScriptEngineMain, ove
     }
 
     override fun loadMainScript(path: String) {
-        val mainScriptFile = File(path)
-        if(!mainScriptFile.parentFile.exists()) {
-            mainScriptFile.parentFile.mkdirs()
-        }
+        try {
+            val mainScriptFile = File(path)
+            if(!mainScriptFile.parentFile.exists()) {
+                mainScriptFile.parentFile.mkdirs()
+            }
 
-        if(mainScriptFile.exists()) {
-            val mainReturn = eval(
-                Source.newBuilder(languageName, mainScriptFile)
-                    .name(mainScriptFile.name)
-                    .mimeType(config.scriptMimeType)
-                    .interactive(false)
-                    .build()
-            )
-
-            // Load all plugin types returned as an array
-            if(mainReturn.hasArrayElements()) {
-                for (i in 0 until mainReturn.arraySize) {
-                    this.loadPlugin(mainReturn.getArrayElement(i))
+            if(mainScriptFile.exists()) {
+                val mainReturn = eval(
+                    Source.newBuilder(languageName, mainScriptFile)
+                        .name(mainScriptFile.name)
+                        .mimeType(config.scriptMimeType)
+                        .interactive(false)
+                        .build()
+                )
+
+                // Load all plugin types returned as an array
+                if(mainReturn.hasArrayElements()) {
+                    for (i in 0 until mainReturn.arraySize) {
+                        this.loadPlugin(mainReturn.getArrayElement(i))
+                    }
                 }
             }
+            else {
+                throw ScriptNotFoundException(mainScriptFile)
+            }
         }
-        else {
-            throw ScriptNotFoundException(mainScriptFile)
+        catch(ex: Exception) {
+            startupErrors.add(ex)
         }
     }
 

ScriptableMC-Engine-JS/src/main/resources/config.yml

@@ -67,15 +67,10 @@ common_js:
 
   # CommonJS globals file name
   # The CommonJS globals file used to define global CommonJS values
-  # Relative to the `common_js.modules_path` value
+  # Relative to the `common_js.modules_path` folder
   # Default: globals.js
   globals_file: 'globals.js'
 
-java_libraries:
-  - path: ""
-    preload_classes:
-      - ""
-
 # Chrome debugger settings
 # **WARNING** THE DEBUGGER SHOULD NEVER BE ENABLED ON A PUBLIC SERVER
 # IT IS INTENDED ONLY FOR DEBUGGING THE SCRIPT ENGINE AND CAN BREAK/FREEZE YOUR WHOLE SERVER

ScriptableMC-Engine-PY/src/main/kotlin/com/pixlfox/scriptablemc/core/PythonPluginEngine.kt

@@ -54,33 +54,38 @@ class PythonPluginEngine(override val bootstrapPlugin: ScriptEngineMain, overrid
     }
 
     override fun loadMainScript(path: String) {
-        val mainScriptFile = File(path)
-        if(!mainScriptFile.parentFile.exists()) {
-            mainScriptFile.parentFile.mkdirs()
-        }
+        try {
+            val mainScriptFile = File(path)
+            if(!mainScriptFile.parentFile.exists()) {
+                mainScriptFile.parentFile.mkdirs()
+            }
 
-        if(mainScriptFile.exists()) {
-            val mainReturn = eval(
-                Source.newBuilder(languageName, mainScriptFile)
-                    .name(mainScriptFile.name)
-                    .interactive(false)
-                    .build()
-            )
+            if(mainScriptFile.exists()) {
+                val mainReturn = eval(
+                    Source.newBuilder(languageName, mainScriptFile)
+                        .name(mainScriptFile.name)
+                        .interactive(false)
+                        .build()
+                )
 
-            // Load all plugin types returned as an array
-            if(mainReturn.hasArrayElements()) {
-                for (i in 0 until mainReturn.arraySize) {
-                    this.loadPlugin(mainReturn.getArrayElement(i))
-                }
+                // Load all plugin types returned as an array
+                if(mainReturn.hasArrayElements()) {
+                    for (i in 0 until mainReturn.arraySize) {
+                        this.loadPlugin(mainReturn.getArrayElement(i))
+                    }
 
-                // Enable all plugins if not already enabled
-                if(!enabledAllPlugins) {
-                    enableAllPlugins()
+                    // Enable all plugins if not already enabled
+                    if(!enabledAllPlugins) {
+                        enableAllPlugins()
+                    }
                 }
             }
+            else {
+                throw ScriptNotFoundException(mainScriptFile)
+            }
         }
-        else {
-            throw ScriptNotFoundException(mainScriptFile)
+        catch(ex: Exception) {
+            startupErrors.add(ex)
         }
     }