CommandAPI · DerEchtePilz · Sep 23, 2023 · Aug 17, 2023 · Aug 17, 2023 · Aug 22, 2023
diff --git a/README.md b/README.md
@@ -377,6 +377,7 @@ This is the current roadmap for the CommandAPI (as of 11th May 2023):
                 <ul>
                     <li>https://github.com/JorelAli/CommandAPI/issues/487 Added support for disabling integer centering for location arguments</li>
                     <li>https://github.com/JorelAli/CommandAPI/issues/488 Fixed calling CommandAPI commands with <code>Bukkit.createCommandSender()</code> not working on paper</li>
+                    <li>https://github.com/JorelAli/CommandAPI/pull/482 Adds Kotlin DSL support for delegations</li>
                 </ul>
             </td>
         </tr>

diff --git a/...ndapi-documentation-code/src/main/kotlin/dev/jorel/commandapi/examples/kotlin/Examples.kt b/...ndapi-documentation-code/src/main/kotlin/dev/jorel/commandapi/examples/kotlin/Examples.kt
@@ -14,6 +14,11 @@ import dev.jorel.commandapi.arguments.CustomArgument.CustomArgumentException
 import dev.jorel.commandapi.arguments.CustomArgument.MessageBuilder
 import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException
 import dev.jorel.commandapi.executors.*
+import dev.jorel.commandapi.kotlindsl.commandAPICommand
+import dev.jorel.commandapi.kotlindsl.getValue
+import dev.jorel.commandapi.kotlindsl.playerArgument
+import dev.jorel.commandapi.kotlindsl.playerExecutor
+import dev.jorel.commandapi.kotlindsl.stringArgument
 import dev.jorel.commandapi.wrappers.*
 import dev.jorel.commandapi.wrappers.Rotation
 import net.kyori.adventure.inventory.Book
@@ -1526,6 +1531,20 @@ Converter.convert(essentials, "speed",
 }
 }
 
+fun delegatedProperties() {
+/* ANCHOR: delegatedProperties1 */
+CommandAPICommand("mycommand")
+    .withArguments(StringArgument("string"))
+    .withArguments(PlayerArgument("target"))
+    .executesPlayer(PlayerCommandExecutor { player, args ->
+        val string: String by args
+        val target: Player by args
+        // Implementation...
+    })
+    .register()
+/* ANCHOR_END: delegatedProperties1 */
+}
+
 class functions {
 /* ANCHOR: functions1 */
 class Main : JavaPlugin() {

diff --git a/...umentation-code/src/main/kotlin/dev/jorel/commandapi/examples/kotlin/ExamplesKotlinDSL.kt b/...umentation-code/src/main/kotlin/dev/jorel/commandapi/examples/kotlin/ExamplesKotlinDSL.kt
@@ -1,10 +1,7 @@
 package dev.jorel.commandapi.examples.kotlin
 
 import de.tr7zw.changeme.nbtapi.NBTContainer
-import dev.jorel.commandapi.*
 import dev.jorel.commandapi.arguments.*
-import dev.jorel.commandapi.arguments.LiteralArgument.of
-import dev.jorel.commandapi.executors.*
 import dev.jorel.commandapi.kotlindsl.*
 import dev.jorel.commandapi.wrappers.*
 import dev.jorel.commandapi.wrappers.Rotation
@@ -895,6 +892,20 @@ commandAPICommand("cmd") {
 /* ANCHOR_END: arguments4 */
 }
 
+fun delegatedProperties() {
+/* ANCHOR: delegatedProperties1 */
+commandAPICommand("mycommand") {
+    stringArgument("string")
+    playerArgument("target")
+    playerExecutor { player, args ->
+        val string: String by args
+        val target: Player by args
+        // Implementation...
+    }
+}
+/* ANCHOR_END: delegatedProperties1 */
+}
+
 fun help() {
 /* ANCHOR: help1 */
 commandAPICommand("mycmd") {

diff --git a/...i-bukkit/commandapi-bukkit-kotlin/pom.xml → ...i-kotlin/commandapi-bukkit-kotlin/pom.xml b/...i-bukkit/commandapi-bukkit-kotlin/pom.xml → ...i-kotlin/commandapi-bukkit-kotlin/pom.xml
@@ -6,7 +6,7 @@
 
 	<parent>
 		<groupId>dev.jorel</groupId>
-		<artifactId>commandapi-bukkit</artifactId>
+		<artifactId>commandapi-kotlin</artifactId>
 		<version>9.2.0-SNAPSHOT</version>
 	</parent>
 
@@ -89,5 +89,10 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>dev.jorel</groupId>
+			<artifactId>commandapi-core-kotlin</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/...mandapi/kotlindsl/CommandAPICommandDSL.kt → ...mandapi/kotlindsl/CommandAPICommandDSL.kt b/...mandapi/kotlindsl/CommandAPICommandDSL.kt → ...mandapi/kotlindsl/CommandAPICommandDSL.kt
diff --git a/...el/commandapi/kotlindsl/CommandTreeDSL.kt → ...el/commandapi/kotlindsl/CommandTreeDSL.kt b/...el/commandapi/kotlindsl/CommandTreeDSL.kt → ...el/commandapi/kotlindsl/CommandTreeDSL.kt
diff --git a/...jorel/commandapi/kotlindsl/ExecutorDSL.kt → ...jorel/commandapi/kotlindsl/ExecutorDSL.kt b/...jorel/commandapi/kotlindsl/ExecutorDSL.kt → ...jorel/commandapi/kotlindsl/ExecutorDSL.kt
diff --git a/commandapi-kotlin/commandapi-core-kotlin/pom.xml b/commandapi-kotlin/commandapi-core-kotlin/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>dev.jorel</groupId>
+		<artifactId>commandapi-kotlin</artifactId>
+		<version>9.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>commandapi-core-kotlin</artifactId>
+
+	<build>
+		<sourceDirectory>src/main/kotlin</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-maven-plugin</artifactId>
+				<version>${kotlin.version}</version>
+				<executions>
+					<execution>
+						<id>compile</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>test-compile</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>test-compile</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<jvmTarget>16</jvmTarget>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>empty-javadoc-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>javadoc</classifier>
+							<classesDirectory>${basedir}/javadoc</classesDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<version>${kotlin.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>dev.jorel</groupId>
+			<artifactId>commandapi-core</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/...in/commandapi-core-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandAPIDSL.kt b/...in/commandapi-core-kotlin/src/main/kotlin/dev/jorel/commandapi/kotlindsl/CommandAPIDSL.kt
@@ -0,0 +1,7 @@
+package dev.jorel.commandapi.kotlindsl
+
+import dev.jorel.commandapi.executors.CommandArguments
+import kotlin.reflect.KProperty
+
+// CommandArguments DSL
+inline operator fun <reified T> CommandArguments.getValue(nothing: Nothing?, property: KProperty<*>) = this[property.name] as T
diff --git a/...locity/commandapi-velocity-kotlin/pom.xml → ...kotlin/commandapi-velocity-kotlin/pom.xml b/...locity/commandapi-velocity-kotlin/pom.xml → ...kotlin/commandapi-velocity-kotlin/pom.xml
@@ -6,12 +6,11 @@
 
 	<parent>
 		<groupId>dev.jorel</groupId>
-		<artifactId>commandapi-velocity</artifactId>
+		<artifactId>commandapi-kotlin</artifactId>
 		<version>9.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>commandapi-velocity-kotlin</artifactId>
-	<packaging>jar</packaging>
 
 	<build>
 		<sourceDirectory>src/main/kotlin</sourceDirectory>
@@ -59,13 +58,18 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!--- CommandAPI velocity core dependency -->
+		<!--- CommandAPI dependencies -->
 		<dependency>
 			<groupId>dev.jorel</groupId>
 			<artifactId>commandapi-velocity-core</artifactId>
-			<version>9.2.0-SNAPSHOT</version>
+			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>dev.jorel</groupId>
+			<artifactId>commandapi-core-kotlin</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
 		<!--- Kotlin dependencies -->
 		<dependency>
@@ -74,11 +78,5 @@
 			<version>${kotlin.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-test</artifactId>
-			<version>${kotlin.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/...mandapi/kotlindsl/CommandAPICommandDSL.kt → ...mandapi/kotlindsl/CommandAPICommandDSL.kt b/...mandapi/kotlindsl/CommandAPICommandDSL.kt → ...mandapi/kotlindsl/CommandAPICommandDSL.kt
diff --git a/...el/commandapi/kotlindsl/CommandTreeDSL.kt → ...el/commandapi/kotlindsl/CommandTreeDSL.kt b/...el/commandapi/kotlindsl/CommandTreeDSL.kt → ...el/commandapi/kotlindsl/CommandTreeDSL.kt
diff --git a/...jorel/commandapi/kotlindsl/ExecutorDSL.kt → ...jorel/commandapi/kotlindsl/ExecutorDSL.kt b/...jorel/commandapi/kotlindsl/ExecutorDSL.kt → ...jorel/commandapi/kotlindsl/ExecutorDSL.kt
diff --git a/commandapi-kotlin/pom.xml b/commandapi-kotlin/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>dev.jorel</groupId>
+		<artifactId>commandapi</artifactId>
+		<version>9.2.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>commandapi-kotlin</artifactId>
+	<packaging>pom</packaging>
+
+</project>
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-kotlin/.gitignore b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-kotlin/.gitignore
-Original file line number
+Diff line change
@@ Expand Up @@
                     <ul>
                         <li>https://github.com/JorelAli/CommandAPI/issues/487 Added support for disabling integer centering for location arguments</li>
                         <li>https://github.com/JorelAli/CommandAPI/issues/488 Fixed calling CommandAPI commands with <code>Bukkit.createCommandSender()</code> not working on paper</li>
+                        <li>https://github.com/JorelAli/CommandAPI/pull/482 Adds Kotlin DSL support for delegations</li>
                     </ul>
                 </td>
             </tr>
@@ Expand Down @@