diff --git a/lib/src/jvmTest/kotlin/world/phantasmal/lib/test/TestUtils.kt b/lib/src/jvmTest/kotlin/world/phantasmal/lib/test/TestUtils.kt deleted file mode 100644 index b0c40c94..00000000 --- a/lib/src/jvmTest/kotlin/world/phantasmal/lib/test/TestUtils.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:JvmName("TestUtilsJvm") - -package world.phantasmal.lib.test - -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor - -actual suspend fun readFile(path: String): Cursor = - Buffer.fromResource(path).cursor() diff --git a/lib/build.gradle.kts b/psolib/build.gradle.kts similarity index 99% rename from lib/build.gradle.kts rename to psolib/build.gradle.kts index 87fcd194..e2516f64 100644 --- a/lib/build.gradle.kts +++ b/psolib/build.gradle.kts @@ -37,7 +37,7 @@ kotlin { val generateOpcodes = tasks.register("generateOpcodes") { group = "code generation" - val packageName = "world.phantasmal.lib.asm" + val packageName = "world.phantasmal.psolib.asm" val opcodesFile = file("srcGeneration/asm/opcodes.yml") val outputFile = file( "build/generated-src/commonMain/kotlin/${packageName.replace('.', '/')}/Opcodes.kt" diff --git a/lib/karma.config.d/karma.config.js b/psolib/karma.config.d/karma.config.js similarity index 100% rename from lib/karma.config.d/karma.config.js rename to psolib/karma.config.d/karma.config.js diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/Endianness.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/Endianness.kt similarity index 59% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/Endianness.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/Endianness.kt index 5f7bdcfe..c841ca29 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/Endianness.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/Endianness.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib +package world.phantasmal.psolib enum class Endianness { Little, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/Episode.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/Episode.kt similarity index 91% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/Episode.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/Episode.kt index e81ddbbc..07dd86e8 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/Episode.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/Episode.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib +package world.phantasmal.psolib enum class Episode { I, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/AsmTokenization.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/AsmTokenization.kt index 862255bf..4a97886c 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/AsmTokenization.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/AsmTokenization.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import world.phantasmal.core.fastIsWhitespace import world.phantasmal.core.fastReplace diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Assembly.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Assembly.kt index 84ae153a..0373ce6c 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Assembly.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Assembly.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import mu.KotlinLogging import world.phantasmal.core.Problem import world.phantasmal.core.PwResult import world.phantasmal.core.Severity -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.buffer.Buffer import kotlin.time.measureTimedValue private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/BytecodeIr.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/BytecodeIr.kt index c577851e..28f84aef 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/BytecodeIr.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/BytecodeIr.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import world.phantasmal.core.unsafe.unsafeAssertNotNull -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.buffer.Buffer import kotlin.math.ceil /** diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Disassembly.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Disassembly.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Disassembly.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Disassembly.kt index b67a8b17..5a7952bc 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Disassembly.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Disassembly.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import mu.KotlinLogging import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Opcode.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Opcode.kt index 94ea697c..e2a5b7af 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/Opcode.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/Opcode.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import world.phantasmal.core.unsafe.UnsafeMap diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraph.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraph.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraph.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraph.kt index abd6ec53..d77d2308 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraph.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraph.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis -import world.phantasmal.lib.asm.* +import world.phantasmal.psolib.asm.* // See https://en.wikipedia.org/wiki/Control-flow_graph. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetMapDesignations.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetMapDesignations.kt similarity index 94% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetMapDesignations.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetMapDesignations.kt index 09146d14..1240a93c 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetMapDesignations.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetMapDesignations.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis import mu.KotlinLogging -import world.phantasmal.lib.asm.* +import world.phantasmal.psolib.asm.* private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValue.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValue.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValue.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValue.kt index 3207f0f4..349ad920 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValue.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValue.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis import mu.KotlinLogging -import world.phantasmal.lib.asm.* +import world.phantasmal.psolib.asm.* import kotlin.math.max import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetStackValue.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetStackValue.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetStackValue.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetStackValue.kt index 3d9db53e..fb628cfd 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetStackValue.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetStackValue.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis import mu.KotlinLogging -import world.phantasmal.lib.asm.* +import world.phantasmal.psolib.asm.* private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSet.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSet.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSet.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSet.kt index bda0ad67..5fa2d24e 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSet.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSet.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis import kotlin.math.max import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt index 3339fc6b..b7bfcfc1 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.buffer +package world.phantasmal.psolib.buffer -import world.phantasmal.lib.Endianness +import world.phantasmal.psolib.Endianness /** * Resizable, continuous block of bytes which is reallocated when necessary. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsCompress.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsCompress.kt similarity index 93% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsCompress.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsCompress.kt index 98211b06..623dd9b0 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsCompress.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsCompress.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.compression.prs +package world.phantasmal.psolib.compression.prs -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.WritableCursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.WritableCursor +import world.phantasmal.psolib.cursor.cursor import kotlin.math.max import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsDecompress.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompress.kt similarity index 93% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsDecompress.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompress.kt index 37bfc314..4603ca65 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/compression/prs/PrsDecompress.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompress.kt @@ -1,13 +1,13 @@ -package world.phantasmal.lib.compression.prs +package world.phantasmal.psolib.compression.prs import mu.KotlinLogging import world.phantasmal.core.PwResult import world.phantasmal.core.Severity import world.phantasmal.core.Success -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.WritableCursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.WritableCursor +import world.phantasmal.psolib.cursor.cursor import kotlin.math.min private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/AbstractWritableCursor.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/AbstractWritableCursor.kt index 737a516b..87ed52cb 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/AbstractWritableCursor.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/AbstractWritableCursor.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/BufferCursor.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/BufferCursor.kt index ec9f48ef..4a32c9d5 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/BufferCursor.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/BufferCursor.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer /** * @param buffer The Buffer to read from and write to. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/Cursor.kt similarity index 96% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/Cursor.kt index 25a699fa..f3611518 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/Cursor.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/Cursor.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer /** * A cursor for reading binary data. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/WritableCursor.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/WritableCursor.kt index 324b9726..c8e7c328 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/cursor/WritableCursor.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/cursor/WritableCursor.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor /** * A cursor for reading and writing binary data. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Afs.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Afs.kt similarity index 94% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Afs.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Afs.kt index e88bdf5c..997e35b6 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Afs.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Afs.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats import mu.KotlinLogging import world.phantasmal.core.PwResult import world.phantasmal.core.Severity -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometry.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometry.kt similarity index 95% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometry.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometry.kt index f3225dfc..c097f9c0 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometry.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometry.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor class CollisionGeometry( val meshes: List, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaRenderGeometry.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaRenderGeometry.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaRenderGeometry.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaRenderGeometry.kt index ff724c2c..3f553ba2 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaRenderGeometry.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/AreaRenderGeometry.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats import mu.KotlinLogging import world.phantasmal.core.isBitSet -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.ninja.* +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.ninja.* private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Iff.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Iff.kt similarity index 95% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Iff.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Iff.kt index cb729109..a309d476 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Iff.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Iff.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats import mu.KotlinLogging import world.phantasmal.core.PwResult import world.phantasmal.core.Severity -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ItemPmt.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ItemPmt.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ItemPmt.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ItemPmt.kt index e9a525c1..6975b7d5 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ItemPmt.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ItemPmt.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor class ItemPmt( val statBoosts: List, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Rel.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Rel.kt similarity index 93% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Rel.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Rel.kt index 86c4dc45..bd8e75a8 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Rel.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Rel.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor class Rel( /** diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Unitxt.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Unitxt.kt similarity index 88% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Unitxt.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Unitxt.kt index 4dbd1d62..7c93d885 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Unitxt.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Unitxt.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor import kotlin.math.min class Unitxt(val categories: List>) diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Vector.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Vector.kt similarity index 71% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Vector.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Vector.kt index 84e70910..ef2555a1 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/Vector.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/Vector.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.cursor.Cursor data class Vec2(val x: Float, val y: Float) diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Angle.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Angle.kt similarity index 86% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Angle.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Angle.kt index 91840f8c..6ecab26f 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Angle.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Angle.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import kotlin.math.PI import kotlin.math.round diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Motion.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Motion.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Motion.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Motion.kt index 9d63f28a..e8fee6c2 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Motion.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Motion.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import world.phantasmal.core.isBitSet -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.vec3Float +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.vec3Float private const val NMDM = 0x4d444d4e diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Ninja.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Ninja.kt similarity index 92% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Ninja.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Ninja.kt index fdac9e56..67a41e6a 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Ninja.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Ninja.kt @@ -1,12 +1,12 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import world.phantasmal.core.Failure import world.phantasmal.core.PwResult import world.phantasmal.core.Success -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.parseIff -import world.phantasmal.lib.fileFormats.vec3Float +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.parseIff +import world.phantasmal.psolib.fileFormats.vec3Float private const val NJCM: Int = 0x4D434A4E diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaObject.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaObject.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaObject.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaObject.kt index 9706c7af..f34696bd 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaObject.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaObject.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import world.phantasmal.core.isBitSet import world.phantasmal.core.setBit -import world.phantasmal.lib.fileFormats.Vec2 -import world.phantasmal.lib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.Vec2 +import world.phantasmal.psolib.fileFormats.Vec3 sealed class NinjaObject>( val offset: Int, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Nj.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Nj.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Nj.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Nj.kt index 29362ad1..80b63d5e 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Nj.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Nj.kt @@ -1,11 +1,11 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import mu.KotlinLogging import world.phantasmal.core.isBitSet -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.Vec2 -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.vec3Float +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.Vec2 +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.vec3Float import kotlin.math.abs // TODO: diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Texture.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Texture.kt similarity index 90% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Texture.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Texture.kt index 3dfbd6f0..8927ced0 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Texture.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Texture.kt @@ -1,14 +1,14 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import mu.KotlinLogging import world.phantasmal.core.Failure import world.phantasmal.core.PwResult import world.phantasmal.core.Severity import world.phantasmal.core.Success -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.parseIff -import world.phantasmal.lib.fileFormats.parseIffHeaders +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.parseIff +import world.phantasmal.psolib.fileFormats.parseIffHeaders private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Xj.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Xj.kt similarity index 93% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Xj.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Xj.kt index f8586a64..92ac4a7b 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/ninja/Xj.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/ninja/Xj.kt @@ -1,11 +1,11 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import mu.KotlinLogging -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.fileFormats.Vec2 -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.vec2Float -import world.phantasmal.lib.fileFormats.vec3Float +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.fileFormats.Vec2 +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.vec2Float +import world.phantasmal.psolib.fileFormats.vec3Float private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Areas.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Areas.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Areas.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Areas.kt index 0c4c6ca4..92ef1268 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Areas.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Areas.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode class Area( val id: Int, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bin.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bin.kt similarity index 96% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bin.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bin.kt index e88820b8..cf482081 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bin.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bin.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import mu.KotlinLogging -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bytecode.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bytecode.kt index 0011c709..861271a1 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Bytecode.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Bytecode.kt @@ -1,17 +1,17 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import mu.KotlinLogging import world.phantasmal.core.PwResult import world.phantasmal.core.Severity -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.asm.* -import world.phantasmal.lib.asm.dataFlowAnalysis.ControlFlowGraph -import world.phantasmal.lib.asm.dataFlowAnalysis.getRegisterValue -import world.phantasmal.lib.asm.dataFlowAnalysis.getStackValue -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.BufferCursor -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.asm.* +import world.phantasmal.psolib.asm.dataFlowAnalysis.ControlFlowGraph +import world.phantasmal.psolib.asm.dataFlowAnalysis.getRegisterValue +import world.phantasmal.psolib.asm.dataFlowAnalysis.getStackValue +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.BufferCursor +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor import kotlin.math.min private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Dat.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Dat.kt index 0ab2b228..2ed48f2b 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Dat.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Dat.kt @@ -1,11 +1,11 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import mu.KotlinLogging -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.WritableCursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.WritableCursor +import world.phantasmal.psolib.cursor.cursor import kotlin.math.max private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityProp.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityProp.kt similarity index 87% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityProp.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityProp.kt index 857c7683..f89407b0 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityProp.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityProp.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest /** * Represents an entity type-specific property for accessing ambiguous parts of the entity data. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityType.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityType.kt similarity index 89% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityType.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityType.kt index 37503046..7b2069f7 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/EntityType.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/EntityType.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest interface EntityType { val name: String diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcType.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcType.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcType.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcType.kt index d03e148e..2ec44f0f 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcType.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcType.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode private val FRIENDLY_NPC_PROPERTIES = listOf( EntityProp(name = "Movement distance", offset = 44, type = EntityPropType.F32), diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeExtensions.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeExtensions.kt similarity index 87% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeExtensions.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeExtensions.kt index c69f78c5..6fe04442 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeExtensions.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeExtensions.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode private val EP_AND_NAME_TO_NPC_TYPE: Map, NpcType> = mutableMapOf, NpcType>().also { map -> diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeFromData.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeFromData.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeFromData.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeFromData.kt index 708a4d68..56342edb 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/NpcTypeFromData.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/NpcTypeFromData.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode // TODO: detect Mothmant, St. Rappy, Hallo Rappy, Egg Rappy, Death Gunner, Bulk and Recon. fun npcTypeFromQuestNpc(npc: QuestNpc): NpcType { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectType.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectType.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectType.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectType.kt index 9017a9b8..89188d44 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectType.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectType.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType.values +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType.values enum class ObjectType( override val uniqueName: String, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectTypeFromId.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectTypeFromId.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectTypeFromId.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectTypeFromId.kt index 91ec0118..20d2aa5f 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/ObjectTypeFromId.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/ObjectTypeFromId.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest fun objectTypeFromId(id: Short): ObjectType = when (id.toInt()) { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Qst.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Qst.kt similarity index 98% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Qst.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Qst.kt index 104e819e..354f947e 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Qst.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Qst.kt @@ -1,15 +1,15 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import mu.KotlinLogging import world.phantasmal.core.PwResult import world.phantasmal.core.Severity import world.phantasmal.core.Success import world.phantasmal.core.filenameBase -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.WritableCursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.WritableCursor +import world.phantasmal.psolib.cursor.cursor import kotlin.math.ceil import kotlin.math.max import kotlin.math.min diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Quest.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Quest.kt similarity index 92% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Quest.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Quest.kt index 9dfe668c..a76a28ea 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Quest.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Quest.kt @@ -1,18 +1,18 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import mu.KotlinLogging import world.phantasmal.core.* -import world.phantasmal.lib.Episode -import world.phantasmal.lib.asm.BytecodeIr -import world.phantasmal.lib.asm.InstructionSegment -import world.phantasmal.lib.asm.OP_SET_EPISODE -import world.phantasmal.lib.asm.dataFlowAnalysis.ControlFlowGraph -import world.phantasmal.lib.asm.dataFlowAnalysis.getMapDesignations -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.compression.prs.prsCompress -import world.phantasmal.lib.compression.prs.prsDecompress -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.asm.BytecodeIr +import world.phantasmal.psolib.asm.InstructionSegment +import world.phantasmal.psolib.asm.OP_SET_EPISODE +import world.phantasmal.psolib.asm.dataFlowAnalysis.ControlFlowGraph +import world.phantasmal.psolib.asm.dataFlowAnalysis.getMapDesignations +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.compression.prs.prsCompress +import world.phantasmal.psolib.compression.prs.prsDecompress +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestEntity.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestEntity.kt similarity index 73% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestEntity.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestEntity.kt index 7ecf05c5..53fe7871 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestEntity.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestEntity.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.fileFormats.Vec3 +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.fileFormats.Vec3 interface QuestEntity { val type: Type diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpc.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpc.kt similarity index 92% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpc.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpc.kt index dbfee259..21b1e496 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpc.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpc.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.Episode -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.ninja.angleToRad -import world.phantasmal.lib.fileFormats.ninja.radToAngle +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.ninja.angleToRad +import world.phantasmal.psolib.fileFormats.ninja.radToAngle import kotlin.math.roundToInt class QuestNpc( diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpcDefaultData.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpcDefaultData.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpcDefaultData.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpcDefaultData.kt index 972b8b45..ee2eb724 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestNpcDefaultData.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestNpcDefaultData.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.buffer.Buffer // TODO: set properties of friendly NPCs based on episode. internal fun setNpcDefaultData(type: NpcType, view: Buffer) { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObject.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObject.kt similarity index 96% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObject.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObject.kt index c03e3798..a6579a87 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObject.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObject.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.ninja.angleToRad -import world.phantasmal.lib.fileFormats.ninja.radToAngle +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.ninja.angleToRad +import world.phantasmal.psolib.fileFormats.ninja.radToAngle import kotlin.math.roundToInt class QuestObject(override var areaId: Int, override val data: Buffer) : QuestEntity { diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObjectDefaultData.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObjectDefaultData.kt similarity index 99% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObjectDefaultData.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObjectDefaultData.kt index da4f20a6..d39f59e3 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/QuestObjectDefaultData.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestObjectDefaultData.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.buffer.Buffer internal fun setObjectDefaultData(type: ObjectType, data: Buffer) { data.setFloat(40, 1f) // Scale x diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Version.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Version.kt similarity index 78% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Version.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Version.kt index 0164b909..7e81b179 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/quest/Version.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/fileFormats/quest/Version.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest enum class Version { /** diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Debugger.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Debugger.kt similarity index 89% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Debugger.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Debugger.kt index cdee7ee3..51f238cc 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Debugger.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Debugger.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.vm +package world.phantasmal.psolib.vm /** * Attaches to [vm] as its [ExecutionInterceptor]. diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/InstructionReference.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/InstructionReference.kt similarity index 86% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/vm/InstructionReference.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/InstructionReference.kt index 4dbf4fca..54854073 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/InstructionReference.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/InstructionReference.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.vm +package world.phantasmal.psolib.vm -import world.phantasmal.lib.asm.BytecodeIr -import world.phantasmal.lib.asm.Instruction -import world.phantasmal.lib.asm.InstructionSegment +import world.phantasmal.psolib.asm.BytecodeIr +import world.phantasmal.psolib.asm.Instruction +import world.phantasmal.psolib.asm.InstructionSegment class InstructionReference( val segIdx: Int, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Thread.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Thread.kt similarity index 92% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Thread.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Thread.kt index 1a08e6a0..cb0178b4 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/Thread.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/Thread.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.vm +package world.phantasmal.psolib.vm -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.asm.AnyType -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.asm.AnyType +import world.phantasmal.psolib.buffer.Buffer class StackFrame( val idx: Int, diff --git a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/VirtualMachine.kt b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/VirtualMachine.kt similarity index 97% rename from lib/src/commonMain/kotlin/world/phantasmal/lib/vm/VirtualMachine.kt rename to psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/VirtualMachine.kt index c1bae035..67fe04fc 100644 --- a/lib/src/commonMain/kotlin/world/phantasmal/lib/vm/VirtualMachine.kt +++ b/psolib/src/commonMain/kotlin/world/phantasmal/psolib/vm/VirtualMachine.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.vm +package world.phantasmal.psolib.vm import mu.KotlinLogging -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.Episode -import world.phantasmal.lib.asm.* -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.asm.* +import world.phantasmal.psolib.buffer.Buffer private val logger = KotlinLogging.logger {} diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AsmTokenizationTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AsmTokenizationTests.kt similarity index 97% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AsmTokenizationTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AsmTokenizationTests.kt index c693a01a..f78b7940 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AsmTokenizationTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AsmTokenizationTests.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.test.LibTestSuite import world.phantasmal.testUtils.assertCloseTo import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AssemblyTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AssemblyTests.kt similarity index 99% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AssemblyTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AssemblyTests.kt index 187938d2..0c6e61fd 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/AssemblyTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/AssemblyTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import world.phantasmal.core.Success -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyAssemblyRoundTripTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyAssemblyRoundTripTests.kt similarity index 91% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyAssemblyRoundTripTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyAssemblyRoundTripTests.kt index fa490568..6e38f1a8 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyAssemblyRoundTripTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyAssemblyRoundTripTests.kt @@ -1,12 +1,12 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm import world.phantasmal.core.Success -import world.phantasmal.lib.fileFormats.quest.parseBin -import world.phantasmal.lib.fileFormats.quest.parseBytecode -import world.phantasmal.lib.fileFormats.quest.writeBytecode -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.fileFormats.quest.parseBin +import world.phantasmal.psolib.fileFormats.quest.parseBytecode +import world.phantasmal.psolib.fileFormats.quest.writeBytecode +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals +import world.phantasmal.psolib.test.readFile import world.phantasmal.testUtils.assertDeepEquals import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyTests.kt similarity index 97% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyTests.kt index 3f29ed75..4a0ed068 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/DisassemblyTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/DisassemblyTests.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/OpcodeTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/OpcodeTests.kt similarity index 96% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/OpcodeTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/OpcodeTests.kt index 207f1aba..12c46682 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/OpcodeTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/OpcodeTests.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.asm +package world.phantasmal.psolib.asm -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt similarity index 97% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt index 9cdff3c2..3c652edb 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ControlFlowGraphTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.toInstructions +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.toInstructions import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValueTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValueTests.kt similarity index 97% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValueTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValueTests.kt index 180bc1ca..3cd2a4c7 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/GetRegisterValueTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/GetRegisterValueTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis -import world.phantasmal.lib.asm.* -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.toInstructions +import world.phantasmal.psolib.asm.* +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.toInstructions import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSetTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSetTests.kt similarity index 98% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSetTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSetTests.kt index 096de322..988a8094 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/asm/dataFlowAnalysis/ValueSetTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/asm/dataFlowAnalysis/ValueSetTests.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.asm.dataFlowAnalysis +package world.phantasmal.psolib.asm.dataFlowAnalysis -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/buffer/BufferTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/buffer/BufferTests.kt similarity index 95% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/buffer/BufferTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/buffer/BufferTests.kt index fe6ceb21..596aa7e1 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/buffer/BufferTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/buffer/BufferTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.buffer +package world.phantasmal.psolib.buffer -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsCompressTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsCompressTests.kt similarity index 90% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsCompressTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsCompressTests.kt index 934b52e6..f42e3c5e 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsCompressTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsCompressTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.compression.prs +package world.phantasmal.psolib.compression.prs -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite import kotlin.random.Random import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsDecompressTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompressTests.kt similarity index 90% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsDecompressTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompressTests.kt index 43368f71..feda7bdc 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/compression/prs/PrsDecompressTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/compression/prs/PrsDecompressTests.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.compression.prs +package world.phantasmal.psolib.compression.prs -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.readFile import kotlin.random.Random import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/BufferCursorTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/BufferCursorTests.kt similarity index 94% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/BufferCursorTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/BufferCursorTests.kt index 159fff0f..e4103498 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/BufferCursorTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/BufferCursorTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/CursorTests.kt similarity index 98% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/CursorTests.kt index cf1b5e0c..ae85d5ed 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/CursorTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/CursorTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/WritableCursorTests.kt similarity index 98% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/WritableCursorTests.kt index 7507da83..134e04a0 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/cursor/WritableCursorTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/cursor/WritableCursorTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer import world.phantasmal.testUtils.assertCloseTo import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometryTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometryTests.kt similarity index 88% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometryTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometryTests.kt index f07642c1..c576a0c0 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/AreaCollisionGeometryTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/AreaCollisionGeometryTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.readFile import world.phantasmal.testUtils.assertCloseTo import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ItemPmtTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ItemPmtTests.kt similarity index 77% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ItemPmtTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ItemPmtTests.kt index 88f4b939..777f4086 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ItemPmtTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ItemPmtTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.fileFormats +package world.phantasmal.psolib.fileFormats -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.readFile import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaTests.kt similarity index 71% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaTests.kt index ecebf0dc..8b27584a 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/ninja/NinjaTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/ninja/NinjaTests.kt @@ -1,8 +1,8 @@ -package world.phantasmal.lib.fileFormats.ninja +package world.phantasmal.psolib.fileFormats.ninja import world.phantasmal.core.Success -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.readFile import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BinTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BinTests.kt similarity index 82% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BinTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BinTests.kt index 6079a2d1..c3b0a4c4 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BinTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BinTests.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals +import world.phantasmal.psolib.test.readFile import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BytecodeTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BytecodeTests.kt similarity index 81% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BytecodeTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BytecodeTests.kt index 34084b7d..c3aeec1f 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/BytecodeTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/BytecodeTests.kt @@ -1,11 +1,11 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import world.phantasmal.core.Success -import world.phantasmal.lib.asm.InstructionSegment -import world.phantasmal.lib.asm.OP_BB_MAP_DESIGNATE -import world.phantasmal.lib.asm.OP_SET_EPISODE -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.test.LibTestSuite +import world.phantasmal.psolib.asm.InstructionSegment +import world.phantasmal.psolib.asm.OP_BB_MAP_DESIGNATE +import world.phantasmal.psolib.asm.OP_SET_EPISODE +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.test.LibTestSuite import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/DatTests.kt similarity index 88% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/DatTests.kt index 7797e60a..3d242518 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/DatTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/DatTests.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals -import world.phantasmal.lib.test.readFile +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals +import world.phantasmal.psolib.test.readFile import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QstTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QstTests.kt similarity index 86% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QstTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QstTests.kt index 93523937..fad4f001 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QstTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QstTests.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals -import world.phantasmal.lib.test.readFile -import world.phantasmal.lib.test.testWithTetheallaQuests +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals +import world.phantasmal.psolib.test.readFile +import world.phantasmal.psolib.test.testWithTetheallaQuests import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestTests.kt similarity index 94% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestTests.kt index c341b6e3..66745961 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/fileFormats/quest/QuestTests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/fileFormats/quest/QuestTests.kt @@ -1,14 +1,14 @@ -package world.phantasmal.lib.fileFormats.quest +package world.phantasmal.psolib.fileFormats.quest import world.phantasmal.core.Success -import world.phantasmal.lib.Episode -import world.phantasmal.lib.asm.* -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.test.LibTestSuite -import world.phantasmal.lib.test.assertDeepEquals -import world.phantasmal.lib.test.readFile -import world.phantasmal.lib.test.testWithTetheallaQuests +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.asm.* +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.test.LibTestSuite +import world.phantasmal.psolib.test.assertDeepEquals +import world.phantasmal.psolib.test.readFile +import world.phantasmal.psolib.test.testWithTetheallaQuests import world.phantasmal.testUtils.assertDeepEquals import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/BytecodeIrAssertions.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/BytecodeIrAssertions.kt similarity index 97% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/test/BytecodeIrAssertions.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/BytecodeIrAssertions.kt index b639282c..0fe91691 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/BytecodeIrAssertions.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/BytecodeIrAssertions.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.test +package world.phantasmal.psolib.test -import world.phantasmal.lib.asm.* +import world.phantasmal.psolib.asm.* import world.phantasmal.testUtils.assertDeepEquals import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/LibTestSuite.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/LibTestSuite.kt similarity index 88% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/test/LibTestSuite.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/LibTestSuite.kt index 3aaac7fb..99201509 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/LibTestSuite.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/LibTestSuite.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.test +package world.phantasmal.psolib.test import world.phantasmal.core.disposable.Disposer import world.phantasmal.testUtils.AbstractTestSuite diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestUtils.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt similarity index 81% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestUtils.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt index 7998a0e0..267a6c58 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestUtils.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.test +package world.phantasmal.psolib.test import world.phantasmal.core.Success -import world.phantasmal.lib.asm.InstructionSegment -import world.phantasmal.lib.asm.assemble -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.asm.InstructionSegment +import world.phantasmal.psolib.asm.assemble +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestWithTetheallaQuests.kt b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestWithTetheallaQuests.kt similarity index 99% rename from lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestWithTetheallaQuests.kt rename to psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestWithTetheallaQuests.kt index cfbc82a2..f20ef2c6 100644 --- a/lib/src/commonTest/kotlin/world/phantasmal/lib/test/TestWithTetheallaQuests.kt +++ b/psolib/src/commonTest/kotlin/world/phantasmal/psolib/test/TestWithTetheallaQuests.kt @@ -1,4 +1,4 @@ -package world.phantasmal.lib.test +package world.phantasmal.psolib.test /** * Applies [process] to all quest files provided with Tethealla version 0.143. diff --git a/lib/src/commonTest/resources/ItemPMT.bin b/psolib/src/commonTest/resources/ItemPMT.bin similarity index 100% rename from lib/src/commonTest/resources/ItemPMT.bin rename to psolib/src/commonTest/resources/ItemPMT.bin diff --git a/lib/src/commonTest/resources/RagRappy.nj b/psolib/src/commonTest/resources/RagRappy.nj similarity index 100% rename from lib/src/commonTest/resources/RagRappy.nj rename to psolib/src/commonTest/resources/RagRappy.nj diff --git a/lib/src/commonTest/resources/lost_heat_sword_gc.qst b/psolib/src/commonTest/resources/lost_heat_sword_gc.qst similarity index 100% rename from lib/src/commonTest/resources/lost_heat_sword_gc.qst rename to psolib/src/commonTest/resources/lost_heat_sword_gc.qst diff --git a/lib/src/commonTest/resources/map_forest01c.rel b/psolib/src/commonTest/resources/map_forest01c.rel similarity index 100% rename from lib/src/commonTest/resources/map_forest01c.rel rename to psolib/src/commonTest/resources/map_forest01c.rel diff --git a/lib/src/commonTest/resources/quest118_e.bin b/psolib/src/commonTest/resources/quest118_e.bin similarity index 100% rename from lib/src/commonTest/resources/quest118_e.bin rename to psolib/src/commonTest/resources/quest118_e.bin diff --git a/lib/src/commonTest/resources/quest118_e.dat b/psolib/src/commonTest/resources/quest118_e.dat similarity index 100% rename from lib/src/commonTest/resources/quest118_e.dat rename to psolib/src/commonTest/resources/quest118_e.dat diff --git a/lib/src/commonTest/resources/quest118_e.qst b/psolib/src/commonTest/resources/quest118_e.qst similarity index 100% rename from lib/src/commonTest/resources/quest118_e.qst rename to psolib/src/commonTest/resources/quest118_e.qst diff --git a/lib/src/commonTest/resources/quest118_e_decompressed.bin b/psolib/src/commonTest/resources/quest118_e_decompressed.bin similarity index 100% rename from lib/src/commonTest/resources/quest118_e_decompressed.bin rename to psolib/src/commonTest/resources/quest118_e_decompressed.bin diff --git a/lib/src/commonTest/resources/quest118_e_decompressed.dat b/psolib/src/commonTest/resources/quest118_e_decompressed.dat similarity index 100% rename from lib/src/commonTest/resources/quest118_e_decompressed.dat rename to psolib/src/commonTest/resources/quest118_e_decompressed.dat diff --git a/lib/src/commonTest/resources/quest27_e.bin b/psolib/src/commonTest/resources/quest27_e.bin similarity index 100% rename from lib/src/commonTest/resources/quest27_e.bin rename to psolib/src/commonTest/resources/quest27_e.bin diff --git a/lib/src/commonTest/resources/quest27_e.qst b/psolib/src/commonTest/resources/quest27_e.qst similarity index 100% rename from lib/src/commonTest/resources/quest27_e.qst rename to psolib/src/commonTest/resources/quest27_e.qst diff --git a/lib/src/commonTest/resources/quest27_e_decompressed.bin b/psolib/src/commonTest/resources/quest27_e_decompressed.bin similarity index 100% rename from lib/src/commonTest/resources/quest27_e_decompressed.bin rename to psolib/src/commonTest/resources/quest27_e_decompressed.bin diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/6.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/6.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/6.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/6.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/7.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/7.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/7.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/7.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/8.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/8.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/8.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/8.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/battle/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/battle/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/battle/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/6.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/6.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/6.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/6.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/7.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/7.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/7.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/7.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/8.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/8.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/8.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/8.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/9.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/9.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/9.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep1/9.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/21.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/21.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/21.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/21.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/22.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/22.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/22.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/22.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/23.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/23.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/23.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/23.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/24.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/24.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/24.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/24.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/25.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/25.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/25.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/chl/ep2/25.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-a.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-a.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-a.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-a.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-b.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-b.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-b.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-b.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-c.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-c.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-c.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/ma4-c.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/princgift.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/princgift.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/princgift.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/princgift.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/sunset base.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/sunset base.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/sunset base.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/sunset base.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/whiteday.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/whiteday.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/whiteday.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/event/whiteday.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/en4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/mop-up4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/todays rate.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/todays rate.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/todays rate.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/ext/todays rate.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/fragmentofmemoryen.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/fragmentofmemoryen.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/fragmentofmemoryen.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/fragmentofmemoryen.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/gallon.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/gallon.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/gallon.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/gallon.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost havoc vulcan.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost havoc vulcan.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost havoc vulcan.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost havoc vulcan.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost heat sword.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost heat sword.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost heat sword.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost heat sword.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost ice spinner.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost ice spinner.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost ice spinner.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost ice spinner.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost soul blade.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost soul blade.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost soul blade.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/lost soul blade.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/rappy holiday.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/rappy holiday.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/rappy holiday.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/recovery/rappy holiday.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/labyrinthe trial.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/labyrinthe trial.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/labyrinthe trial.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/labyrinthe trial.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/ttf.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/ttf.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/ttf.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1/vr/ttf.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1gov.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1gov.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1gov.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1gov.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1solo.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1solo.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1solo.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1solo.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep1team.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1team.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep1team.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep1team.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/beach laughter.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/beach laughter.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/beach laughter.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/beach laughter.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/christmas.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/christmas.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/christmas.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/christmas.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/dream messenger.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/dream messenger.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/dream messenger.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/dream messenger.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/festival on the beach.qst.old b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/festival on the beach.qst.old similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/festival on the beach.qst.old rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/festival on the beach.qst.old diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/halloween.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/halloween.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/halloween.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/halloween.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-a.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-a.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-a.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-a.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-b.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-b.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-b.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-b.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-c.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-c.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-c.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/ma4-c.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest239.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest239.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest239.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/quest239.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/singing by the beach.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/singing by the beach.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/singing by the beach.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/event/singing by the beach.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/pw4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/ext/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/gallon.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/gallon.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/gallon.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/gallon.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/shop/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/east.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/east.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/east.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/east.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/west.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/west.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/west.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/tower/west.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/reach for the dream.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/reach for the dream.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/reach for the dream.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/reach for the dream.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/respectivetomorrow.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/respectivetomorrow.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/respectivetomorrow.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2/vr/respectivetomorrow.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2gov.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2gov.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2gov.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2gov.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2solo.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2solo.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2solo.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2solo.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep2team.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2team.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep2team.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep2team.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/clarie's deal.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/clarie's deal.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/clarie's deal.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/clarie's deal.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/login.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/login.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/login.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/login.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-a.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-a.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-a.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-a.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-b.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-b.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-b.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-b.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-c.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-c.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-c.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/ma4-c.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/wildhouse.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/wildhouse.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/wildhouse.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/event/wildhouse.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/newwipe5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/ext/waroflimit5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/itempresent.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/itempresent.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/itempresent.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/itempresent.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest205.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest205.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest205.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/shop/quest205.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/max3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/max3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/max3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/max3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4/vr/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4gov.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4gov.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4gov.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4gov.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4solo.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4solo.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4solo.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4solo.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/ep4team.ini b/psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4team.ini similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/ep4team.ini rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/ep4team.ini diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/1-3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/2-4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/3-3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/4-5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep1/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest451.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest451.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest451.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest451.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest452.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest452.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest452.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest452.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest453.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest453.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest453.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest453.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest454.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest454.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest454.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest454.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest455.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest455.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest455.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest455.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest456.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest456.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest456.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest456.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest457.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest457.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest457.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest457.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest458.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest458.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest458.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest458.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest459.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest459.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest459.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest459.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest460.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest460.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest460.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest460.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest461.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest461.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest461.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest461.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest462.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest462.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest462.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest462.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest463.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest463.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest463.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest463.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest464.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest464.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest464.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest464.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest465.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest465.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest465.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest465.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest466.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest466.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest466.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest466.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest467.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest467.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest467.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest467.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest468.raw b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest468.raw similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest468.raw rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep2/quest468.raw diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-1.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-1.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-1.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-1.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-3.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-3.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-3.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-3.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-4.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-4.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-4.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-4.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-5.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-5.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-5.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-5.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-6.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-6.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-6.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-6.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-7.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-7.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-7.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-7.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-8.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-8.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-8.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/9-8.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/pod.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/pod.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/pod.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/pod.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/princ/ep4/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/01.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/01.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/01.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/01.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/02.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/02.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/02.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/02.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/03.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/03.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/03.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/03.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/04.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/04.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/04.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/04.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/05.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/05.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/05.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/05.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/06.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/06.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/06.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/06.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/07.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/07.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/07.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/07.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/08.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/08.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/08.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/08.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/09.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/09.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/09.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/09.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/10.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/10.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/10.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/10.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/11.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/11.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/11.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/11.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/12.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/12.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/12.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/12.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/13.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/13.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/13.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/13.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/14.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/14.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/14.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/14.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/15.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/15.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/15.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/15.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/16.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/16.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/16.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/16.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/17.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/17.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/17.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/17.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/18.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/18.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/18.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/18.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/19.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/19.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/19.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/19.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/20.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/20.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/20.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/20.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/21.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/21.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/21.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/21.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/22.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/22.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/22.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/22.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/23.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/23.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/23.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/23.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/24.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/24.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/24.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/24.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/25.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/25.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/25.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/25.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/26.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/26.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/26.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/26.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/goodluck.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/goodluck.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/goodluck.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/goodluck.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest035.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest035.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest035.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest035.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest073.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest073.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest073.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep1/side/quest073.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/01.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/01.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/01.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/01.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep2/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/01-blackpaper.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/01-blackpaper.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/01-blackpaper.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/01-blackpaper.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/02-pioneer spirit.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/02-pioneer spirit.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/02-pioneer spirit.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/02-pioneer spirit.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/03-Warrior Pride.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/03-Warrior Pride.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/03-Warrior Pride.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/03-Warrior Pride.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/04-Restless Lion.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/04-Restless Lion.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/04-Restless Lion.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/04-Restless Lion.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/blackpaper2.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/blackpaper2.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/blackpaper2.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/blackpaper2.qst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/quest.lst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/quest.lst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/quest.lst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/quest.lst diff --git a/lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/wilderending.qst b/psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/wilderending.qst similarity index 100% rename from lib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/wilderending.qst rename to psolib/src/commonTest/resources/tethealla_v0.143_quests/solo/ep4/wilderending.qst diff --git a/lib/src/jsMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt b/psolib/src/jsMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt similarity index 98% rename from lib/src/jsMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt rename to psolib/src/jsMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt index 47f80275..3f335c87 100644 --- a/lib/src/jsMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt +++ b/psolib/src/jsMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt @@ -1,11 +1,11 @@ -package world.phantasmal.lib.buffer +package world.phantasmal.psolib.buffer import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.DataView import org.khronos.webgl.Int8Array import org.khronos.webgl.Uint8Array import org.w3c.dom.WindowOrWorkerGlobalScope -import world.phantasmal.lib.Endianness +import world.phantasmal.psolib.Endianness external val self: WindowOrWorkerGlobalScope diff --git a/lib/src/jsMain/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursor.kt b/psolib/src/jsMain/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursor.kt similarity index 97% rename from lib/src/jsMain/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursor.kt rename to psolib/src/jsMain/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursor.kt index c0615fbc..468f01d3 100644 --- a/lib/src/jsMain/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursor.kt +++ b/psolib/src/jsMain/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursor.kt @@ -1,9 +1,9 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor import org.khronos.webgl.ArrayBuffer import org.khronos.webgl.DataView -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer /** * A cursor for reading from an array buffer or part of an array buffer. diff --git a/lib/src/jsTest/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursorTests.kt b/psolib/src/jsTest/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursorTests.kt similarity index 77% rename from lib/src/jsTest/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursorTests.kt rename to psolib/src/jsTest/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursorTests.kt index 2406a0b0..10465d2a 100644 --- a/lib/src/jsTest/kotlin/world/phantasmal/lib/cursor/ArrayBufferCursorTests.kt +++ b/psolib/src/jsTest/kotlin/world/phantasmal/psolib/cursor/ArrayBufferCursorTests.kt @@ -1,7 +1,7 @@ -package world.phantasmal.lib.cursor +package world.phantasmal.psolib.cursor import org.khronos.webgl.Uint8Array -import world.phantasmal.lib.Endianness +import world.phantasmal.psolib.Endianness class ArrayBufferCursorTests : WritableCursorTests() { override fun createCursor(bytes: ByteArray, endianness: Endianness, size: Int) = diff --git a/lib/src/jsTest/kotlin/world/phantasmal/lib/test/TestUtils.kt b/psolib/src/jsTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt similarity index 65% rename from lib/src/jsTest/kotlin/world/phantasmal/lib/test/TestUtils.kt rename to psolib/src/jsTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt index d51a241e..8a042319 100644 --- a/lib/src/jsTest/kotlin/world/phantasmal/lib/test/TestUtils.kt +++ b/psolib/src/jsTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt @@ -1,10 +1,10 @@ -package world.phantasmal.lib.test +package world.phantasmal.psolib.test import kotlinx.browser.window import kotlinx.coroutines.await -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.cursor.ArrayBufferCursor -import world.phantasmal.lib.cursor.Cursor +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.cursor.ArrayBufferCursor +import world.phantasmal.psolib.cursor.Cursor actual suspend fun readFile(path: String): Cursor { return window.fetch(path) diff --git a/lib/src/jvmMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt b/psolib/src/jvmMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt similarity index 98% rename from lib/src/jvmMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt rename to psolib/src/jvmMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt index 11b27f97..7ff4e0d0 100644 --- a/lib/src/jvmMain/kotlin/world/phantasmal/lib/buffer/Buffer.kt +++ b/psolib/src/jvmMain/kotlin/world/phantasmal/psolib/buffer/Buffer.kt @@ -1,6 +1,6 @@ -package world.phantasmal.lib.buffer +package world.phantasmal.psolib.buffer -import world.phantasmal.lib.Endianness +import world.phantasmal.psolib.Endianness import java.nio.ByteBuffer import java.nio.ByteOrder import java.util.* diff --git a/psolib/src/jvmTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt b/psolib/src/jvmTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt new file mode 100644 index 00000000..8cdd4083 --- /dev/null +++ b/psolib/src/jvmTest/kotlin/world/phantasmal/psolib/test/TestUtils.kt @@ -0,0 +1,10 @@ +@file:JvmName("TestUtilsJvm") + +package world.phantasmal.psolib.test + +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor + +actual suspend fun readFile(path: String): Cursor = + Buffer.fromResource(path).cursor() diff --git a/lib/srcGeneration/asm/opcodes.schema.json b/psolib/srcGeneration/asm/opcodes.schema.json similarity index 100% rename from lib/srcGeneration/asm/opcodes.schema.json rename to psolib/srcGeneration/asm/opcodes.schema.json diff --git a/lib/srcGeneration/asm/opcodes.yml b/psolib/srcGeneration/asm/opcodes.yml similarity index 100% rename from lib/srcGeneration/asm/opcodes.yml rename to psolib/srcGeneration/asm/opcodes.yml diff --git a/settings.gradle.kts b/settings.gradle.kts index ac21085f..89a91b67 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,7 @@ rootProject.name = "phantasmal-world" include( ":core", - ":lib", + ":psolib", ":observable", ":test-utils", ":web", diff --git a/web/assembly-worker/src/main/kotlin/world/phantasmal/web/assemblyWorker/AsmAnalyser.kt b/web/assembly-worker/src/main/kotlin/world/phantasmal/web/assemblyWorker/AsmAnalyser.kt index c052c35a..e3ccfe5c 100644 --- a/web/assembly-worker/src/main/kotlin/world/phantasmal/web/assemblyWorker/AsmAnalyser.kt +++ b/web/assembly-worker/src/main/kotlin/world/phantasmal/web/assemblyWorker/AsmAnalyser.kt @@ -1,16 +1,16 @@ package world.phantasmal.web.assemblyWorker import world.phantasmal.core.* -import world.phantasmal.lib.asm.* -import world.phantasmal.lib.asm.dataFlowAnalysis.ControlFlowGraph -import world.phantasmal.lib.asm.dataFlowAnalysis.ValueSet -import world.phantasmal.lib.asm.dataFlowAnalysis.getMapDesignations -import world.phantasmal.lib.asm.dataFlowAnalysis.getStackValue +import world.phantasmal.psolib.asm.* +import world.phantasmal.psolib.asm.dataFlowAnalysis.ControlFlowGraph +import world.phantasmal.psolib.asm.dataFlowAnalysis.ValueSet +import world.phantasmal.psolib.asm.dataFlowAnalysis.getMapDesignations +import world.phantasmal.psolib.asm.dataFlowAnalysis.getStackValue import world.phantasmal.web.shared.messages.* import world.phantasmal.web.shared.messages.AssemblyProblem import kotlin.math.max import kotlin.math.min -import world.phantasmal.lib.asm.AssemblyProblem as LibAssemblyProblem +import world.phantasmal.psolib.asm.AssemblyProblem as LibAssemblyProblem class AsmAnalyser { // User input. diff --git a/web/assets-generation/build.gradle.kts b/web/assets-generation/build.gradle.kts index ed01f803..1d90b730 100644 --- a/web/assets-generation/build.gradle.kts +++ b/web/assets-generation/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation(project(":lib")) + implementation(project(":psolib")) implementation(project(":web:shared")) implementation("org.jsoup:jsoup:1.13.1") } diff --git a/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/Ephinea.kt b/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/Ephinea.kt index d1fcce9a..64f9007b 100644 --- a/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/Ephinea.kt +++ b/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/Ephinea.kt @@ -3,12 +3,12 @@ package world.phantasmal.web.assetsGeneration.ephinea import kotlinx.serialization.encodeToString import mu.KotlinLogging import world.phantasmal.core.removeAt -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.compression.prs.prsDecompress -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ItemPmt -import world.phantasmal.lib.fileFormats.parseItemPmt -import world.phantasmal.lib.fileFormats.parseUnitxt +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.compression.prs.prsDecompress +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ItemPmt +import world.phantasmal.psolib.fileFormats.parseItemPmt +import world.phantasmal.psolib.fileFormats.parseUnitxt import world.phantasmal.web.shared.JSON_FORMAT_PRETTY import world.phantasmal.web.shared.dto.* import java.io.File diff --git a/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/UpdateDrops.kt b/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/UpdateDrops.kt index 8bb2cc8d..ba52e60b 100644 --- a/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/UpdateDrops.kt +++ b/web/assets-generation/src/main/kotlin/world/phantasmal/web/assetsGeneration/ephinea/UpdateDrops.kt @@ -3,9 +3,9 @@ package world.phantasmal.web.assetsGeneration.ephinea import kotlinx.serialization.encodeToString import mu.KotlinLogging import org.jsoup.Jsoup -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.fromNameAndEpisode +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.fromNameAndEpisode import world.phantasmal.web.shared.JSON_FORMAT_PRETTY import world.phantasmal.web.shared.dto.* import java.io.File diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 41299e86..1c6772c0 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -24,7 +24,7 @@ val ktorVersion: String by project.extra val serializationVersion: String by project.extra dependencies { - implementation(project(":lib")) + implementation(project(":psolib")) implementation(project(":webui")) implementation(project(":web:shared")) diff --git a/web/shared/build.gradle.kts b/web/shared/build.gradle.kts index eef598ab..61d97ea2 100644 --- a/web/shared/build.gradle.kts +++ b/web/shared/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { sourceSets { commonMain { dependencies { - api(project(":lib")) + api(project(":psolib")) api("org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion") } diff --git a/web/shared/src/commonMain/kotlin/world/phantasmal/web/shared/dto/ItemDrop.kt b/web/shared/src/commonMain/kotlin/world/phantasmal/web/shared/dto/ItemDrop.kt index dcdc21c0..b74ea61a 100644 --- a/web/shared/src/commonMain/kotlin/world/phantasmal/web/shared/dto/ItemDrop.kt +++ b/web/shared/src/commonMain/kotlin/world/phantasmal/web/shared/dto/ItemDrop.kt @@ -12,8 +12,8 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType @Serializable sealed class ItemDrop { diff --git a/web/src/main/kotlin/world/phantasmal/web/core/files/FilesExtensions.kt b/web/src/main/kotlin/world/phantasmal/web/core/files/FilesExtensions.kt index 5c79f2f9..6954283a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/files/FilesExtensions.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/files/FilesExtensions.kt @@ -2,10 +2,10 @@ package world.phantasmal.web.core.files import kotlinx.coroutines.await import world.phantasmal.core.use -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.buffer.Buffer -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.buffer.Buffer +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor import world.phantasmal.webui.files.FileHandle suspend fun FileHandle.cursor(endianness: Endianness): Cursor = diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/Conversion.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/Conversion.kt index 70272d12..d267bd96 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/Conversion.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/Conversion.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.core.rendering.conversion -import world.phantasmal.lib.fileFormats.Vec2 -import world.phantasmal.lib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.Vec2 +import world.phantasmal.psolib.fileFormats.Vec3 import world.phantasmal.web.core.euler import world.phantasmal.web.externals.three.Euler import world.phantasmal.web.externals.three.Vector2 diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt index 61de9337..48cf9d8e 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/MeshBuilder.kt @@ -6,7 +6,7 @@ import org.khronos.webgl.set import world.phantasmal.core.asArray import world.phantasmal.core.jsArrayOf import world.phantasmal.core.unsafe.UnsafeMap -import world.phantasmal.lib.fileFormats.ninja.XvrTexture +import world.phantasmal.psolib.fileFormats.ninja.XvrTexture import world.phantasmal.web.externals.three.* import world.phantasmal.webui.obj diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaAnimation.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaAnimation.kt index 73b9a22d..e0aa9bfe 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaAnimation.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaAnimation.kt @@ -2,10 +2,10 @@ package world.phantasmal.web.core.rendering.conversion import world.phantasmal.core.asArray import world.phantasmal.core.jsArrayOf -import world.phantasmal.lib.fileFormats.ninja.NinjaObject -import world.phantasmal.lib.fileFormats.ninja.NjInterpolation -import world.phantasmal.lib.fileFormats.ninja.NjKeyframeTrack -import world.phantasmal.lib.fileFormats.ninja.NjMotion +import world.phantasmal.psolib.fileFormats.ninja.NinjaObject +import world.phantasmal.psolib.fileFormats.ninja.NjInterpolation +import world.phantasmal.psolib.fileFormats.ninja.NjKeyframeTrack +import world.phantasmal.psolib.fileFormats.ninja.NjMotion import world.phantasmal.web.externals.three.* const val PSO_FRAME_RATE: Int = 30 diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt index 970142ca..790843e5 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/NinjaGeometryConversion.kt @@ -8,8 +8,8 @@ import world.phantasmal.core.asArray import world.phantasmal.core.isBitSet import world.phantasmal.core.jsArrayOf import world.phantasmal.core.unsafe.UnsafeMap -import world.phantasmal.lib.fileFormats.* -import world.phantasmal.lib.fileFormats.ninja.* +import world.phantasmal.psolib.fileFormats.* +import world.phantasmal.psolib.fileFormats.ninja.* import world.phantasmal.web.core.dot import world.phantasmal.web.core.toQuaternion import world.phantasmal.web.externals.three.* diff --git a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/XvrTextureConversion.kt b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/XvrTextureConversion.kt index a5f93401..f21fbe25 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/XvrTextureConversion.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/rendering/conversion/XvrTextureConversion.kt @@ -4,8 +4,8 @@ import org.khronos.webgl.Uint16Array import org.khronos.webgl.Uint8Array import org.khronos.webgl.get import org.khronos.webgl.set -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ninja.XvrTexture +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ninja.XvrTexture import world.phantasmal.web.externals.three.* import world.phantasmal.webui.obj import kotlin.math.roundToInt diff --git a/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt b/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt index 331c1f89..6201f5d3 100644 --- a/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/core/stores/ItemDropStore.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.core.stores import world.phantasmal.core.unsafe.UnsafeMap -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.core.models.Server import world.phantasmal.web.questEditor.loading.LoadingCache diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsController.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsController.kt index cd56c2da..63d7665b 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsController.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.huntOptimizer.controllers -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.controllers.PathAwareTab import world.phantasmal.web.core.controllers.PathAwareTabContainerController diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt index 3c40b69e..08f0179a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/controllers/MethodsForEpisodeController.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.huntOptimizer.controllers -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.listCell import world.phantasmal.observable.cell.list.mutableListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt index 534e0d0d..aab41923 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/HuntMethodModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.huntOptimizer.models -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.mutableCell import world.phantasmal.observable.cell.orElse diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/OptimalMethodModel.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/OptimalMethodModel.kt index bc51bb3b..91d0da5f 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/OptimalMethodModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/OptimalMethodModel.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.huntOptimizer.models -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.shared.dto.Difficulty import world.phantasmal.web.shared.dto.SectionId import kotlin.time.Duration diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/SimpleQuestModel.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/SimpleQuestModel.kt index 48019a2d..af51b0d4 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/SimpleQuestModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/models/SimpleQuestModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.huntOptimizer.models -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType class SimpleQuestModel( val id: Int, diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt index 5c52b7ed..387ab4be 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntMethodStore.kt @@ -3,8 +3,8 @@ package world.phantasmal.web.huntOptimizer.stores import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.mutableListCell import world.phantasmal.web.core.loading.AssetLoader diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt index ca4f9218..d27750d7 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/stores/HuntOptimizerStore.kt @@ -6,7 +6,7 @@ import kotlinx.coroutines.withContext import mu.KotlinLogging import world.phantasmal.core.* import world.phantasmal.core.unsafe.UnsafeMap -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.mutableListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsForEpisodeWidget.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsForEpisodeWidget.kt index 83ce9ec9..5639958c 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsForEpisodeWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsForEpisodeWidget.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.huntOptimizer.widgets import kotlinx.coroutines.launch import org.w3c.dom.Node -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.huntOptimizer.controllers.MethodsForEpisodeController import world.phantasmal.web.huntOptimizer.controllers.MethodsForEpisodeController.Companion.METHOD_COL_KEY import world.phantasmal.web.huntOptimizer.controllers.MethodsForEpisodeController.Companion.TIME_COL_KEY diff --git a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsWidget.kt b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsWidget.kt index 7ef3d44e..f170636e 100644 --- a/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/huntOptimizer/widgets/MethodsWidget.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.huntOptimizer.widgets import org.w3c.dom.Node -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.huntOptimizer.controllers.MethodsController import world.phantasmal.webui.dom.div import world.phantasmal.webui.widgets.TabContainer diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt index 456d6b23..b89dcc7d 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoController.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.controllers import world.phantasmal.core.math.degToRad import world.phantasmal.core.math.radToDeg -import world.phantasmal.lib.fileFormats.quest.EntityPropType +import world.phantasmal.psolib.fileFormats.quest.EntityPropType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.cell import world.phantasmal.observable.cell.list.ListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt index b78ef27a..8e4e4b83 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/EntityListController.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.EntityType -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.ObjectType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.map import world.phantasmal.web.questEditor.stores.QuestEditorStore diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt index 470e4bf1..81ef14f3 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsController.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.list.emptyListCell import world.phantasmal.web.questEditor.models.QuestNpcModel diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt index cfda9be5..95ba1993 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarController.kt @@ -3,9 +3,9 @@ package world.phantasmal.web.questEditor.controllers import kotlinx.coroutines.await import mu.KotlinLogging import world.phantasmal.core.* -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.* +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.* import world.phantasmal.observable.cell.* import world.phantasmal.web.core.PwToolType import world.phantasmal.web.core.files.cursor diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt index 341d3deb..640126a9 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/AreaAssetLoader.kt @@ -2,13 +2,13 @@ package world.phantasmal.web.questEditor.loading import org.khronos.webgl.ArrayBuffer import world.phantasmal.core.* -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.Episode -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.* -import world.phantasmal.lib.fileFormats.ninja.XjObject -import world.phantasmal.lib.fileFormats.ninja.XvrTexture -import world.phantasmal.lib.fileFormats.ninja.parseXvm +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.* +import world.phantasmal.psolib.fileFormats.ninja.XjObject +import world.phantasmal.psolib.fileFormats.ninja.XvrTexture +import world.phantasmal.psolib.fileFormats.ninja.parseXvm import world.phantasmal.web.core.dot import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.core.rendering.conversion.* diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/EntityAssetLoader.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/EntityAssetLoader.kt index 141554d9..0cd24692 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/EntityAssetLoader.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/EntityAssetLoader.kt @@ -4,13 +4,13 @@ import mu.KotlinLogging import org.khronos.webgl.ArrayBuffer import world.phantasmal.core.PwResult import world.phantasmal.core.Success -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ninja.* -import world.phantasmal.lib.fileFormats.quest.EntityType -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ninja.* +import world.phantasmal.psolib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.ObjectType import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.core.rendering.conversion.ninjaObjectToInstancedMesh import world.phantasmal.web.core.rendering.disposeObject3DResources diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/QuestLoader.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/QuestLoader.kt index ce741a85..5232da41 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/QuestLoader.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/loading/QuestLoader.kt @@ -1,11 +1,11 @@ package world.phantasmal.web.questEditor.loading import org.khronos.webgl.ArrayBuffer -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.Quest -import world.phantasmal.lib.fileFormats.quest.parseQstToQuest +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.Quest +import world.phantasmal.psolib.fileFormats.quest.parseQstToQuest import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.webui.DisposableContainer diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt index 3c7df3a6..fb73d030 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.fileFormats.quest.EntityType -import world.phantasmal.lib.fileFormats.quest.QuestEntity +import world.phantasmal.psolib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.QuestEntity import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.listCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt index 03a910a3..5fac49a9 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestEntityPropModel.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.fileFormats.ninja.angleToRad -import world.phantasmal.lib.fileFormats.ninja.radToAngle -import world.phantasmal.lib.fileFormats.quest.EntityProp -import world.phantasmal.lib.fileFormats.quest.EntityPropType +import world.phantasmal.psolib.fileFormats.ninja.angleToRad +import world.phantasmal.psolib.fileFormats.ninja.radToAngle +import world.phantasmal.psolib.fileFormats.quest.EntityProp +import world.phantasmal.psolib.fileFormats.quest.EntityPropType import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.MutableCell import world.phantasmal.observable.cell.mutableCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt index 5dd8a40a..3d4e5afa 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestModel.kt @@ -1,8 +1,8 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.Episode -import world.phantasmal.lib.asm.BytecodeIr -import world.phantasmal.lib.fileFormats.quest.DatUnknown +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.asm.BytecodeIr +import world.phantasmal.psolib.fileFormats.quest.DatUnknown import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.SimpleListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt index f3df2775..67d63638 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestNpcModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.QuestNpc +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.QuestNpc import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.map import world.phantasmal.observable.cell.mutableCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt index 1419fbfc..d45dc31a 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/models/QuestObjectModel.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.fileFormats.quest.ObjectType -import world.phantasmal.lib.fileFormats.quest.QuestObject +import world.phantasmal.psolib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.fileFormats.quest.QuestObject import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.mutableCell import world.phantasmal.web.core.rendering.conversion.vec3ToThree diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/AreaMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/AreaMeshManager.kt index 76431d9c..cb583c0d 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/AreaMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/AreaMeshManager.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.rendering import kotlinx.coroutines.CancellationException import mu.KotlinLogging -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.questEditor.loading.AreaAssetLoader import world.phantasmal.web.questEditor.models.AreaVariantModel diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityImageRenderer.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityImageRenderer.kt index 6063cf6f..c03bce55 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityImageRenderer.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityImageRenderer.kt @@ -4,7 +4,7 @@ import kotlinx.browser.document import org.w3c.dom.HTMLCanvasElement import org.w3c.dom.url.URL import world.phantasmal.core.math.degToRad -import world.phantasmal.lib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.core.rendering.DisposableThreeRenderer import world.phantasmal.web.core.rendering.disposeObject3DResources import world.phantasmal.web.core.timesAssign diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt index ef5f443b..b9775243 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/EntityMeshManager.kt @@ -5,7 +5,7 @@ import mu.KotlinLogging import org.khronos.webgl.Float32Array import world.phantasmal.core.disposable.DisposableSupervisedScope import world.phantasmal.core.disposable.Disposer -import world.phantasmal.lib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.core.rendering.disposeObject3DResources import world.phantasmal.web.externals.three.* import world.phantasmal.web.questEditor.loading.EntityAssetLoader diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt index 63bb9c6b..28e43918 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/QuestMeshManager.kt @@ -5,7 +5,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.DisposableSupervisedScope -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.ListChange import world.phantasmal.observable.cell.list.ListChangeEvent diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/Evt.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/Evt.kt index 2770cfad..b826f728 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/Evt.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/Evt.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.questEditor.rendering.input -import world.phantasmal.lib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.externals.three.Vector2 import world.phantasmal.web.questEditor.widgets.EntityDragEvent diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/CreationState.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/CreationState.kt index 03523001..a33429f1 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/CreationState.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/CreationState.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.questEditor.rendering.input.state -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.ObjectType -import world.phantasmal.lib.fileFormats.quest.QuestNpc -import world.phantasmal.lib.fileFormats.quest.QuestObject +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.fileFormats.quest.QuestNpc +import world.phantasmal.psolib.fileFormats.quest.QuestObject import world.phantasmal.web.externals.three.Vector2 import world.phantasmal.web.externals.three.Vector3 import world.phantasmal.web.questEditor.models.* diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt index cece831a..9b6bf2aa 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/rendering/input/state/StateContext.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.rendering.input.state import mu.KotlinLogging import world.phantasmal.core.asJsArray -import world.phantasmal.lib.fileFormats.ninja.XjObject +import world.phantasmal.psolib.fileFormats.ninja.XjObject import world.phantasmal.observable.cell.Cell import world.phantasmal.web.core.dot import world.phantasmal.web.core.minusAssign diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AreaStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AreaStore.kt index 298aa24b..282708f4 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AreaStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AreaStore.kt @@ -1,12 +1,12 @@ package world.phantasmal.web.questEditor.stores -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.questEditor.loading.AreaAssetLoader import world.phantasmal.web.questEditor.models.AreaModel import world.phantasmal.web.questEditor.models.AreaVariantModel import world.phantasmal.web.questEditor.models.SectionModel import world.phantasmal.webui.stores.Store -import world.phantasmal.lib.fileFormats.quest.getAreasForEpisode as getAreasForEpisodeLib +import world.phantasmal.psolib.fileFormats.quest.getAreasForEpisode as getAreasForEpisodeLib class AreaStore(private val areaAssetLoader: AreaAssetLoader) : Store() { private val areas: Map> = diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt index 981e90fc..9d379bb9 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/AsmStore.kt @@ -5,8 +5,8 @@ import kotlinx.coroutines.launch import world.phantasmal.core.Severity import world.phantasmal.core.disposable.Disposer import world.phantasmal.core.disposable.disposable -import world.phantasmal.lib.asm.assemble -import world.phantasmal.lib.asm.disassemble +import world.phantasmal.psolib.asm.assemble +import world.phantasmal.psolib.asm.disassemble import world.phantasmal.observable.Observable import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.list.ListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/ModelConversion.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/ModelConversion.kt index 2122f1a6..39817608 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/ModelConversion.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/ModelConversion.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.questEditor.stores -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.DatEvent -import world.phantasmal.lib.fileFormats.quest.DatEventAction -import world.phantasmal.lib.fileFormats.quest.Quest +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.DatEvent +import world.phantasmal.psolib.fileFormats.quest.DatEventAction +import world.phantasmal.psolib.fileFormats.quest.Quest import world.phantasmal.web.questEditor.models.* fun convertQuestToModel( diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt index 5636b05a..be585087 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/stores/QuestEditorStore.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.stores import kotlinx.coroutines.launch import mu.KotlinLogging -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.observable.cell.* import world.phantasmal.observable.cell.list.ListCell import world.phantasmal.observable.cell.list.emptyListCell diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityDnd.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityDnd.kt index 8184e520..1699ab16 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityDnd.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityDnd.kt @@ -8,7 +8,7 @@ import org.w3c.dom.Image import org.w3c.dom.events.Event import world.phantasmal.core.disposable.Disposable import world.phantasmal.core.disposable.TrackedDisposable -import world.phantasmal.lib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.externals.three.Vector2 import world.phantasmal.webui.dom.disposableListener import world.phantasmal.webui.dom.getRoot diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityListWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityListWidget.kt index e3604eb4..d5b09a75 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityListWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/EntityListWidget.kt @@ -2,7 +2,7 @@ package world.phantasmal.web.questEditor.widgets import kotlinx.coroutines.launch import org.w3c.dom.Node -import world.phantasmal.lib.fileFormats.quest.EntityType +import world.phantasmal.psolib.fileFormats.quest.EntityType import world.phantasmal.web.questEditor.controllers.EntityListController import world.phantasmal.web.questEditor.rendering.EntityImageRenderer import world.phantasmal.webui.dom.div diff --git a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt index 093ea28e..d2377246 100644 --- a/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt +++ b/web/src/main/kotlin/world/phantasmal/web/questEditor/widgets/QuestEditorToolbarWidget.kt @@ -3,8 +3,8 @@ package world.phantasmal.web.questEditor.widgets import kotlinx.coroutines.launch import org.w3c.dom.Node import org.w3c.dom.events.KeyboardEvent -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.Version +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.Version import world.phantasmal.observable.cell.cell import world.phantasmal.observable.cell.list.listCell import world.phantasmal.web.questEditor.controllers.QuestEditorToolbarController diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt index 6efc7460..134de2ef 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/controllers/ViewerToolbarController.kt @@ -5,14 +5,14 @@ import world.phantasmal.core.Failure import world.phantasmal.core.PwResult import world.phantasmal.core.Severity import world.phantasmal.core.Success -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.compression.prs.prsDecompress -import world.phantasmal.lib.cursor.Cursor -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ninja.* -import world.phantasmal.lib.fileFormats.parseAfs -import world.phantasmal.lib.fileFormats.parseAreaCollisionGeometry -import world.phantasmal.lib.fileFormats.parseAreaRenderGeometry +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.compression.prs.prsDecompress +import world.phantasmal.psolib.cursor.Cursor +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ninja.* +import world.phantasmal.psolib.fileFormats.parseAfs +import world.phantasmal.psolib.fileFormats.parseAreaCollisionGeometry +import world.phantasmal.psolib.fileFormats.parseAreaRenderGeometry import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.mutableCell import world.phantasmal.observable.change diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/loading/AnimationAssetLoader.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/loading/AnimationAssetLoader.kt index dba7d3f9..dda14297 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/loading/AnimationAssetLoader.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/loading/AnimationAssetLoader.kt @@ -1,9 +1,9 @@ package world.phantasmal.web.viewer.loading -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ninja.NjMotion -import world.phantasmal.lib.fileFormats.ninja.parseNjm +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ninja.NjMotion +import world.phantasmal.psolib.fileFormats.ninja.parseNjm import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.questEditor.loading.LoadingCache import world.phantasmal.webui.DisposableContainer diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/loading/CharacterClassAssetLoader.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/loading/CharacterClassAssetLoader.kt index a75ca5cb..51c2aeba 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/loading/CharacterClassAssetLoader.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/loading/CharacterClassAssetLoader.kt @@ -1,10 +1,10 @@ package world.phantasmal.web.viewer.loading import world.phantasmal.core.Success -import world.phantasmal.lib.Endianness -import world.phantasmal.lib.cursor.cursor -import world.phantasmal.lib.fileFormats.ninja.* -import world.phantasmal.lib.fileFormats.parseAfs +import world.phantasmal.psolib.Endianness +import world.phantasmal.psolib.cursor.cursor +import world.phantasmal.psolib.fileFormats.ninja.* +import world.phantasmal.psolib.fileFormats.parseAfs import world.phantasmal.web.core.loading.AssetLoader import world.phantasmal.web.questEditor.loading.LoadingCache import world.phantasmal.web.shared.dto.SectionId diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/MeshRenderer.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/MeshRenderer.kt index 1e895204..059008d7 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/MeshRenderer.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/MeshRenderer.kt @@ -3,9 +3,9 @@ package world.phantasmal.web.viewer.rendering import org.w3c.dom.HTMLCanvasElement import world.phantasmal.core.disposable.TrackedDisposable import world.phantasmal.core.math.degToRad -import world.phantasmal.lib.fileFormats.ninja.NinjaObject -import world.phantasmal.lib.fileFormats.ninja.NjMotion -import world.phantasmal.lib.fileFormats.ninja.NjObject +import world.phantasmal.psolib.fileFormats.ninja.NinjaObject +import world.phantasmal.psolib.fileFormats.ninja.NjMotion +import world.phantasmal.psolib.fileFormats.ninja.NjObject import world.phantasmal.web.core.boundingSphere import world.phantasmal.web.core.isSkinnedMesh import world.phantasmal.web.core.rendering.* diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/TextureRenderer.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/TextureRenderer.kt index b9bff163..81987620 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/TextureRenderer.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/rendering/TextureRenderer.kt @@ -4,7 +4,7 @@ import mu.KotlinLogging import org.khronos.webgl.Float32Array import org.khronos.webgl.Uint16Array import org.w3c.dom.HTMLCanvasElement -import world.phantasmal.lib.fileFormats.ninja.XvrTexture +import world.phantasmal.psolib.fileFormats.ninja.XvrTexture import world.phantasmal.web.core.rendering.* import world.phantasmal.web.core.rendering.Renderer import world.phantasmal.web.core.rendering.conversion.xvrTextureToThree diff --git a/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt b/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt index 67b68c72..c23aa392 100644 --- a/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt +++ b/web/src/main/kotlin/world/phantasmal/web/viewer/stores/ViewerStore.kt @@ -3,12 +3,12 @@ package world.phantasmal.web.viewer.stores import kotlinx.coroutines.launch import mu.KotlinLogging import world.phantasmal.core.enumValueOfOrNull -import world.phantasmal.lib.fileFormats.AreaGeometry -import world.phantasmal.lib.fileFormats.CollisionGeometry -import world.phantasmal.lib.fileFormats.ninja.NinjaObject -import world.phantasmal.lib.fileFormats.ninja.NjMotion -import world.phantasmal.lib.fileFormats.ninja.NjObject -import world.phantasmal.lib.fileFormats.ninja.XvrTexture +import world.phantasmal.psolib.fileFormats.AreaGeometry +import world.phantasmal.psolib.fileFormats.CollisionGeometry +import world.phantasmal.psolib.fileFormats.ninja.NinjaObject +import world.phantasmal.psolib.fileFormats.ninja.NjMotion +import world.phantasmal.psolib.fileFormats.ninja.NjObject +import world.phantasmal.psolib.fileFormats.ninja.XvrTexture import world.phantasmal.observable.cell.Cell import world.phantasmal.observable.cell.and import world.phantasmal.observable.cell.list.ListCell diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoControllerTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoControllerTests.kt index f0350a12..3ef63a0a 100644 --- a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoControllerTests.kt +++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/EntityInfoControllerTests.kt @@ -1,10 +1,10 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.Vec3 -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.ObjectType -import world.phantasmal.lib.fileFormats.quest.QuestNpc +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.Vec3 +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.fileFormats.quest.QuestNpc import world.phantasmal.testUtils.assertCloseTo import world.phantasmal.web.questEditor.models.QuestEventModel import world.phantasmal.web.questEditor.models.QuestNpcModel diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsControllerTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsControllerTests.kt index 712711a8..619114ca 100644 --- a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsControllerTests.kt +++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/NpcCountsControllerTests.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.test.WebTestSuite import world.phantasmal.web.test.createQuestModel import world.phantasmal.web.test.createQuestNpcModel diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarControllerTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarControllerTests.kt index 235749f0..c479601e 100644 --- a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarControllerTests.kt +++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestEditorToolbarControllerTests.kt @@ -3,8 +3,8 @@ package world.phantasmal.web.questEditor.controllers import org.w3c.files.File import world.phantasmal.core.Failure import world.phantasmal.core.Severity -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.core.actions.Action import world.phantasmal.web.test.WebTestSuite import world.phantasmal.web.test.createQuestModel diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoControllerTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoControllerTests.kt index 4d7ff965..b4ba4cff 100644 --- a/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoControllerTests.kt +++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/controllers/QuestInfoControllerTests.kt @@ -1,6 +1,6 @@ package world.phantasmal.web.questEditor.controllers -import world.phantasmal.lib.Episode +import world.phantasmal.psolib.Episode import world.phantasmal.web.test.WebTestSuite import world.phantasmal.web.test.createQuestModel import kotlin.test.Test diff --git a/web/src/test/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModelTests.kt b/web/src/test/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModelTests.kt index 9a39e8df..138fc1e2 100644 --- a/web/src/test/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModelTests.kt +++ b/web/src/test/kotlin/world/phantasmal/web/questEditor/models/QuestEntityModelTests.kt @@ -1,7 +1,7 @@ package world.phantasmal.web.questEditor.models -import world.phantasmal.lib.Episode -import world.phantasmal.lib.fileFormats.quest.NpcType +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.fileFormats.quest.NpcType import world.phantasmal.web.core.euler import world.phantasmal.web.externals.three.Vector3 import world.phantasmal.web.test.WebTestSuite diff --git a/web/src/test/kotlin/world/phantasmal/web/test/TestModels.kt b/web/src/test/kotlin/world/phantasmal/web/test/TestModels.kt index af356039..44035f15 100644 --- a/web/src/test/kotlin/world/phantasmal/web/test/TestModels.kt +++ b/web/src/test/kotlin/world/phantasmal/web/test/TestModels.kt @@ -1,11 +1,11 @@ package world.phantasmal.web.test -import world.phantasmal.lib.Episode -import world.phantasmal.lib.asm.BytecodeIr -import world.phantasmal.lib.fileFormats.quest.NpcType -import world.phantasmal.lib.fileFormats.quest.ObjectType -import world.phantasmal.lib.fileFormats.quest.QuestNpc -import world.phantasmal.lib.fileFormats.quest.QuestObject +import world.phantasmal.psolib.Episode +import world.phantasmal.psolib.asm.BytecodeIr +import world.phantasmal.psolib.fileFormats.quest.NpcType +import world.phantasmal.psolib.fileFormats.quest.ObjectType +import world.phantasmal.psolib.fileFormats.quest.QuestNpc +import world.phantasmal.psolib.fileFormats.quest.QuestObject import world.phantasmal.web.questEditor.models.QuestEventModel import world.phantasmal.web.questEditor.models.QuestModel import world.phantasmal.web.questEditor.models.QuestNpcModel