Added helper class to register minecraft commands through the new command api.

Author: astorks

ScriptableMC-Engine-Core/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
     implementation("de.tr7zw:item-nbt-api:2.2.0")
-    implementation("dev.jorel:commandapi-core:3.4")
+    compileOnly("dev.jorel:commandapi-core:3.4")
 
     testImplementation("junit", "junit", "4.12")
 }

ScriptableMC-Engine-Core/src/main/kotlin/com/smc/utils/MinecraftCommand.kt

@@ -0,0 +1,93 @@
+package com.smc.utils
+
+import dev.jorel.commandapi.CommandAPICommand
+import dev.jorel.commandapi.CommandPermission
+import dev.jorel.commandapi.arguments.Argument
+import dev.jorel.commandapi.executors.*
+
+@Suppress("unused")
+class MinecraftCommand(commandName: String) {
+    private val apiCommand: CommandAPICommand = CommandAPICommand(commandName)
+    private val arguments: LinkedHashMap<String, Argument> = linkedMapOf()
+
+    fun executes(executor: CommandExecutor): MinecraftCommand  {
+        apiCommand.executes(executor)
+        return this
+    }
+
+    fun executesWithResult(executor: ResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executes(executor)
+        return this
+    }
+
+    fun executesCommandBlock(executor: CommandBlockCommandExecutor): MinecraftCommand  {
+        apiCommand.executesCommandBlock(executor)
+        return this
+    }
+
+    fun executesCommandBlockWithResult(executor: CommandBlockResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executesCommandBlock(executor)
+        return this
+    }
+
+    fun executesConsole(executor: ConsoleCommandExecutor): MinecraftCommand  {
+        apiCommand.executesConsole(executor)
+        return this
+    }
+
+    fun executesConsoleWithResult(executor: ConsoleResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executesConsole(executor)
+        return this
+    }
+
+    fun executesEntity(executor: EntityCommandExecutor): MinecraftCommand  {
+        apiCommand.executesEntity(executor)
+        return this
+    }
+
+    fun executesEntityWithResult(executor: EntityResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executesEntity(executor)
+        return this
+    }
+
+    fun executesPlayer(executor: PlayerCommandExecutor): MinecraftCommand  {
+        apiCommand.executesPlayer(executor)
+        return this
+    }
+
+    fun executesPlayerWithResult(executor: PlayerResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executesPlayer(executor)
+        return this
+    }
+
+    fun executesProxy(executor: ProxyCommandExecutor): MinecraftCommand  {
+        apiCommand.executesProxy(executor)
+        return this
+    }
+
+    fun executesProxyWithResult(executor: ProxyResultingCommandExecutor): MinecraftCommand {
+        apiCommand.executesProxy(executor)
+        return this
+    }
+
+    fun withArgument(name: String, arg: Argument): MinecraftCommand {
+        arguments[name] = arg
+        return this
+    }
+
+    fun withPermission(permission: CommandPermission): MinecraftCommand {
+        apiCommand.withPermission(permission)
+        return this
+    }
+
+    fun withAliases(vararg aliases: String): MinecraftCommand {
+        apiCommand.withAliases(*aliases)
+        return this
+    }
+
+    fun register() {
+        apiCommand
+            .withArguments(arguments)
+            .register()
+    }
+}

ScriptableMC-Engine-JS/Bundled/build.gradle.kts

@@ -36,6 +36,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
+    compileOnly("dev.jorel:commandapi-core:3.4")
 
     testImplementation("junit", "junit", "4.12")
 }

ScriptableMC-Engine-JS/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("commons-io:commons-io:2.6")
     implementation("de.tr7zw:item-nbt-api:2.2.0")
-    implementation("dev.jorel:commandapi-core:3.4")
+    compileOnly("dev.jorel:commandapi-core:3.4")
 
     testImplementation("junit", "junit", "4.12")
 }

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

@@ -4,5 +4,4 @@ version: '1.3.0'
 api-version: '1.13'
 author: AStorks
 main: com.pixlfox.scriptablemc.SMCJavaScriptEngineMain
-depend: []
-softdepend: [PlaceholderAPI]
+softdepend: [PlaceholderAPI, CommandAPI]

ScriptableMC-Tools-TS/src/main/kotlin/com/pixlfox/scriptablemc/TypescriptLibraryExporter.kt

@@ -5,9 +5,11 @@ import com.beust.klaxon.JsonObject
 import com.beust.klaxon.Parser
 import com.thoughtworks.paranamer.BytecodeReadingParanamer
 import com.thoughtworks.paranamer.Paranamer
+import org.bukkit.Server
 import org.bukkit.plugin.PluginDescriptionFile
 import java.io.File
 import java.lang.reflect.*
+import kotlin.reflect.jvm.jvmErasure
 
 
 @Suppress("MemberVisibilityCanBePrivate", "UnstableApiUsage", "unused")
@@ -159,6 +161,7 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
             com.smc.utils.ItemBuilder::class.java,
             com.smc.utils.MysqlWrapper::class.java,
             com.smc.utils.Http::class.java,
+            com.smc.utils.MinecraftCommand::class.java,
 
             com.smc.version.Version::class.java,
             com.smc.version.MinecraftVersions::class.java,
@@ -616,7 +619,6 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
         var source = "declare var Java: any;\n"
         source += generateTypescriptImports(_class)
         source += generateTypescriptInterface(_class)
-
         source += if(_class.isEnum) generateTypescriptEnum(_class as Class<Enum<*>>) else generateTypescriptClass(_class)
 
         return source
@@ -932,6 +934,13 @@ class TypescriptLibraryExporter(args: Array<String> = arrayOf()) {
     companion object {
         @JvmStatic
         fun main(args: Array<String>) {
+            val test = Server::class
+            val testMembers = test.members
+
+            for (testMember in testMembers) {
+                println(testMember.returnType.jvmErasure.simpleName)
+            }
+
             if(args.contains("--lib-smc")) {
                 TypescriptLibraryExporter(args)
                     .basePath("./lib-smc")