Add actions

build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     // Apply the Kotlin JVM plugin to add support for Kotlin.
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.6.0"
     id("com.github.johnrengelman.shadow") version "7.1.0"
     id("org.jetbrains.dokka") version "1.5.31"
     kotlin("plugin.serialization") version "1.5.0"
@@ -56,7 +56,7 @@ dependencies {
     compileOnly("com.github.Project-Cepi:MobExtension:0ed0fc125e")
 
     // Add actions
-    compileOnly("com.github.Project-Cepi:Actions:b22ef7ae29")
+    compileOnly("com.github.Project-Cepi:Actions:80871eeb22")
 
     // Add canvas
     implementation("com.mattworzala:canvas:1.1.5")

src/main/kotlin/world/cepi/itemextension/item/SerializableModule.kt

@@ -1,8 +1,10 @@
 package world.cepi.itemextension.item
 
 import kotlinx.serialization.modules.SerializersModule
+import kotlinx.serialization.modules.plus
 import kotlinx.serialization.modules.polymorphic
 import kotlinx.serialization.modules.subclass
+import world.cepi.actions.ActionSerializer
 import world.cepi.itemextension.item.traits.ItemTrait
 import world.cepi.itemextension.item.traits.list.*
 import world.cepi.itemextension.item.traits.list.actions.PrimaryActionTrait
@@ -37,4 +39,4 @@ val itemSerializationModule = SerializersModule {
 
         subclass(CustomTextTrait::class)
     }
-}
+} + ActionSerializer.module

src/main/kotlin/world/cepi/itemextension/item/traits/list/actions/ActionTrait.kt

@@ -10,7 +10,7 @@ import net.minestom.server.event.EventNode
 import net.minestom.server.event.player.*
 import net.minestom.server.event.trait.PlayerEvent
 import net.minestom.server.item.ItemStack
-import world.cepi.actions.Action
+import world.cepi.actions.ActionItem
 import world.cepi.itemextension.item.Item
 import world.cepi.itemextension.item.cepiItem
 import world.cepi.itemextension.item.traits.ItemTrait
@@ -21,7 +21,7 @@ import world.cepi.kstom.raycast.RayCast
 @Serializable
 sealed class ActionTrait: ItemTrait() {
 
-    abstract val action: Action
+    abstract val action: ActionItem
     abstract val displayName: String
     abstract val useTargeting: Boolean
 

src/main/kotlin/world/cepi/itemextension/item/traits/list/actions/PrimaryActionTrait.kt

@@ -2,17 +2,17 @@ package world.cepi.itemextension.item.traits.list.actions
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import world.cepi.actions.Action
+import world.cepi.actions.ActionItem
 import world.cepi.actions.context.ActionItemOffContextParser
 import world.cepi.kstom.command.arguments.generation.annotations.ParameterContext
 
 @Serializable
 @SerialName("primary_action")
 class PrimaryActionTrait(
-    @ParameterContext(ActionItemOffContextParser::class)
-    override val action: Action,
     override val displayName: String,
-    override val useTargeting: Boolean
+    override val useTargeting: Boolean,
+    @ParameterContext(ActionItemOffContextParser::class)
+    override val action: ActionItem
 ): ActionTrait() {
     override val clickType = "Left"
 }

src/main/kotlin/world/cepi/itemextension/item/traits/list/actions/SecondaryActionTrait.kt

@@ -2,17 +2,17 @@ package world.cepi.itemextension.item.traits.list.actions
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import world.cepi.actions.Action
+import world.cepi.actions.ActionItem
 import world.cepi.actions.context.ActionItemOffContextParser
 import world.cepi.kstom.command.arguments.generation.annotations.ParameterContext
 
 @Serializable
 @SerialName("secondary_action")
 data class SecondaryActionTrait(
-    @ParameterContext(ActionItemOffContextParser::class)
-    override val action: Action,
     override val displayName: String,
-    override val useTargeting: Boolean
+    override val useTargeting: Boolean,
+    @ParameterContext(ActionItemOffContextParser::class)
+    override val action: ActionItem
 ): ActionTrait() {
     override val clickType = "Sneak + Left"
 

src/main/kotlin/world/cepi/itemextension/item/traits/list/actions/TertiaryActionTrait.kt

@@ -3,16 +3,17 @@ package world.cepi.itemextension.item.traits.list.actions
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import world.cepi.actions.Action
+import world.cepi.actions.ActionItem
 import world.cepi.actions.context.ActionItemOffContextParser
 import world.cepi.kstom.command.arguments.generation.annotations.ParameterContext
 
 @Serializable
 @SerialName("tertiary_action")
 data class TertiaryActionTrait(
-    @ParameterContext(ActionItemOffContextParser::class)
-    override val action: Action,
     override val displayName: String,
-    override val useTargeting: Boolean
+    override val useTargeting: Boolean,
+    @ParameterContext(ActionItemOffContextParser::class)
+    override val action: ActionItem
 ): ActionTrait() {
     override val clickType = "Right"
 

src/test/kotlin/world/cepi/itemextension/item/serialization/ItemSerializer.kt

@@ -3,6 +3,7 @@ package world.cepi.itemextension.item.serialization
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Disabled
+import world.cepi.actions.ActionItem
 import world.cepi.actions.list.FlingAction
 import world.cepi.itemextension.item.Item
 import world.cepi.itemextension.item.cepiItem
@@ -18,7 +19,7 @@ class ItemSerializer {
         val item = cepiItem {
             +LevelTrait(5)
             +AttackSpeedTrait(Duration.ofMillis(10_000))
-            +PrimaryActionTrait(FlingAction(1.0), "Fling", true)
+            +PrimaryActionTrait("Fling", true, ActionItem(FlingAction(1.0)))
         }
 
 
@@ -32,7 +33,7 @@ class ItemSerializer {
         assertEquals(LevelTrait(5), decodedJSON.get<LevelTrait>())
 
         assertTrue(decodedJSON.hasTrait<PrimaryActionTrait>())
-        assertEquals(PrimaryActionTrait(FlingAction(1.0), "Fling", true), decodedJSON.get<PrimaryActionTrait>())
+        assertEquals(PrimaryActionTrait("Fling", true, ActionItem(FlingAction(1.0))), decodedJSON.get<PrimaryActionTrait>())
     }
 
 }

src/test/kotlin/world/cepi/itemextension/item/traits/TraitContainerTest.kt

@@ -2,6 +2,7 @@ package world.cepi.itemextension.item.traits
 
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Disabled
+import world.cepi.actions.ActionItem
 import world.cepi.actions.list.FlingAction
 import world.cepi.itemextension.item.traits.list.NameTrait
 import world.cepi.itemextension.item.traits.list.actions.ActionTrait
@@ -18,8 +19,8 @@ class TraitContainerTest {
 
         traitContainerImpl.put(NameTrait("Hello World!"))
 
-        traitContainerImpl.put(PrimaryActionTrait(FlingAction(1.0), "Fling", true))
-        traitContainerImpl.put(SecondaryActionTrait(FlingAction(1.0), "Fling", true))
+        traitContainerImpl.put(PrimaryActionTrait("Fling", true, ActionItem(FlingAction(1.0))))
+        traitContainerImpl.put(SecondaryActionTrait("Fling", true, ActionItem(FlingAction(1.0))))
 
         assertTrue(traitContainerImpl.hasTrait<NameTrait>())
 
@@ -30,8 +31,8 @@ class TraitContainerTest {
 
         assertEquals(
             listOf(
-                PrimaryActionTrait(FlingAction(1.0), "Fling", true),
-                SecondaryActionTrait(FlingAction(1.0), "Fling", true)
+                PrimaryActionTrait("Fling", true, ActionItem(FlingAction(1.0))),
+                SecondaryActionTrait("Fling", true, ActionItem(FlingAction(1.0)))
             ),
             traitContainerImpl.softGet<ActionTrait>()
         )