astorks · astorks · Feb 25, 2020 · Feb 20, 2020 · Feb 20, 2020 · Feb 20, 2020
diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
@@ -34,6 +34,17 @@ jobs:
         zip -r ../ScriptableMC-JavaScript-Lib.zip ./*
         cd ../
         cp ./ScriptableMC-JavaScript-Lib.zip ../../ScriptableMC-Engine-JS/src/main/resources/libraries.zip
+    - name: Export lib-smc with gradle
+      run: ./gradlew :ScriptableMC-Tools-TS:generateLibSMC
+    - name: Compile lib-smc, create archive, and publish
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cd ./ScriptableMC-Tools-TS/lib-smc/
+        npm install
+        npm run compile
+        npm publish ./js
+        zip -r ./Lib-SMC.zip ./*
     - name: Build All Plugins with Gradle
       run: ./gradlew :shadowJarAll
     - name: Copy artifacts
@@ -45,6 +56,7 @@ jobs:
         cp ./build/ScriptableMC-Engine-PY-Bundled.jar ./artifacts/
         cp ./ScriptableMC-Tools-TS/lib/ScriptableMC-TypeScript-Lib.zip ./artifacts/
         cp ./ScriptableMC-Tools-TS/lib/ScriptableMC-JavaScript-Lib.zip ./artifacts/
+        cp ./ScriptableMC-Tools-TS/lib-smc/Lib-SMC.zip ./artifacts/
     - uses: actions/upload-artifact@v1
       with:
         name: ScriptableMC-Engine-DEV

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,6 +30,18 @@ jobs:
         zip -r ../ScriptableMC-JavaScript-Lib.zip ./*
         cd ../
         cp ./ScriptableMC-JavaScript-Lib.zip ../../ScriptableMC-Engine-JS/src/main/resources/libraries.zip
+    - name: Export lib-smc with gradle
+      run: ./gradlew :ScriptableMC-Tools-TS:generateLibSMCRelease
+    - name: Compile lib-smc, create archive, and publish
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      run: |
+        cd ./ScriptableMC-Tools-TS/lib-smc/
+        npm install
+        npm run compile
+        npm publish ./js --access public
+        zip -r ./Lib-SMC.zip ./*
     - name: Build JS Engine with Gradle
       run: ./gradlew :shadowJarAll
     - name: Upload JavaScript Engine Plugin Jar
@@ -49,13 +61,13 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        args: 'ScriptableMC-Engine-JS-Bundled/build/libs/ScriptableMC-Engine-JS-Bundled.jar'
+        args: 'ScriptableMC-Engine-JS/Bundled/build/libs/ScriptableMC-Engine-JS-Bundled.jar'
     - name: Upload Bundled Python Engine Plugin Jar
       uses: skx/github-action-publish-binaries@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        args: 'ScriptableMC-Engine-PY-Bundled/build/libs/ScriptableMC-Engine-PY-Bundled.jar'
+        args: 'ScriptableMC-Engine-PY/Bundled/build/libs/ScriptableMC-Engine-PY-Bundled.jar'
     - name: Upload TypeScript Libraries
       uses: skx/github-action-publish-binaries@master
       env:

diff --git a/.gitignore b/.gitignore
@@ -42,4 +42,5 @@ node_modules/
 .rpt2_cache/
 libraries/tools/kotlin-test-nodejs-runner/lib/
 local.properties
-lib
+lib
+lib-smc
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/astorks/ScriptableMC-Engine?label=ScriptableMC&style=for-the-badge)](https://github.com/astorks/ScriptableMC-Engine/releases/latest)
 [![SpigotMC Resource](https://img.shields.io/badge/SpigotMC-Resource-yellow?style=for-the-badge)](https://www.spigotmc.org/resources/scriptablemc-engine.74690/)
+![License](https://img.shields.io/github/license/astorks/ScriptableMC-Engine?style=for-the-badge)
 
 Run JavaScript/TypeScript plugins for Minecraft 1.15 using the GraalJS script engine.<br />
 Supported Minecraft Versions: Bukkit/Spigot/Paper 1.12, 1.13, 1.14, **1.15**<br />
@@ -15,32 +16,46 @@ Most linux servers already use OpenJDK, however if you're running windows or wan
 
 GraalVM-CE is a free open source java runtime created by Oracle that is pre-packaged with the GraalJS Engine allowing all javascript engine features including AOT compilation of javascript.
 
-## Installing The Plugin
-- Ensure your server is running OpenJDK 8+ or GraalVM
-- [Download the latest ScriptableMC plugin](https://github.com/astorks/ScriptableMC-Engine/releases/latest) and place it in your plugins folder.
-- Take a look at [ScriptableMC-TypeScript](https://github.com/astorks/ScriptableMC-TypeScript) for a full typescript plugin example.
+## Installing The JavaScript Engine Plugin
+##### If your server is running on a Standard JDK
+- Download the latest [`ScriptableMC-Engine-JS-Bundled.jar`](https://github.com/astorks/ScriptableMC-Engine/releases/latest/download/ScriptableMC-Engine-JS-Bundled.jar) and place it in your plugins folder.
+##### If your server is running on a GraalVM JDK
+- Download the latest [`ScriptableMC-Engine-JS.jar`](https://github.com/astorks/ScriptableMC-Engine/releases/latest/download/ScriptableMC-Engine-JS.jar) and place it in your plugins folder.
+
+Take a look at [ScriptableMC-TypeScript](https://github.com/astorks/ScriptableMC-TypeScript) for a full typescript plugin example.
 You can take the typescript example and compile it, then directly modify the javascript if you don't want to use typescript.
 
 ## Commands and Permissions
 ##### ScritableMC Base Command
 | Command       | Alias         | Description                                           | Permission               |
 | ------------- | ------------- |-----------------------------------------------------| ------------------------ |
-| `/scriptablemc menu`   | `/smc m`       | Opens an inventory menu that allows you to control the scriptable engine. | `scriptablemc.menu` |
-| `/scriptablemc info`   | `/smc i`       | Prints plugin version and GraalVM/GraalJS versions if available. | `scriptablemc.info` |
-| `/scriptablemc reload`   | `/smc rl`       | Fully reloads all script engines. | `scriptablemc.reload` |
+| `/scriptablemc menu`   | `/smc m`       | Opens an inventory menu that allows you to control the script engines. | `scriptablemc.menu` |
+| `/scriptablemc info`   | `/smc i`       | Prints plugin version and all loaded script engine versions if available. | `scriptablemc.info` |
+| `/scriptablemc reload`   | `/smc rl`       | Fully reloads all script engines and all script files. | `scriptablemc.reload` |
 | `/scriptablemc version`   | `/smc v`       | Check the github releases for any updates. | `scriptablemc.version` |
 
-##### ScritableMC JavaScript Sub Command
+##### ScritableMC JavaScript Engine Commands
 | Command       | Alias         | Description                                           | Permission               |
 | ------------- | ------------- |-----------------------------------------------------| ------------------------ |
-| `/scriptablemc reload`   | `/smc rl /jsrl`       | Fully reloads the script engine and all script files. | `scriptablemc.reload` |
+| `/scriptablemc javascript reload`   | `/smc rl /jsrl`       | Fully reloads the javascript engine and all script files. | `scriptablemc.js.reload` |
 | `/scriptablemc javascript execute <source>`   | `/smc js ex <source>`       | Executes javascript source and prints the return value. | `scriptablemc.js.execute` |
 | `/scriptablemc javascript execute stash`   | `/smc js ex stash`       | Executes javascript source stored in your stash. | `scriptablemc.js.execute` |
 | `/scriptablemc javascript file <filePath>`   | `/smc js f <filePath>`       | Executes javascript file from the scripts folder. | `scriptablemc.js.execute.file` |
 | `/scriptablemc javascript stash`   | `/smc js st`       | Prints all stored javascript lines in your stash. | `scriptablemc.js.execute` |
 | `/scriptablemc javascript stash <source>`   | `/smc js st <source>`       | Adds a line to your javascript stash. | `scriptablemc.js.execute` |
 | `/scriptablemc javascript stash clear`   | `/smc js st clear`       | Clears your javascript stash. | `scriptablemc.js.execute` |
 
+##### ScritableMC Python Engine Commands
+| Command       | Alias         | Description                                           | Permission               |
+| ------------- | ------------- |-----------------------------------------------------| ------------------------ |
+| `/scriptablemc python reload`   | `/smc rl /pyrl`       | Fully reloads the python script engine and all script files. | `scriptablemc.python.reload` |
+| `/scriptablemc python execute <source>`   | `/smc py ex <source> /pyex`       | Executes python source and prints the return value. | `scriptablemc.python.execute` |
+| `/scriptablemc python execute stash`   | `/smc py ex stash`       | Executes python source stored in your stash. | `scriptablemc.python.execute` |
+| `/scriptablemc python file <filePath>`   | `/smc py f <filePath>`       | Executes python file from the scripts folder. | `scriptablemc.python.execute.file` |
+| `/scriptablemc python stash`   | `/smc py st`       | Prints all stored python lines in your stash. | `scriptablemc.python.execute` |
+| `/scriptablemc python stash <source>`   | `/smc py st <source>`       | Adds a line to your python stash. | `scriptablemc.python.execute` |
+| `/scriptablemc python stash clear`   | `/smc py st clear`       | Clears your python stash. | `scriptablemc.python.execute` |
+
 ### `/smc javascript execute` Command Example
 > `/jsex return 1 + 1` <br>
 > ![2](https://i.imgur.com/1MkiDxW.png)
@@ -54,4 +69,5 @@ https://github.com/MinusKube/SmartInvs - Inventory helper library<br />
 https://github.com/lucko/helper - MinecraftVersions helper library<br />
 https://github.com/jkcclemens/khttp - HTTP helper library<br />
 https://github.com/aikar/commands - Built-in commands and auto-completion<br />
+https://github.com/apache/commons-io - FileUtils helper library<br />
 https://github.com/graalvm/graaljs - JavaScript engine
diff --git a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineConfig.kt b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineConfig.kt
@@ -0,0 +1,70 @@
+package com.pixlfox.scriptablemc
+
+import org.bukkit.configuration.file.FileConfiguration
+
+abstract class ScriptEngineConfig(private val config: FileConfiguration) {
+    val rootScriptsFolder: String
+        get() = readConfigString("root_scripts_folder", "./scripts")
+
+    abstract val mainScriptFiles: List<String>
+    abstract val executeCommandTemplate: String
+    abstract val scriptMimeType: String
+
+    val autoEnablePlugins: Boolean
+        get() = readConfigBoolean("auto_enable_plugins", true)
+
+    val debug: Boolean
+        get() = readConfigBoolean("debug", false)
+
+    val extractLibs: Boolean
+        get() = readConfigBoolean("extract_libs", true)
+
+    val debugger: ScriptEngineDebuggerConfig
+        get() = ScriptEngineDebuggerConfig(this)
+
+    @JvmOverloads
+    fun readConfigString(path: String, def: String = ""): String {
+        val input = config.getString(path, def).orEmpty()
+        val regex = Regex("\\\$\\{(.*)}")
+
+        return regex.replace(input) {
+            val configValue = readConfigString(it.groups[1]!!.value)
+            configValue
+        }
+    }
+
+    @JvmOverloads
+    fun readConfigStringList(path: String, def: List<String> = listOf()): List<String> {
+        val inputList = config.getStringList(path)
+        val regex = Regex("\\\$\\{(.*)}")
+
+        if(inputList.isEmpty()) {
+            inputList.addAll(def)
+        }
+
+        for((index, input) in inputList.withIndex()) {
+            inputList[index] = regex.replace(input) {
+                val configValue = readConfigString(it.groups[1]!!.value)
+                configValue
+            }
+        }
+
+        return inputList
+    }
+
+    @JvmOverloads
+    fun readConfigBoolean(path: String, def: Boolean = false): Boolean {
+        return readConfigString(path, def.toString()).equals("true", true)
+    }
+}
+
+class ScriptEngineDebuggerConfig(private val config: ScriptEngineConfig) {
+    val enabled: Boolean
+        get() = config.readConfigBoolean("debugger.enabled", false)
+
+    val address: String
+        get() = config.readConfigString("debugger.address", "127.0.0.1:9229")
+
+    val waitAttached: Boolean
+        get() = config.readConfigBoolean("debugger.wait_attached", true)
+}
diff --git a/...leMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt b/...leMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt
@@ -29,6 +29,9 @@ abstract class ScriptablePluginContext: Listener {
     abstract val inventoryManager: InventoryManager
     abstract val pluginVersion: Version
 
+    var isEnabled: Boolean = false
+        internal set
+
     val server: Server
         get() = Bukkit.getServer()