Move DialogueSuspension

GregHib · Jan 17, 2025 · 6dfbe0e · 6dfbe0e
1 parent 36cdfeb
commit 6dfbe0e
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 32 deletions.
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/player/Player.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/player/Player.kt
@@ -19,7 +19,7 @@ import world.gregs.voidps.engine.entity.character.player.skill.level.Levels
 import world.gregs.voidps.engine.inv.Inventories
 import world.gregs.voidps.engine.queue.ActionQueue
 import world.gregs.voidps.engine.suspend.Suspension
-import world.gregs.voidps.engine.suspend.dialogue.DialogueSuspension
+import world.gregs.voidps.engine.suspend.DialogueSuspension
 import world.gregs.voidps.engine.timer.TimerQueue
 import world.gregs.voidps.engine.timer.Timers
 import world.gregs.voidps.network.client.Client

diff --git a/...ne/suspend/dialogue/DialogueSuspension.kt → ...idps/engine/suspend/DialogueSuspension.kt b/...ne/suspend/dialogue/DialogueSuspension.kt → ...idps/engine/suspend/DialogueSuspension.kt
@@ -1,4 +1,4 @@
-package world.gregs.voidps.engine.suspend.dialogue
+package world.gregs.voidps.engine.suspend
 
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.suspendCancellableCoroutine

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueCommon.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueCommon.kt
@@ -4,7 +4,7 @@ import world.gregs.voidps.engine.client.ui.Interfaces
 import world.gregs.voidps.engine.data.definition.AnimationDefinitions
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 
 fun Interfaces.sendLines(id: String, lines: List<String>) {
     for ((index, line) in lines.withIndex()) {

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueInput.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/DialogueInput.kts
@@ -5,8 +5,8 @@ import world.gregs.voidps.engine.client.ui.event.IntEntered
 import world.gregs.voidps.engine.client.ui.event.StringEntered
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.event.onEvent
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 continueDialogue("dialogue_npc_chat*", "continue") { player ->
     player.continueDialogue()

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/ExperienceLamp.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/ExperienceLamp.kts
@@ -1,7 +1,7 @@
 package world.gregs.voidps.world.interact.dialogue
 
 import world.gregs.voidps.engine.client.ui.interfaceOption
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 interfaceOption("Select", id = "skill_stat_advance") {
     player["stat_advance_selected_skill"] = component

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Choice.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Choice.kt
@@ -4,7 +4,7 @@ import world.gregs.voidps.engine.client.ui.close
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 import world.gregs.voidps.world.interact.dialogue.sendLines
 
 private val CHOICE_LINE_RANGE = 2..5

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Destroy.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Destroy.kt
@@ -6,7 +6,7 @@ import world.gregs.voidps.engine.data.definition.ItemDefinitions
 import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 private const val DESTROY_INTERFACE_ID = "dialogue_confirm_destroy"
 

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ExpSkillLamp.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ExpSkillLamp.kt
@@ -6,7 +6,7 @@ import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.entity.character.player.skill.Skill
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 private const val EXPERIENCE_SKILL_LAMP = "skill_stat_advance"
 

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/IntEntry.kt
@@ -3,7 +3,7 @@ package world.gregs.voidps.world.interact.dialogue.type
 import world.gregs.voidps.engine.client.sendScript
 import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 
 suspend fun Context<Player>.intEntry(text: String): Int {
     player.sendScript("int_entry", text)

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/ItemBox.kt
@@ -8,7 +8,7 @@ import world.gregs.voidps.engine.data.definition.ItemDefinitions
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 
 private const val ITEM_INTERFACE_ID = "dialogue_obj_box"
 private const val DOUBLE_ITEM_INTERFACE_ID = "dialogue_double_obj_box"

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/LevelUp.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/LevelUp.kt
@@ -5,7 +5,7 @@ import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.entity.character.player.skill.Skill
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 
 private const val LEVEL_UP_INTERFACE_ID = "dialogue_level_up"
 

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/MakeAmount.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/MakeAmount.kt
@@ -6,7 +6,7 @@ import world.gregs.voidps.engine.data.definition.ItemDefinitions
 import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 
 private const val INTERFACE_ID = "dialogue_skill_creation"
 private const val INTERFACE_AMOUNT_ID = "skill_creation_amount"

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/NPCDialogue.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/NPCDialogue.kt
@@ -12,7 +12,7 @@ import world.gregs.voidps.engine.entity.character.npc.NPC
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.network.login.protocol.encode.npcDialogueHead
 import world.gregs.voidps.world.interact.dialogue.Expression
 import world.gregs.voidps.world.interact.dialogue.sendChat

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/PlayerDialogue.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/PlayerDialogue.kt
@@ -9,7 +9,7 @@ import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.entity.character.player.name
 import world.gregs.voidps.engine.get
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.network.login.protocol.encode.playerDialogueHead
 import world.gregs.voidps.world.interact.dialogue.Expression
 import world.gregs.voidps.world.interact.dialogue.sendChat

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/QuestStart.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/QuestStart.kt
@@ -10,7 +10,7 @@ import world.gregs.voidps.engine.entity.character.player.skill.Skill
 import world.gregs.voidps.engine.entity.character.player.skill.level.Level.hasMax
 import world.gregs.voidps.engine.get
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 import world.gregs.voidps.world.activity.quest.quest
 import world.gregs.voidps.world.activity.quest.questComplete
 

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/QuestStart.kts b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/QuestStart.kts
@@ -2,7 +2,7 @@ package world.gregs.voidps.world.interact.dialogue.type
 
 import world.gregs.voidps.engine.client.ui.event.interfaceClose
 import world.gregs.voidps.engine.client.ui.interfaceOption
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 interfaceOption("Show required items", "items_hidden_button_txt", "quest_intro") {
     player.interfaces.sendVisibility(id, "items_hide_show_layer", false)

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Statement.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/Statement.kt
@@ -6,7 +6,7 @@ import world.gregs.voidps.engine.data.definition.FontDefinitions
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.get
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.world.interact.dialogue.sendLines
 
 private const val MAXIMUM_STATEMENT_SIZE = 5

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt b/game/src/main/kotlin/world/gregs/voidps/world/interact/dialogue/type/StringEntry.kt
@@ -3,7 +3,7 @@ package world.gregs.voidps.world.interact.dialogue.type
 import world.gregs.voidps.engine.client.sendScript
 import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 
 suspend fun Context<Player>.stringEntry(text: String): String {
     player.sendScript("string_entry", text)

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/map/ourania/Eniola.kts b/game/src/main/kotlin/world/gregs/voidps/world/map/ourania/Eniola.kts
@@ -12,7 +12,7 @@ import world.gregs.voidps.engine.inv.inventory
 import world.gregs.voidps.engine.inv.remove
 import world.gregs.voidps.engine.queue.queue
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 import world.gregs.voidps.world.community.trade.lend.Loan.getSecondsRemaining
 import world.gregs.voidps.world.interact.dialogue.*
 import world.gregs.voidps.world.interact.dialogue.type.ChoiceBuilder

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ChoiceTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ChoiceTest.kt
@@ -7,10 +7,9 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestFactory
 import org.junit.jupiter.api.assertThrows
 import world.gregs.voidps.engine.client.ui.open
-import world.gregs.voidps.engine.event.Context
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 import world.gregs.voidps.world.interact.dialogue.type.choice
 import world.gregs.voidps.world.interact.dialogue.type.player
 import kotlin.test.assertEquals

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DestroyTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/DestroyTest.kt
@@ -11,7 +11,7 @@ import org.koin.test.mock.declareMock
 import world.gregs.voidps.cache.definition.data.ItemDefinition
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.ItemDefinitions
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 import world.gregs.voidps.world.interact.dialogue.type.destroy
 
 internal class DestroyTest : DialogueTest() {

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/IntEntryTest.kt
@@ -4,7 +4,7 @@ import io.mockk.*
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import world.gregs.voidps.engine.client.sendScript
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 import world.gregs.voidps.world.interact.dialogue.type.intEntry
 import kotlin.test.assertTrue
 

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/ItemBoxTest.kt
@@ -7,7 +7,7 @@ import org.koin.test.mock.declareMock
 import world.gregs.voidps.engine.client.sendScript
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.ItemDefinitions
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.world.interact.dialogue.type.item
 import world.gregs.voidps.world.interact.dialogue.type.items
 import kotlin.test.assertTrue

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/LevelUpTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/LevelUpTest.kt
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.entity.character.player.skill.Skill
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.world.interact.dialogue.type.levelUp
 import kotlin.test.assertTrue
 

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/MakeAmountTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/MakeAmountTest.kt
@@ -12,7 +12,7 @@ import world.gregs.voidps.cache.definition.data.ItemDefinition
 import world.gregs.voidps.engine.client.ui.InterfaceOptions
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.ItemDefinitions
-import world.gregs.voidps.engine.suspend.dialogue.IntSuspension
+import world.gregs.voidps.engine.suspend.IntSuspension
 import world.gregs.voidps.world.interact.dialogue.type.makeAmount
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/NPCChatTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/NPCChatTest.kt
@@ -17,7 +17,7 @@ import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.AnimationDefinitions
 import world.gregs.voidps.engine.data.definition.NPCDefinitions
 import world.gregs.voidps.engine.entity.character.npc.NPC
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.network.client.Client
 import world.gregs.voidps.network.login.protocol.encode.npcDialogueHead
 import world.gregs.voidps.world.interact.dialogue.type.npc

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/PlayerChatTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/PlayerChatTest.kt
@@ -15,7 +15,7 @@ import world.gregs.voidps.cache.definition.data.InterfaceComponentDefinition
 import world.gregs.voidps.engine.Contexts
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.AnimationDefinitions
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.network.client.Client
 import world.gregs.voidps.network.login.protocol.encode.playerDialogueHead
 import world.gregs.voidps.world.interact.dialogue.type.player

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/QuestStartTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/QuestStartTest.kt
@@ -10,7 +10,7 @@ import world.gregs.voidps.cache.config.data.QuestDefinition
 import world.gregs.voidps.engine.client.sendScript
 import world.gregs.voidps.engine.client.ui.open
 import world.gregs.voidps.engine.data.definition.QuestDefinitions
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 import world.gregs.voidps.world.interact.dialogue.type.startQuest
 
 internal class QuestStartTest : DialogueTest() {

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StatementTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StatementTest.kt
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestFactory
 import org.junit.jupiter.api.assertThrows
 import world.gregs.voidps.engine.client.ui.open
-import world.gregs.voidps.engine.suspend.dialogue.ContinueSuspension
+import world.gregs.voidps.engine.suspend.ContinueSuspension
 import world.gregs.voidps.world.interact.dialogue.type.statement
 import kotlin.test.assertTrue
 

diff --git a/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt b/game/src/test/kotlin/world/gregs/voidps/world/interact/dialogue/StringEntryTest.kt
@@ -4,7 +4,7 @@ import io.mockk.*
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import world.gregs.voidps.engine.client.sendScript
-import world.gregs.voidps.engine.suspend.dialogue.StringSuspension
+import world.gregs.voidps.engine.suspend.StringSuspension
 import world.gregs.voidps.world.interact.dialogue.type.stringEntry
 
 internal class StringEntryTest : DialogueTest() {