From fd06ebb9dc06b11ade3ab855f5a331ae89104ec7 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Wed, 26 Feb 2020 10:51:04 -0700
Subject: [PATCH 1/9] Bumped version to v1.2.2 Added
 ScriptablePluginEngine.getPluginInstance() to resolve a scriptable plugin
 instance.

---
 .../core/ScriptablePluginEngine.kt            | 41 ++++++++++++++++++-
 .../core/JavaScriptPluginEngine.kt            | 32 ---------------
 .../src/main/resources/plugin.yml             |  2 +-
 .../scriptablemc/core/PythonPluginEngine.kt   | 36 ----------------
 .../src/main/resources/plugin.yml             |  2 +-
 build.gradle.kts                              |  2 +-
 6 files changed, 43 insertions(+), 72 deletions(-)

diff --git a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt
index 9c8ea70e..5396643d 100644
--- a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt
+++ b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginEngine.kt
@@ -104,6 +104,14 @@ abstract class ScriptablePluginEngine {
         }
     }
 
+    open fun getPluginInstance(name: String): Value? {
+        return getPluginInstance(scriptablePlugins.firstOrNull { it.pluginName == name })
+    }
+
+    open fun getPluginInstance(pluginContext: ScriptablePluginContext?): Value? {
+        return pluginContext?.pluginInstance
+    }
+
     open fun eval(source: Source): Value {
         return graalContext.eval(source)
     }
@@ -173,7 +181,38 @@ abstract class ScriptablePluginEngine {
         )
     }
 
-    abstract fun loadMainScript(path: String)
+    open fun loadMainScript(path: String) {
+        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))
+                    }
+                }
+            }
+            else {
+                throw ScriptNotFoundException(mainScriptFile)
+            }
+        }
+        catch(ex: Exception) {
+            startupErrors.add(ex)
+        }
+    }
+
     abstract fun loadPlugin(scriptableClass: Value): ScriptablePluginContext
 
     companion object {
diff --git a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
index 3baf2458..6586dfeb 100644
--- a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
+++ b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
@@ -92,38 +92,6 @@ class JavaScriptPluginEngine(override val bootstrapPlugin: ScriptEngineMain, ove
         globalBindings = graalContext.getBindings(languageName)
     }
 
-    override fun loadMainScript(path: String) {
-        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))
-                    }
-                }
-            }
-            else {
-                throw ScriptNotFoundException(mainScriptFile)
-            }
-        }
-        catch(ex: Exception) {
-            startupErrors.add(ex)
-        }
-    }
-
     override fun start() {
         instance = this
         super.start()
diff --git a/ScriptableMC-Engine-JS/src/main/resources/plugin.yml b/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
index 40b1e83a..93f4b655 100644
--- a/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
+++ b/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: ScriptableMC-Engine-JS
 description: 'Run JavaScript/TypeScript plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.2.1'
+version: '1.2.2'
 api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.SMCJavaScriptEngineMain
diff --git a/ScriptableMC-Engine-PY/src/main/kotlin/com/pixlfox/scriptablemc/core/PythonPluginEngine.kt b/ScriptableMC-Engine-PY/src/main/kotlin/com/pixlfox/scriptablemc/core/PythonPluginEngine.kt
index 22f77fa2..d28554c4 100644
--- a/ScriptableMC-Engine-PY/src/main/kotlin/com/pixlfox/scriptablemc/core/PythonPluginEngine.kt
+++ b/ScriptableMC-Engine-PY/src/main/kotlin/com/pixlfox/scriptablemc/core/PythonPluginEngine.kt
@@ -2,7 +2,6 @@ package com.pixlfox.scriptablemc.core
 
 import com.pixlfox.scriptablemc.SMCPythonConfig
 import com.pixlfox.scriptablemc.ScriptEngineMain
-import com.smc.exceptions.ScriptNotFoundException
 import com.pixlfox.scriptablemc.utils.UnzipUtility
 import fr.minuskube.inv.InventoryManager
 import org.graalvm.polyglot.*
@@ -53,41 +52,6 @@ class PythonPluginEngine(override val bootstrapPlugin: ScriptEngineMain, overrid
         globalBindings = graalContext.getBindings(languageName)
     }
 
-    override fun loadMainScript(path: String) {
-        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()
-                )
-
-                // 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()
-                    }
-                }
-            }
-            else {
-                throw ScriptNotFoundException(mainScriptFile)
-            }
-        }
-        catch(ex: Exception) {
-            startupErrors.add(ex)
-        }
-    }
 
     override fun start() {
         instance = this
diff --git a/ScriptableMC-Engine-PY/src/main/resources/plugin.yml b/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
index 59101626..c0e699d5 100644
--- a/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
+++ b/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: ScriptableMC-Engine-PY
 description: 'Run Python plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.2.1'
+version: '1.2.2'
 api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.SMCPythonEngineMain
diff --git a/build.gradle.kts b/build.gradle.kts
index e1c0ce13..7d85fc5d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "com.pixlfox.scriptablemc"
-    version = "1.2.1"
+    version = "1.2.2"
 
     repositories {
         mavenCentral()

From 0ba0a4b5322f55ac9b989cf599e4468916380650 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Thu, 27 Feb 2020 13:24:42 -0700
Subject: [PATCH 2/9] Added com.smc.nbtapi library to help with NBT data. Fixed
 additional List and Collection return types in typescript generation. Updated
 the typescript library generator.

---
 .idea/jarRepositories.xml                     |   5 +
 README.md                                     |   1 +
 ScriptableMC-Engine-Core/build.gradle.kts     |   1 +
 .../Bundled/build.gradle.kts                  |   1 +
 ScriptableMC-Engine-JS/build.gradle.kts       |   2 +
 .../Bundled/build.gradle.kts                  |   1 +
 ScriptableMC-Engine-PY/build.gradle.kts       |   2 +
 ScriptableMC-Tools-TS/build.gradle.kts        |   1 +
 .../scriptablemc/TypescriptLibraryExporter.kt | 211 +++++++++++++-----
 ScriptableMC-Tools-TS/src/main/ts/JsPlugin.ts |  11 +
 build.gradle.kts                              |   4 +
 11 files changed, 187 insertions(+), 53 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 2eebef07..f0221557 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -61,5 +61,10 @@
       <option name="name" value="JitPack" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="codemc-repo" />
+      <option name="name" value="codemc-repo" />
+      <option name="url" value="https://repo.codemc.org/repository/maven-public/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 69f12399..f8ed8ebd 100644
--- a/README.md
+++ b/README.md
@@ -69,5 +69,6 @@ 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/tr7zw/Item-NBT-API - NBT helper library<br />
 https://github.com/apache/commons-io - FileUtils helper library<br />
 https://github.com/graalvm/graaljs - JavaScript engine
diff --git a/ScriptableMC-Engine-Core/build.gradle.kts b/ScriptableMC-Engine-Core/build.gradle.kts
index 4260a3fe..56f10a8b 100644
--- a/ScriptableMC-Engine-Core/build.gradle.kts
+++ b/ScriptableMC-Engine-Core/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
+    implementation("de.tr7zw:item-nbt-api:2.2.0")
 
     testImplementation("junit", "junit", "4.12")
 }
diff --git a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
index 838ea444..010b67f6 100644
--- a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
@@ -56,5 +56,6 @@ tasks.jar {
 tasks.shadowJar {
     archiveFileName.set("ScriptableMC-Engine-JS-Bundled.jar")
     relocate("co.aikar.commands", "com.pixlfox.scriptablemc.acf")
+    relocate("de.tr7zw.changeme.nbtapi", "com.smc.nbtapi")
     mergeServiceFiles()
 }
\ No newline at end of file
diff --git a/ScriptableMC-Engine-JS/build.gradle.kts b/ScriptableMC-Engine-JS/build.gradle.kts
index 27711155..128e1284 100644
--- a/ScriptableMC-Engine-JS/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
+    implementation("de.tr7zw:item-nbt-api:2.2.0")
 
     testImplementation("junit", "junit", "4.12")
 }
@@ -53,5 +54,6 @@ tasks.jar {
 tasks.shadowJar {
     archiveFileName.set("ScriptableMC-Engine-JS.jar")
     relocate("co.aikar.commands", "com.pixlfox.scriptablemc.acf")
+    relocate("de.tr7zw.changeme.nbtapi", "com.smc.nbtapi")
     mergeServiceFiles()
 }
\ No newline at end of file
diff --git a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
index a348d81c..5da4e20b 100644
--- a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
@@ -56,5 +56,6 @@ tasks.jar {
 tasks.shadowJar {
     archiveFileName.set("ScriptableMC-Engine-PY-Bundled.jar")
     relocate("co.aikar.commands", "com.pixlfox.scriptablemc.acf")
+    relocate("de.tr7zw.changeme.nbtapi", "com.smc.nbtapi")
     mergeServiceFiles()
 }
\ No newline at end of file
diff --git a/ScriptableMC-Engine-PY/build.gradle.kts b/ScriptableMC-Engine-PY/build.gradle.kts
index 31978e98..ea1f7186 100644
--- a/ScriptableMC-Engine-PY/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
+    implementation("de.tr7zw:item-nbt-api:2.2.0")
 
     testImplementation("junit", "junit", "4.12")
 }
@@ -53,5 +54,6 @@ tasks.jar {
 tasks.shadowJar {
     archiveFileName.set("ScriptableMC-Engine-PY.jar")
     relocate("co.aikar.commands", "com.pixlfox.scriptablemc.acf")
+    relocate("de.tr7zw.changeme.nbtapi", "com.smc.nbtapi")
     mergeServiceFiles()
 }
\ No newline at end of file
diff --git a/ScriptableMC-Tools-TS/build.gradle.kts b/ScriptableMC-Tools-TS/build.gradle.kts
index 5e3f17a3..0e6ab831 100644
--- a/ScriptableMC-Tools-TS/build.gradle.kts
+++ b/ScriptableMC-Tools-TS/build.gradle.kts
@@ -35,6 +35,7 @@ dependencies {
     implementation("com.beust:klaxon:5.2")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("commons-io:commons-io:2.6")
+    implementation("de.tr7zw:item-nbt-api:2.2.0")
 
     testImplementation("junit", "junit", "4.12")
 }
diff --git a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
index f6d05e41..35f5fc96 100644
--- a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
+++ b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
@@ -14,9 +14,34 @@ import java.lang.reflect.*
 class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
     private var basePath: String = "./lib"
     private val classList = mutableListOf<Class<*>>()
-    private var allowedPackagesRegex: Regex = Regex("(org\\.bukkit|com\\.pixlfox|com\\.smc|fr\\.minuskube\\.inv|com\\.google|java\\.sql|java\\.io|java\\.nio|khttp|org\\.apache\\.commons\\.io)(.*)?")
     private val paranamer: Paranamer = BytecodeReadingParanamer()
     private val isRelease: Boolean = args.contains("--release")
+    private val packageWhitelist: MutableList<String> = mutableListOf(
+        "org.bukkit",
+        "com.pixlfox.scriptablemc",
+        "com.smc",
+        "fr.minuskube.inv",
+        "com.google",
+        "java.sql",
+        "java.io",
+        "java.nio",
+        "khttp",
+        "org.apache.commons.io",
+        "de.tr7zw"
+    )
+    private val packageRedirects: MutableMap<String, String> = mutableMapOf(
+        "de.tr7zw.changeme" to "com.smc"
+    )
+
+    private val allowedPackagesRegex: Regex
+    get() {
+        val fixedPackages: MutableList<String> = mutableListOf()
+        for(packageName in packageWhitelist) {
+            fixedPackages.add(packageName.replace(".", "\\."))
+        }
+
+        return Regex("(${fixedPackages.joinToString("|")})(.*)?")
+    }
 
     private fun safeName(name: String): String = when {
         name.equals("function", true) -> "_function"
@@ -45,11 +70,28 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             return "Array<${javaClassToTypescript(_class.componentType)}>"
         }
 
-        if(className.equals("List", false)) {
+        if(className.equals("List", false) || className.equals("Collection", false)) {
             if(genericType != null && genericType is ParameterizedType) {
                 val actualTypeArg = genericType.actualTypeArguments.firstOrNull()
-                if(actualTypeArg != null && actualTypeArg is Class<*>) {
-                    return "Array<${javaClassToTypescript(actualTypeArg)}>"
+                if(actualTypeArg != null) {
+                    when (actualTypeArg) {
+                        is Class<*> -> {
+                            return "Array<${javaClassToTypescript(actualTypeArg)}>"
+                        }
+                        else -> {
+                            if(actualTypeArg.typeName.startsWith("? extends ")) {
+                                try {
+                                    val extendsClass = javaClass.classLoader.loadClass(actualTypeArg.typeName.substring(10))
+                                    return "Array<${javaClassToTypescript(extendsClass)}>"
+                                } catch(e: Exception) {
+                                    e.printStackTrace()
+                                }
+                            }
+                            else {
+                                println("Unknown reflection type ${actualTypeArg.javaClass.name}, name: ${actualTypeArg.typeName}")
+                            }
+                        }
+                    }
                 }
             }
 
@@ -69,8 +111,18 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         else className
     }
 
-    fun allowPackages(regex: String): TypescriptLibraryExporter {
-        this.allowedPackagesRegex = Regex(regex)
+    fun addWhitelistPackage(packageName: String): TypescriptLibraryExporter {
+        packageWhitelist.add(packageName)
+        return this
+    }
+
+    fun removeWhitelistPackage(packageName: String): TypescriptLibraryExporter {
+        packageWhitelist.remove(packageName)
+        return this
+    }
+
+    fun clearWhitelistPackages(): TypescriptLibraryExporter {
+        packageWhitelist.clear()
         return this
     }
 
@@ -117,6 +169,11 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             khttp.responses.GenericResponse::class.java,
             khttp.responses.Response::class.java,
 
+            de.tr7zw.changeme.nbtapi.NBTItem::class.java,
+            de.tr7zw.changeme.nbtapi.NBTEntity::class.java,
+            de.tr7zw.changeme.nbtapi.NBTFile::class.java,
+            de.tr7zw.changeme.nbtapi.NBTContainer::class.java,
+
             java.io.File::class.java
         )
         return this
@@ -207,7 +264,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         return this
     }
 
-    private fun buildClassList(_class: Class<*>): Array<Class<*>> {
+    private fun buildClassList(_class: Class<*>, ignoreWhitelist: Boolean = false): Array<Class<*>> {
         val classList = mutableListOf<Class<*>>()
 
         for (_method in _class.methods) {
@@ -217,12 +274,32 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             }
 
             val genericType = _method.genericReturnType
-            if(stripPackageName(returnType.name).equals("List", false)) {
+            val className = stripPackageName(returnType.name)
+            if(className.equals("List", false) || className.equals("Collection", false)) {
                 if(genericType != null && genericType is ParameterizedType) {
                     val actualTypeArg = genericType.actualTypeArguments.firstOrNull()
-                    if(actualTypeArg != null && actualTypeArg is Class<*>) {
-                        if (!classList.contains(actualTypeArg)) {
-                            classList.add(actualTypeArg)
+                    if(actualTypeArg != null) {
+                        when (actualTypeArg) {
+                            is Class<*> -> {
+                                if (!classList.contains(actualTypeArg)) {
+                                    classList.add(actualTypeArg)
+                                }
+                            }
+                            else -> {
+                                if(actualTypeArg.typeName.startsWith("? extends ")) {
+                                    try {
+                                        val extendsClass = javaClass.classLoader.loadClass(actualTypeArg.typeName.substring(10))
+                                        if (!classList.contains(extendsClass)) {
+                                            classList.add(extendsClass)
+                                        }
+                                    } catch(e: Exception) {
+                                        e.printStackTrace()
+                                    }
+                                }
+                                else {
+                                    println("Unknown reflection type ${actualTypeArg.javaClass.name}, name: ${actualTypeArg.typeName}")
+                                }
+                            }
                         }
                     }
                 }
@@ -267,49 +344,18 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
                 }
         }
 
-        return classList.toTypedArray()
+        return if(ignoreWhitelist) {
+            classList.toTypedArray()
+        } else {
+            classList.filter { allowedPackagesRegex.matches(getPackageName(it.name)) }.toTypedArray()
+        }
     }
 
     private fun buildClassList(_classes: Array<out Class<*>>): Array<Class<*>> {
         val classList = mutableListOf<Class<*>>()
 
         for(_class in _classes) {
-            for (_method in _class.methods) {
-                val returnType = fixClass(_method.returnType)
-                if (!classList.contains(returnType)) {
-                    classList.add(returnType)
-                }
-
-                for (_parameter in _method.parameters) {
-                    val type = fixClass(_parameter.type)
-                    if (!classList.contains(type)) {
-                        classList.add(type)
-                    }
-                }
-            }
-
-            for (_constructor in _class.constructors) {
-                for (_parameter in _constructor.parameters) {
-                    val type = fixClass(_parameter.type)
-                    if (!classList.contains(type) && type.name.matches(allowedPackagesRegex)) {
-                        classList.add(type)
-                    }
-                }
-            }
-
-            for (_interface in _class.interfaces) {
-                if (!classList.contains(_interface)) {
-                    if (_interface.name.matches(allowedPackagesRegex)) {
-                        classList.add(_interface)
-                    }
-                }
-            }
-
-            if (_class.superclass != null && _class.superclass.name.matches(allowedPackagesRegex)) {
-                if (!classList.contains(_class.superclass)) {
-                    classList.add(_class.superclass)
-                }
-            }
+            classList.addAll(buildClassList(_class))
         }
 
         return classList.toTypedArray()
@@ -351,6 +397,18 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         return this
     }
 
+    fun exportIndexDefinition(): TypescriptLibraryExporter {
+        val file = File("$basePath/ts/index.ts")
+        if(!file.exists()) {
+            file.parentFile.mkdirs()
+            file.createNewFile()
+            file.writeText(generateTypescriptIndexDefinition())
+            println("Exported index.ts.")
+        }
+
+        return this
+    }
+
     fun exportIndexLibrary(): TypescriptLibraryExporter {
         val file = File("$basePath/ts/index.ts")
         if(!file.exists()) {
@@ -482,6 +540,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
 
     private fun generateTypescriptImports(_class: Class<*>): String {
         var tsImportsSource = ""
+        val packageFolderUri = File("$basePath/ts/${getPackageName(_class.name).replace('.', '/')}").absoluteFile.toURI()
 
         val classList = buildClassList(_class)
         for(requiredClass in classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
@@ -489,9 +548,15 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
 
             if(!stripPackageName(_class.name).equals(stripPackageName(requiredClass.name), true)) {
                 if (packageName.matches(allowedPackagesRegex) && !requiredClass.name.endsWith("\$Spigot")) {
-                    val upDirCount = getPackageName(_class.name).split('.').count()
-
-                    tsImportsSource += "import ${safeClassName(stripPackageName(requiredClass.name))} from '${"../".repeat(upDirCount)}${getPackageName(requiredClass.name).replace('.', '/')}/${stripPackageName(requiredClass.name)}.js'\n"
+                    val scriptPathUri = File("$basePath/ts/${getPackageName(requiredClass.name).replace('.', '/')}/${stripPackageName(requiredClass.name)}.js").absoluteFile.toURI()
+                    val relativeScriptUri = packageFolderUri.relativize(scriptPathUri)
+
+                    tsImportsSource += if(!relativeScriptUri.isAbsolute) {
+                        "import ${safeClassName(stripPackageName(requiredClass.name))} from './${relativeScriptUri.path}'\n"
+                    } else {
+                        val upDirCount = getPackageName(_class.name).split('.').count()
+                        "import ${safeClassName(stripPackageName(requiredClass.name))} from '${"../".repeat(upDirCount)}${getPackageName(requiredClass.name).replace('.', '/')}/${stripPackageName(requiredClass.name)}.js'\n"
+                    }
                 }
             }
         }
@@ -525,6 +590,39 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         return tsGlobalExportsSource + "\n"
     }
 
+    private fun generateTypescriptIndexDefinition(): String {
+        var tsGlobalExportsSource = ""
+
+        for (_class in classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
+            if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                tsGlobalExportsSource += generateTypescriptImportForClass(_class)
+            }
+        }
+
+        for((packageName, classes) in this.classList.sortedBy { safeClassName(stripPackageName(it.name)) }.groupBy { getPackageName(it.name) }) {
+            tsGlobalExportsSource += "export namespace Packages.$packageName {\n"
+            for (_class in classes) {
+                if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                    tsGlobalExportsSource += "\texport const ${safeClassName(stripPackageName(_class.name))} = ${getPackageName(_class.name).replace('.', '_')}_${safeClassName(stripPackageName(_class.name))};\n"
+                }
+            }
+            tsGlobalExportsSource += "}\n\n"
+        }
+
+        tsGlobalExportsSource += "export declare const Java: JavaPolyglotInterface;\n"
+        tsGlobalExportsSource += "export interface JavaPolyglotInterface {\n"
+        for(_class in this.classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
+            if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                tsGlobalExportsSource += "\ttype(className: \"${_class.name}\"): typeof Packages.${getPackageName(_class.name)}.${safeClassName(stripPackageName(_class.name))};\n"
+            }
+        }
+        tsGlobalExportsSource += "\ttype(className: string): any;\n"
+        tsGlobalExportsSource += "}\n"
+
+
+        return tsGlobalExportsSource + "\n"
+    }
+
     private fun generateTypescriptInterface(_class: Class<*>): String {
         var methodCount = 0
         var tsInterfaceSource = "export default interface ${safeClassName(stripPackageName(_class.name))}"
@@ -563,7 +661,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         var tsClassSource = "export default class $className {\n"
 
         tsClassSource += "\tpublic static get \$javaClass(): any {\n"
-        tsClassSource += "\t\treturn Java.type('${_class.name}');\n"
+        tsClassSource += "\t\treturn Java.type('${getPackageName(_class.name)}.${stripPackageName(_class.name)}');\n"
         tsClassSource += "\t}\n\n"
 
         for ((index, constructor) in _class.constructors.sortedBy { it.parameterCount }.withIndex()) {
@@ -712,7 +810,14 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             packages.remove(packages.last())
         }
 
-        return packages.joinToString(".")
+        val packageName = packages.joinToString(".")
+
+        for((oldPackageName, newPackageName) in packageRedirects) {
+            if(packageName.startsWith(oldPackageName))
+                return packageName.replace(oldPackageName, newPackageName)
+        }
+
+        return packageName
     }
 
     private fun fixClass(_class: Class<*>): Class<*> {
diff --git a/ScriptableMC-Tools-TS/src/main/ts/JsPlugin.ts b/ScriptableMC-Tools-TS/src/main/ts/JsPlugin.ts
index 604108f5..3222c7c2 100644
--- a/ScriptableMC-Tools-TS/src/main/ts/JsPlugin.ts
+++ b/ScriptableMC-Tools-TS/src/main/ts/JsPlugin.ts
@@ -7,8 +7,11 @@ import PluginMessageListenerRegistration from "./org/bukkit/plugin/messaging/Plu
 import OfflinePlayer from "./org/bukkit/OfflinePlayer.js";
 import MysqlWrapper from "./com/smc/utils/MysqlWrapper.js";
 import File from "./java/io/File.js";
+import ScriptablePluginEngine from "./com/pixlfox/scriptablemc/core/ScriptablePluginEngine.js";
+import ScriptEngineConfig from "./com/pixlfox/scriptablemc/ScriptEngineConfig.js";
 
 declare type Type<T> = { new (...args: any[]): T; };
+declare const engine: ScriptablePluginEngine;
 
 export default class JsPlugin {
     public context: ScriptablePluginContext;
@@ -17,6 +20,10 @@ export default class JsPlugin {
         return this.constructor.name;
     }
 
+    get engineConfig(): ScriptEngineConfig {
+        return engine.getConfig();
+    }
+
     get server(): Server {
         return this.context.getServer();
     }
@@ -69,6 +76,10 @@ export default class JsPlugin {
         return this.context.setPlaceholders(player, placeholderText);
     }
 
+    getPluginInstance<T>(pluginName: string): T {
+        return engine.getPluginInstance(pluginName);
+    }
+
     onLoad(): void { console.log("[" + this.pluginName + "] onLoad()"); }
     onEnable(): void { console.log("[" + this.pluginName + "] onEnable()"); }
     onDisable(): void { console.log("[" + this.pluginName + "] onDisable()"); }
diff --git a/build.gradle.kts b/build.gradle.kts
index 7d85fc5d..6b7eea7b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -40,6 +40,10 @@ allprojects {
             name = "aikar-acf"
             url = uri("https://repo.aikar.co/content/groups/aikar/")
         }
+        maven {
+            name = "codemc-repo"
+            url = uri("https://repo.codemc.org/repository/maven-public/")
+        }
     }
 }
 

From c34251c196cfaacce5ae043f9faee5836b461a2e Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Fri, 28 Feb 2020 09:23:19 -0700
Subject: [PATCH 3/9] Prep to re-add scriptable plugin menu.

---
 .../scriptablemc/core/ScriptablePluginContext.kt     |  2 ++
 .../scriptablemc/core/JavaScriptPluginContext.kt     |  7 ++++---
 .../scriptablemc/core/JavaScriptPluginEngine.kt      | 12 +++++++++++-
 .../scriptablemc/TypescriptLibraryExporter.kt        |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt
index 1e0ff017..61d2e64e 100644
--- a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt
+++ b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/core/ScriptablePluginContext.kt
@@ -4,6 +4,7 @@ import com.smc.version.Version
 import fr.minuskube.inv.InventoryManager
 import me.clip.placeholderapi.PlaceholderAPI
 import org.bukkit.Bukkit
+import org.bukkit.Material
 import org.bukkit.OfflinePlayer
 import org.bukkit.Server
 import org.bukkit.command.CommandMap
@@ -28,6 +29,7 @@ abstract class ScriptablePluginContext: Listener {
     abstract val pluginInstance: Value
     abstract val inventoryManager: InventoryManager
     abstract val pluginVersion: Version
+    open val pluginIcon: Material = Material.STONE
 
     var isEnabled: Boolean = false
         internal set
diff --git a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginContext.kt b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginContext.kt
index 84988681..3f260137 100644
--- a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginContext.kt
+++ b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginContext.kt
@@ -2,12 +2,13 @@ package com.pixlfox.scriptablemc.core
 
 import com.smc.version.Version
 import fr.minuskube.inv.InventoryManager
+import org.bukkit.Material
 import org.bukkit.event.HandlerList
 import org.graalvm.polyglot.Value
 
 
 @Suppress("MemberVisibilityCanBePrivate", "unused")
-class JavaScriptPluginContext(override val engine: ScriptablePluginEngine, override val pluginName: String, override val pluginInstance: Value) : ScriptablePluginContext() {
+class JavaScriptPluginContext(override val engine: ScriptablePluginEngine, override val pluginName: String, override val pluginIcon: Material, override val pluginInstance: Value) : ScriptablePluginContext() {
     override val inventoryManager: InventoryManager
         get() = engine.inventoryManager
 
@@ -48,12 +49,12 @@ class JavaScriptPluginContext(override val engine: ScriptablePluginEngine, overr
     }
 
     companion object {
-        fun newInstance(pluginName: String, engine: ScriptablePluginEngine, pluginInstance: Value): ScriptablePluginContext {
+        fun newInstance(pluginName: String, pluginIcon: Material, engine: ScriptablePluginEngine, pluginInstance: Value): ScriptablePluginContext {
             if(engine.debugEnabled) {
                 engine.bootstrapPlugin.logger.info("[$pluginName] Creating new JavaScript plugin context.")
             }
 
-            return JavaScriptPluginContext(engine, pluginName, pluginInstance)
+            return JavaScriptPluginContext(engine, pluginName, pluginIcon, pluginInstance)
         }
     }
 }
\ No newline at end of file
diff --git a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
index 6586dfeb..44b15e4a 100644
--- a/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
+++ b/ScriptableMC-Engine-JS/src/main/kotlin/com/pixlfox/scriptablemc/core/JavaScriptPluginEngine.kt
@@ -5,6 +5,7 @@ import com.pixlfox.scriptablemc.ScriptEngineMain
 import com.smc.exceptions.ScriptNotFoundException
 import com.pixlfox.scriptablemc.utils.UnzipUtility
 import fr.minuskube.inv.InventoryManager
+import org.bukkit.Material
 import org.graalvm.polyglot.*
 import java.io.File
 
@@ -105,7 +106,16 @@ class JavaScriptPluginEngine(override val bootstrapPlugin: ScriptEngineMain, ove
     override fun loadPlugin(scriptableClass: Value): ScriptablePluginContext {
         val pluginInstance = scriptableClass.newInstance()
         val pluginName = pluginInstance.getMember("pluginName").asString()
-        val pluginContext = JavaScriptPluginContext.newInstance(pluginName, this, pluginInstance)
+        var pluginIcon = Material.STONE
+        if(pluginInstance.hasMember("pluginIcon")) {
+            try {
+                pluginIcon = pluginInstance.getMember("pluginIcon").`as`(Material::class.java)
+            }
+            catch(e: Exception) {
+                e.printStackTrace()
+            }
+        }
+        val pluginContext = JavaScriptPluginContext.newInstance(pluginName, pluginIcon, this, pluginInstance)
         pluginInstance.putMember("context", pluginContext)
         scriptablePlugins.add(pluginContext)
         pluginContext.load()
diff --git a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
index 35f5fc96..07e5e77a 100644
--- a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
+++ b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
@@ -749,7 +749,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         }
 
         for(_interface in _class.interfaces) {
-            if(_interface.name.startsWith("org.bukkit")) {
+            if(_interface.name.matches(allowedPackagesRegex)) {
                 interfaceNames.add(stripPackageName(_interface.name))
             }
         }
@@ -769,10 +769,10 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
 
     private fun getParameters(_method: Method): Array<String> {
         val parameterNames = mutableListOf<String>()
-        val paranames = paranamer.lookupParameterNames(_method, false)
+        val parameterNamesLookup = paranamer.lookupParameterNames(_method, false)
 
         for((index, _parameter) in _method.parameters.withIndex()) {
-            parameterNames.add("${safeName(paranames.getOrElse(index) { _parameter.name })}: ${safeClassName(javaClassToTypescript(_parameter.type))}")
+            parameterNames.add("${safeName(parameterNamesLookup.getOrElse(index) { _parameter.name })}: ${safeClassName(javaClassToTypescript(_parameter.type))}")
         }
 
         return parameterNames.toTypedArray()

From 6969adb989da245dce55d86b8661eae0a03afa55 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Sun, 7 Jun 2020 00:13:37 -0600
Subject: [PATCH 4/9] Added spigot api to typescript exporter.

---
 .../scriptablemc/TypescriptLibraryExporter.kt | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
index 07e5e77a..8764e35f 100644
--- a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
+++ b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
@@ -18,6 +18,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
     private val isRelease: Boolean = args.contains("--release")
     private val packageWhitelist: MutableList<String> = mutableListOf(
         "org.bukkit",
+        "net.md_5.bungee.api",
         "com.pixlfox.scriptablemc",
         "com.smc",
         "fr.minuskube.inv",
@@ -336,7 +337,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             }
         }
 
-        val blacklistRegex = Regex("(spigot|wait|equals|toString|hashCode|getClass|notify|notifyAll|Companion)")
+        val blacklistRegex = Regex("(wait|equals|toString|hashCode|getClass|notify|notifyAll|Companion)")
         for (_field in _class.fields.filter { Modifier.isStatic(it.modifiers) &&Modifier.isPublic(it.modifiers) && !it.name.matches(blacklistRegex) }) {
                 val type = fixClass(_field.type)
                 if (!classList.contains(type) && type.name.matches(allowedPackagesRegex)) {
@@ -366,7 +367,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
 
         for ((packageName, classes) in classList.sortedBy { stripPackageName(it.name) }.groupBy { getPackageName(it.name) }) {
             for (_class in classes) {
-                if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                if(_class.name.matches(allowedPackagesRegex)) {
                     count++
 
                     val file = File("$basePath/ts/${getPackageName(_class.name).replace('.', '/')}/${stripPackageName(_class.name)}.ts")
@@ -547,7 +548,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             val packageName = getPackageName(requiredClass.name)
 
             if(!stripPackageName(_class.name).equals(stripPackageName(requiredClass.name), true)) {
-                if (packageName.matches(allowedPackagesRegex) && !requiredClass.name.endsWith("\$Spigot")) {
+                if (packageName.matches(allowedPackagesRegex)) {
                     val scriptPathUri = File("$basePath/ts/${getPackageName(requiredClass.name).replace('.', '/')}/${stripPackageName(requiredClass.name)}.js").absoluteFile.toURI()
                     val relativeScriptUri = packageFolderUri.relativize(scriptPathUri)
 
@@ -572,7 +573,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         var tsGlobalExportsSource = ""
 
         for (_class in classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
-            if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+            if(_class.name.matches(allowedPackagesRegex)) {
                 tsGlobalExportsSource += generateTypescriptImportForClass(_class)
             }
         }
@@ -580,7 +581,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         for((packageName, classes) in this.classList.sortedBy { safeClassName(stripPackageName(it.name)) }.groupBy { getPackageName(it.name) }) {
             tsGlobalExportsSource += "export namespace $packageName {\n"
             for (_class in classes) {
-                if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                if(_class.name.matches(allowedPackagesRegex)) {
                     tsGlobalExportsSource += "\texport const ${safeClassName(stripPackageName(_class.name))} = ${getPackageName(_class.name).replace('.', '_')}_${safeClassName(stripPackageName(_class.name))};\n"
                 }
             }
@@ -594,7 +595,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         var tsGlobalExportsSource = ""
 
         for (_class in classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
-            if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+            if(_class.name.matches(allowedPackagesRegex)) {
                 tsGlobalExportsSource += generateTypescriptImportForClass(_class)
             }
         }
@@ -602,7 +603,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         for((packageName, classes) in this.classList.sortedBy { safeClassName(stripPackageName(it.name)) }.groupBy { getPackageName(it.name) }) {
             tsGlobalExportsSource += "export namespace Packages.$packageName {\n"
             for (_class in classes) {
-                if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+                if(_class.name.matches(allowedPackagesRegex)) {
                     tsGlobalExportsSource += "\texport const ${safeClassName(stripPackageName(_class.name))} = ${getPackageName(_class.name).replace('.', '_')}_${safeClassName(stripPackageName(_class.name))};\n"
                 }
             }
@@ -612,7 +613,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         tsGlobalExportsSource += "export declare const Java: JavaPolyglotInterface;\n"
         tsGlobalExportsSource += "export interface JavaPolyglotInterface {\n"
         for(_class in this.classList.sortedBy { safeClassName(stripPackageName(it.name)) }) {
-            if(_class.name.matches(allowedPackagesRegex) && !_class.name.endsWith("\$Spigot")) {
+            if(_class.name.matches(allowedPackagesRegex)) {
                 tsGlobalExportsSource += "\ttype(className: \"${_class.name}\"): typeof Packages.${getPackageName(_class.name)}.${safeClassName(stripPackageName(_class.name))};\n"
             }
         }
@@ -635,7 +636,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
 
         tsInterfaceSource += " {\n"
 
-        val blacklistRegex = Regex("(spigot|wait|equals|toString|hashCode|getClass|notify|notifyAll|(.*?)\\\$(.*?))")
+        val blacklistRegex = Regex("(wait|equals|toString|hashCode|getClass|notify|notifyAll|(.*?)\\\$(.*?))")
         for (_method in _class.methods.sortedWith(compareBy({it.name}, {it.parameterCount}))) {
             if(!Modifier.isStatic(_method.modifiers) && Modifier.isPublic(_method.modifiers) && !_method.name.matches(blacklistRegex)) {
                 methodCount++
@@ -674,7 +675,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         }
 
         val countMap = mutableMapOf<String, Int>()
-        val blacklistRegex = Regex("(spigot|wait|equals|toString|hashCode|getClass|notify|notifyAll|Companion)")
+        val blacklistRegex = Regex("(wait|equals|toString|hashCode|getClass|notify|notifyAll|Companion)")
         for (_field in _class.fields.sortedBy { it.name }) {
             var jsFieldName: String = _field.name
 

From 447552faa54dad3a926dea212a1ce4334b94d972 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Sun, 7 Jun 2020 12:16:16 -0600
Subject: [PATCH 5/9] Fixed spigot api typescript export. Updated script
 engines to GraalVM 20.1 Disabled the python engine for now while I focus on
 the javascript engine.

---
 .github/workflows/build-dev.yml               |  4 ++--
 .github/workflows/release.yml                 | 24 +++++++++----------
 ScriptableMC-Engine-Core/build.gradle.kts     |  4 ++--
 .../Bundled/build.gradle.kts                  | 12 +++++-----
 ScriptableMC-Engine-JS/build.gradle.kts       |  4 ++--
 .../Bundled/build.gradle.kts                  |  4 ++--
 ScriptableMC-Engine-PY/build.gradle.kts       |  4 ++--
 ScriptableMC-Tools-TS/build.gradle.kts        |  9 +++----
 .../scriptablemc/TypescriptLibraryExporter.kt | 11 +++++++++
 build.gradle.kts                              | 12 +++++-----
 10 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index 917d309e..e53777ec 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -52,8 +52,8 @@ jobs:
         mkdir artifacts
         cp ./build/ScriptableMC-Engine-JS.jar ./artifacts/
         cp ./build/ScriptableMC-Engine-JS-Bundled.jar ./artifacts/
-        cp ./build/ScriptableMC-Engine-PY.jar ./artifacts/
-        cp ./build/ScriptableMC-Engine-PY-Bundled.jar ./artifacts/
+#        cp ./build/ScriptableMC-Engine-PY.jar ./artifacts/
+#        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/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 20a98845..a3e1e872 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,24 +50,24 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         args: 'ScriptableMC-Engine-JS/build/libs/ScriptableMC-Engine-JS.jar'
-    - name: Upload Python Engine Plugin Jar
-      uses: skx/github-action-publish-binaries@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        args: 'ScriptableMC-Engine-PY/build/libs/ScriptableMC-Engine-PY.jar'
+#    - name: Upload Python Engine Plugin Jar
+#      uses: skx/github-action-publish-binaries@master
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      with:
+#        args: 'ScriptableMC-Engine-PY/build/libs/ScriptableMC-Engine-PY.jar'
     - name: Upload Bundled JavaScript Engine Plugin Jar
       uses: skx/github-action-publish-binaries@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         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'
+#    - 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'
     - name: Upload TypeScript Libraries
       uses: skx/github-action-publish-binaries@master
       env:
diff --git a/ScriptableMC-Engine-Core/build.gradle.kts b/ScriptableMC-Engine-Core/build.gradle.kts
index 56f10a8b..171b1399 100644
--- a/ScriptableMC-Engine-Core/build.gradle.kts
+++ b/ScriptableMC-Engine-Core/build.gradle.kts
@@ -18,8 +18,8 @@ idea {
 
 dependencies {
     // GraalVM SDK & GraalJS Engine
-    compileOnly("org.graalvm.sdk:graal-sdk:20.0.0")
-    compileOnly("org.graalvm.truffle:truffle-api:20.0.0")
+    compileOnly("org.graalvm.sdk:graal-sdk:20.1.0")
+    compileOnly("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
     compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
diff --git a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
index 010b67f6..022c4909 100644
--- a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
@@ -21,12 +21,12 @@ dependencies {
     implementation(project(":ScriptableMC-Engine-JS"))
 
     // GraalVM SDK & GraalJS Engine
-    implementation("org.graalvm.sdk:graal-sdk:20.0.0")
-    implementation("org.graalvm.js:js:20.0.0")
-    implementation("org.graalvm.js:js-scriptengine:20.0.0")
-    implementation("org.graalvm.truffle:truffle-api:20.0.0")
-    implementation("org.graalvm.tools:chromeinspector:20.0.0")
-    implementation("org.graalvm.tools:profiler:20.0.0")
+    implementation("org.graalvm.sdk:graal-sdk:20.1.0")
+    implementation("org.graalvm.js:js:20.1.0")
+    implementation("org.graalvm.js:js-scriptengine:20.1.0")
+    implementation("org.graalvm.truffle:truffle-api:20.1.0")
+    implementation("org.graalvm.tools:chromeinspector:20.1.0")
+    implementation("org.graalvm.tools:profiler:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
     compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
diff --git a/ScriptableMC-Engine-JS/build.gradle.kts b/ScriptableMC-Engine-JS/build.gradle.kts
index 128e1284..3cb608db 100644
--- a/ScriptableMC-Engine-JS/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/build.gradle.kts
@@ -22,8 +22,8 @@ dependencies {
 
 
     // GraalVM SDK & GraalJS Engine
-    compileOnly("org.graalvm.sdk:graal-sdk:20.0.0")
-    compileOnly("org.graalvm.truffle:truffle-api:20.0.0")
+    compileOnly("org.graalvm.sdk:graal-sdk:20.1.0")
+    compileOnly("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
     compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
diff --git a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
index 5da4e20b..6ecc1478 100644
--- a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
@@ -21,8 +21,8 @@ dependencies {
     implementation(project(":ScriptableMC-Engine-PY"))
 
     // GraalVM SDK & GraalPython Engine
-    implementation("org.graalvm.sdk:graal-sdk:20.0.0")
-    implementation("org.graalvm.truffle:truffle-api:20.0.0")
+    implementation("org.graalvm.sdk:graal-sdk:20.1.0")
+    implementation("org.graalvm.truffle:truffle-api:20.1.0")
     implementation(files("libraries/graalpython.jar"))
     implementation(files("libraries/sulong-api.jar"))
     implementation(files("libraries/sulong.jar"))
diff --git a/ScriptableMC-Engine-PY/build.gradle.kts b/ScriptableMC-Engine-PY/build.gradle.kts
index ea1f7186..09fecf49 100644
--- a/ScriptableMC-Engine-PY/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/build.gradle.kts
@@ -21,8 +21,8 @@ dependencies {
     implementation(project(":ScriptableMC-Engine-Core"))
 
     // GraalVM SDK & GraalPython Engine
-    compileOnly("org.graalvm.sdk:graal-sdk:20.0.0")
-    compileOnly("org.graalvm.truffle:truffle-api:20.0.0")
+    compileOnly("org.graalvm.sdk:graal-sdk:20.1.0")
+    compileOnly("org.graalvm.truffle:truffle-api:20.1.0")
 
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
diff --git a/ScriptableMC-Tools-TS/build.gradle.kts b/ScriptableMC-Tools-TS/build.gradle.kts
index 0e6ab831..af90f6ad 100644
--- a/ScriptableMC-Tools-TS/build.gradle.kts
+++ b/ScriptableMC-Tools-TS/build.gradle.kts
@@ -21,13 +21,14 @@ dependencies {
     implementation(project(":ScriptableMC-Engine-JS"))
 
     // GraalVM SDK & GraalJS Engine
-    implementation("org.graalvm.sdk:graal-sdk:20.0.0")
-    implementation("org.graalvm.js:js:20.0.0")
-    implementation("org.graalvm.js:js-scriptengine:20.0.0")
-    implementation("org.graalvm.truffle:truffle-api:20.0.0")
+    implementation("org.graalvm.sdk:graal-sdk:20.1.0")
+    implementation("org.graalvm.js:js:20.1.0")
+    implementation("org.graalvm.js:js-scriptengine:20.1.0")
+    implementation("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
     implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    implementation("net.md-5:bungeecord-api:1.15-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
index 8764e35f..5e4d4c43 100644
--- a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
+++ b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
@@ -143,6 +143,17 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             com.pixlfox.scriptablemc.core.ScriptablePluginEngine::class.java,
             ScriptEngineMain::class.java,
 
+            net.md_5.bungee.api.chat.BaseComponent::class.java,
+            net.md_5.bungee.api.chat.TextComponent::class.java,
+            net.md_5.bungee.api.chat.ComponentBuilder::class.java,
+            net.md_5.bungee.api.chat.ClickEvent::class.java,
+            net.md_5.bungee.api.chat.HoverEvent::class.java,
+            net.md_5.bungee.api.chat.KeybindComponent::class.java,
+            net.md_5.bungee.api.chat.ScoreComponent::class.java,
+            net.md_5.bungee.api.chat.SelectorComponent::class.java,
+            net.md_5.bungee.api.chat.TranslatableComponent::class.java,
+            net.md_5.bungee.api.chat.Keybinds::class.java,
+
             com.smc.utils.ItemBuilder::class.java,
             com.smc.utils.MysqlWrapper::class.java,
             com.smc.utils.Http::class.java,
diff --git a/build.gradle.kts b/build.gradle.kts
index 6b7eea7b..2ca498bb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,22 +52,22 @@ tasks.register("shadowJarAll") {
 
     dependsOn(":ScriptableMC-Engine-JS:shadowJar")
     dependsOn(":ScriptableMC-Engine-JS:Bundled:shadowJar")
-    dependsOn(":ScriptableMC-Engine-PY:shadowJar")
-    dependsOn(":ScriptableMC-Engine-PY:Bundled:shadowJar")
+//    dependsOn(":ScriptableMC-Engine-PY:shadowJar")
+//    dependsOn(":ScriptableMC-Engine-PY:Bundled:shadowJar")
 
     doFirst {
         if(!file("./build").exists()) file("./build").mkdirs()
         if(file("./build/ScriptableMC-Engine-JS.jar").exists()) file("./build/ScriptableMC-Engine-JS.jar").delete()
         if(file("./build/ScriptableMC-Engine-JS-Bundled.jar").exists()) file("./build/ScriptableMC-Engine-JS-Bundled.jar").delete()
-        if(file("./build/ScriptableMC-Engine-PY.jar").exists()) file("./build/ScriptableMC-Engine-PY.jar").delete()
-        if(file("./build/ScriptableMC-Engine-PY-Bundled.jar").exists()) file("./build/ScriptableMC-Engine-PY-Bundled.jar").delete()
+//        if(file("./build/ScriptableMC-Engine-PY.jar").exists()) file("./build/ScriptableMC-Engine-PY.jar").delete()
+//        if(file("./build/ScriptableMC-Engine-PY-Bundled.jar").exists()) file("./build/ScriptableMC-Engine-PY-Bundled.jar").delete()
     }
 
     doLast {
         file("./ScriptableMC-Engine-JS/build/libs/ScriptableMC-Engine-JS.jar").copyTo(file("./build/ScriptableMC-Engine-JS.jar"), overwrite = true)
         file("./ScriptableMC-Engine-JS/Bundled/build/libs/ScriptableMC-Engine-JS-Bundled.jar").copyTo(file("./build/ScriptableMC-Engine-JS-Bundled.jar"), overwrite = true)
-        file("./ScriptableMC-Engine-PY/build/libs/ScriptableMC-Engine-PY.jar").copyTo(file("./build/ScriptableMC-Engine-PY.jar"), overwrite = true)
-        file("./ScriptableMC-Engine-PY/Bundled/build/libs/ScriptableMC-Engine-PY-Bundled.jar").copyTo(file("./build/ScriptableMC-Engine-PY-Bundled.jar"), overwrite = true)
+//        file("./ScriptableMC-Engine-PY/build/libs/ScriptableMC-Engine-PY.jar").copyTo(file("./build/ScriptableMC-Engine-PY.jar"), overwrite = true)
+//        file("./ScriptableMC-Engine-PY/Bundled/build/libs/ScriptableMC-Engine-PY-Bundled.jar").copyTo(file("./build/ScriptableMC-Engine-PY-Bundled.jar"), overwrite = true)
     }
 
 }

From 16438bb879783244af76b09f762c4ce9a9dbe641 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Sun, 7 Jun 2020 12:18:56 -0600
Subject: [PATCH 6/9] Fixed dev build

---
 .github/workflows/build-dev.yml |  2 --
 .github/workflows/release.yml   | 12 ------------
 2 files changed, 14 deletions(-)

diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index e53777ec..52cf9739 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -52,8 +52,6 @@ jobs:
         mkdir artifacts
         cp ./build/ScriptableMC-Engine-JS.jar ./artifacts/
         cp ./build/ScriptableMC-Engine-JS-Bundled.jar ./artifacts/
-#        cp ./build/ScriptableMC-Engine-PY.jar ./artifacts/
-#        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/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3e1e872..8ab1ec29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,24 +50,12 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         args: 'ScriptableMC-Engine-JS/build/libs/ScriptableMC-Engine-JS.jar'
-#    - name: Upload Python Engine Plugin Jar
-#      uses: skx/github-action-publish-binaries@master
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#      with:
-#        args: 'ScriptableMC-Engine-PY/build/libs/ScriptableMC-Engine-PY.jar'
     - name: Upload Bundled JavaScript Engine Plugin Jar
       uses: skx/github-action-publish-binaries@master
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         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'
     - name: Upload TypeScript Libraries
       uses: skx/github-action-publish-binaries@master
       env:

From cfbc3b573ba1d0d1074ba4cdbdd8cf681c2fc85f Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Sun, 7 Jun 2020 12:37:26 -0600
Subject: [PATCH 7/9] Fixed typescript exporter parameter names using reserved
 'with' keyword.

---
 .../kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
index 5e4d4c43..5a68ca45 100644
--- a/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
+++ b/ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt
@@ -51,6 +51,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         name.equals("name", true) -> "_name"
         name.equals("<set-?>", true) -> "value"
         name.equals("in", true) -> "_in"
+        name.equals("with", true) -> "_with"
         else -> name
     }
 

From fe41ef39345144aad35baf29dad6313db2e60259 Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Fri, 19 Jun 2020 16:44:31 -0600
Subject: [PATCH 8/9] Updated version commands to output the correct GraalVM
 version.

---
 .../com/pixlfox/scriptablemc/ScriptEngineGlobalCommands.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineGlobalCommands.kt b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineGlobalCommands.kt
index 67802efb..351f1e4e 100644
--- a/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineGlobalCommands.kt
+++ b/ScriptableMC-Engine-Core/src/main/kotlin/com/pixlfox/scriptablemc/ScriptEngineGlobalCommands.kt
@@ -30,13 +30,13 @@ class ScriptEngineGlobalCommands(private val basePlugin: ScriptEngineMain) : Bas
                     sender.sendMessage("${ChatColor.GREEN}GraalJS Version: ${scriptEngine?.eval("Graal.versionJS")}")
                 }
                 else {
-                    sender.sendMessage("- ${ChatColor.GREEN}GraalJS Engine Version: v20.0.0")
+                    sender.sendMessage("- ${ChatColor.GREEN}GraalJS Engine Version: v20.1.0")
                 }
                 sender.sendMessage("-----------------------------------------------------")
             }
             else if(scriptEngineMain.scriptLanguage == "python") {
                 sender.sendMessage("- ${ChatColor.DARK_BLUE}ScriptableMC Python Engine: ${scriptEngineMain.pluginVersion}")
-                sender.sendMessage("- ${ChatColor.BLUE}GraalPython Version: v20.0.0")
+                sender.sendMessage("- ${ChatColor.BLUE}GraalPython Version: v20.1.0")
                 sender.sendMessage("-----------------------------------------------------")
 
             }

From 2f8b85ff61dc909841ca213b9f0dd90205ec643a Mon Sep 17 00:00:00 2001
From: Ashton Storks <ashton@pixlfox.com>
Date: Wed, 8 Jul 2020 18:38:06 -0600
Subject: [PATCH 9/9] Minecraft 1.16 support

---
 README.md                                            | 2 +-
 ScriptableMC-Engine-Core/build.gradle.kts            | 2 +-
 ScriptableMC-Engine-JS/Bundled/build.gradle.kts      | 2 +-
 ScriptableMC-Engine-JS/build.gradle.kts              | 2 +-
 ScriptableMC-Engine-JS/src/main/resources/plugin.yml | 2 +-
 ScriptableMC-Engine-PY/Bundled/build.gradle.kts      | 2 +-
 ScriptableMC-Engine-PY/build.gradle.kts              | 2 +-
 ScriptableMC-Engine-PY/src/main/resources/plugin.yml | 2 +-
 ScriptableMC-Tools-TS/build.gradle.kts               | 2 +-
 build.gradle.kts                                     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f8ed8ebd..70822008 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 ![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 />
+Supported Minecraft Versions: Bukkit/Spigot/Paper 1.13, 1.14, 1.15, **1.16**<br />
 Untested but should work: 1.8+
 
 **This plugin is in a preview state, there may be breaking changes, missing features, and possibly a few bugs.**<br >
diff --git a/ScriptableMC-Engine-Core/build.gradle.kts b/ScriptableMC-Engine-Core/build.gradle.kts
index 171b1399..17331743 100644
--- a/ScriptableMC-Engine-Core/build.gradle.kts
+++ b/ScriptableMC-Engine-Core/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     compileOnly("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
index 022c4909..ea552f1e 100644
--- a/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/Bundled/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
     implementation("org.graalvm.tools:profiler:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Engine-JS/build.gradle.kts b/ScriptableMC-Engine-JS/build.gradle.kts
index 3cb608db..ddcd1363 100644
--- a/ScriptableMC-Engine-JS/build.gradle.kts
+++ b/ScriptableMC-Engine-JS/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     compileOnly("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Engine-JS/src/main/resources/plugin.yml b/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
index 93f4b655..17887b54 100644
--- a/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
+++ b/ScriptableMC-Engine-JS/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: ScriptableMC-Engine-JS
 description: 'Run JavaScript/TypeScript plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.2.2'
+version: '1.3.0'
 api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.SMCJavaScriptEngineMain
diff --git a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
index 6ecc1478..b432b22d 100644
--- a/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/Bundled/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Engine-PY/build.gradle.kts b/ScriptableMC-Engine-PY/build.gradle.kts
index 09fecf49..13a2a96c 100644
--- a/ScriptableMC-Engine-PY/build.gradle.kts
+++ b/ScriptableMC-Engine-PY/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    compileOnly("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
     compileOnly("me.clip:placeholderapi:2.10.4")
diff --git a/ScriptableMC-Engine-PY/src/main/resources/plugin.yml b/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
index c0e699d5..b0c0c6cb 100644
--- a/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
+++ b/ScriptableMC-Engine-PY/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: ScriptableMC-Engine-PY
 description: 'Run Python plugins for Bukkit/Spigot/Paper Minecraft 1.15'
-version: '1.2.2'
+version: '1.3.0'
 api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.SMCPythonEngineMain
diff --git a/ScriptableMC-Tools-TS/build.gradle.kts b/ScriptableMC-Tools-TS/build.gradle.kts
index af90f6ad..a932b495 100644
--- a/ScriptableMC-Tools-TS/build.gradle.kts
+++ b/ScriptableMC-Tools-TS/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation("org.graalvm.truffle:truffle-api:20.1.0")
 
     implementation("com.github.jkcclemens:khttp:-SNAPSHOT")
-    implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT")
+    implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT")
     implementation("net.md-5:bungeecord-api:1.15-SNAPSHOT")
     implementation("co.aikar:acf-paper:0.5.0-SNAPSHOT")
     implementation("fr.minuskube.inv:smart-invs:1.2.7")
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ca498bb..6d356680 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "com.pixlfox.scriptablemc"
-    version = "1.2.2"
+    version = "1.3.0"
 
     repositories {
         mavenCentral()