From 5c840eaf7758c446ed4cd485c06f3acf84311826 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 19 Apr 2024 15:05:58 +0700 Subject: [PATCH] Fix imports --- .../kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt | 4 ++-- .../ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt | 4 ++-- .../ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt | 4 ++-- .../kstarbound/defs/world/CelestialBaseInformation.kt | 2 +- .../kstarbound/defs/world/VisitableWorldParameters.kt | 2 +- .../network/packets/clientbound/CelestialResponsePacket.kt | 4 ++-- .../packets/clientbound/FindUniqueEntityResponsePacket.kt | 4 ++-- .../network/packets/clientbound/LegacyTileUpdatePacket.kt | 2 +- .../network/packets/clientbound/SetPlayerStartPacket.kt | 4 ++-- .../network/packets/clientbound/SystemWorldStartPacket.kt | 2 +- .../packets/clientbound/TileModificationFailurePacket.kt | 2 +- .../network/packets/clientbound/WorldStartPacket.kt | 4 ++-- .../network/packets/serverbound/CelestialRequestPacket.kt | 4 ++-- .../network/packets/serverbound/DamageTileGroupPacket.kt | 6 +++--- .../kstarbound/network/packets/serverbound/FlyShipPacket.kt | 2 +- .../network/packets/serverbound/ModifyTileListPacket.kt | 2 +- .../ru/dbotthepony/kstarbound/network/syncher/Factories.kt | 4 ++-- .../kotlin/ru/dbotthepony/kstarbound/world/TileHealth.kt | 4 ++-- .../kotlin/ru/dbotthepony/kstarbound/world/UniversePos.kt | 2 +- .../kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt | 2 +- .../ru/dbotthepony/kstarbound/world/api/MutableCell.kt | 2 +- .../kstarbound/world/entities/tile/WorldObject.kt | 2 +- .../kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt | 4 ++-- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt index 5cb2fa69..d542503a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt @@ -7,8 +7,8 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import ru.dbotthepony.kommons.io.StreamCodec import ru.dbotthepony.kommons.io.readUUID -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt index 11a53886..a335b6bb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/HumanoidData.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.actor -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt index 2aa44237..2f00b8c2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestParameter.kt @@ -13,8 +13,8 @@ import ru.dbotthepony.kommons.gson.consumeNull import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.kommons.gson.value import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialBaseInformation.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialBaseInformation.kt index 56fb4991..ad634ad5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialBaseInformation.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/CelestialBaseInformation.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.world -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kstarbound.math.vector.Vector2i import ru.dbotthepony.kstarbound.json.builder.JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/VisitableWorldParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/VisitableWorldParameters.kt index ac9aba74..24fe1e44 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/VisitableWorldParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/VisitableWorldParameters.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.kommons.gson.value import ru.dbotthepony.kommons.io.readByteArray import ru.dbotthepony.kommons.io.readCollection import ru.dbotthepony.kommons.io.readVarInt -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeByteArray import ru.dbotthepony.kommons.io.writeCollection diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/CelestialResponsePacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/CelestialResponsePacket.kt index 1928961b..8b7bbad5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/CelestialResponsePacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/CelestialResponsePacket.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.kstarbound.network.packets.clientbound import ru.dbotthepony.kommons.io.readCollection import ru.dbotthepony.kommons.io.readMap -import ru.dbotthepony.kstarbound.math.vector.readVector2i -import ru.dbotthepony.kstarbound.math.vector.readVector3i +import ru.dbotthepony.kstarbound.io.readVector2i +import ru.dbotthepony.kstarbound.io.readVector3i import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeMap import ru.dbotthepony.kommons.io.writeStruct2i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/FindUniqueEntityResponsePacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/FindUniqueEntityResponsePacket.kt index c3573a1f..74831415 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/FindUniqueEntityResponsePacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/FindUniqueEntityResponsePacket.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.network.packets.clientbound import ru.dbotthepony.kommons.io.readBinaryString -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/LegacyTileUpdatePacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/LegacyTileUpdatePacket.kt index e2559846..33b78109 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/LegacyTileUpdatePacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/LegacyTileUpdatePacket.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.network.packets.clientbound import ru.dbotthepony.kommons.arrays.Object2DArray import ru.dbotthepony.kommons.io.readSignedVarInt import ru.dbotthepony.kommons.io.readVarInt -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeSignedVarInt import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kommons.io.writeVarInt diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SetPlayerStartPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SetPlayerStartPacket.kt index 5d8e28e4..b005acf0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SetPlayerStartPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SetPlayerStartPacket.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.network.packets.clientbound -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f import ru.dbotthepony.kstarbound.math.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SystemWorldStartPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SystemWorldStartPacket.kt index 34547362..78f2e821 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SystemWorldStartPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/SystemWorldStartPacket.kt @@ -4,7 +4,7 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayList import ru.dbotthepony.kommons.io.readByteArray import ru.dbotthepony.kommons.io.readCollection import ru.dbotthepony.kommons.io.readUUID -import ru.dbotthepony.kstarbound.math.vector.readVector3i +import ru.dbotthepony.kstarbound.io.readVector3i import ru.dbotthepony.kommons.io.writeByteArray import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct3i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/TileModificationFailurePacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/TileModificationFailurePacket.kt index baf053a8..ad7c280a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/TileModificationFailurePacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/TileModificationFailurePacket.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.network.packets.clientbound import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kstarbound.math.vector.Vector2i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/WorldStartPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/WorldStartPacket.kt index a8b40dcb..94da519f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/WorldStartPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/clientbound/WorldStartPacket.kt @@ -8,8 +8,8 @@ import it.unimi.dsi.fastutil.ints.IntAVLTreeSet import ru.dbotthepony.kommons.io.readByteArray import ru.dbotthepony.kommons.io.readCollection import ru.dbotthepony.kommons.io.readMap -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeByteArray import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/CelestialRequestPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/CelestialRequestPacket.kt index d0ebb59c..da2aa966 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/CelestialRequestPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/CelestialRequestPacket.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.kstarbound.network.packets.serverbound import kotlinx.coroutines.launch import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2i -import ru.dbotthepony.kstarbound.math.vector.readVector3i +import ru.dbotthepony.kstarbound.io.readVector2i +import ru.dbotthepony.kstarbound.io.readVector3i import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kommons.io.writeStruct3i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/DamageTileGroupPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/DamageTileGroupPacket.kt index f78b7992..5c79dddc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/DamageTileGroupPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/DamageTileGroupPacket.kt @@ -1,9 +1,9 @@ package ru.dbotthepony.kstarbound.network.packets.serverbound import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/FlyShipPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/FlyShipPacket.kt index a23b831a..a7aee40f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/FlyShipPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/FlyShipPacket.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.network.packets.serverbound -import ru.dbotthepony.kstarbound.math.vector.readVector3i +import ru.dbotthepony.kstarbound.io.readVector3i import ru.dbotthepony.kommons.io.writeStruct3i import ru.dbotthepony.kstarbound.math.vector.Vector3i import ru.dbotthepony.kstarbound.network.IServerPacket diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ModifyTileListPacket.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ModifyTileListPacket.kt index b78fb6ce..79dc00ae 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ModifyTileListPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/packets/serverbound/ModifyTileListPacket.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.network.packets.serverbound import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kstarbound.math.vector.Vector2i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt index fa70d898..e03381b7 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt @@ -30,6 +30,8 @@ import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor import ru.dbotthepony.kstarbound.defs.world.SkyType +import ru.dbotthepony.kstarbound.io.Vector2dCodec +import ru.dbotthepony.kstarbound.io.Vector2fCodec import ru.dbotthepony.kstarbound.io.readAABB import ru.dbotthepony.kstarbound.io.readAABBLegacy import ru.dbotthepony.kstarbound.io.readAABBLegacyOptional @@ -43,8 +45,6 @@ import ru.dbotthepony.kstarbound.json.readJsonElement import ru.dbotthepony.kstarbound.json.readJsonObject import ru.dbotthepony.kstarbound.json.writeJsonElement import ru.dbotthepony.kstarbound.json.writeJsonObject -import ru.dbotthepony.kstarbound.math.vector.Vector2dCodec -import ru.dbotthepony.kstarbound.math.vector.Vector2fCodec import ru.dbotthepony.kstarbound.world.physics.Poly import java.io.DataInputStream import java.io.DataOutputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileHealth.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileHealth.kt index 1c445019..4f5c066d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileHealth.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileHealth.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f import ru.dbotthepony.kommons.util.getValue diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/UniversePos.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/UniversePos.kt index efa2a1d2..66397939 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/UniversePos.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/UniversePos.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.kommons.gson.get import ru.dbotthepony.kstarbound.math.vector.Vector3i import ru.dbotthepony.kommons.gson.consumeNull import ru.dbotthepony.kommons.io.readVarInt -import ru.dbotthepony.kstarbound.math.vector.readVector3i +import ru.dbotthepony.kstarbound.io.readVector3i import ru.dbotthepony.kommons.io.writeSignedVarInt import ru.dbotthepony.kommons.io.writeStruct3i import ru.dbotthepony.kommons.io.writeVarInt diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt index 8aa43332..d4128f93 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.world import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectArraySet -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kommons.io.writeStruct2i import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kstarbound.math.AABBi diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/MutableCell.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/MutableCell.kt index 2b40bc5a..42bc1cf0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/MutableCell.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/api/MutableCell.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.api -import ru.dbotthepony.kstarbound.math.vector.readVector2i +import ru.dbotthepony.kstarbound.io.readVector2i import ru.dbotthepony.kstarbound.defs.tile.NO_DUNGEON_ID import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt index 11566285..51e6bba5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WorldObject.kt @@ -43,6 +43,7 @@ import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.`object`.ObjectType import ru.dbotthepony.kstarbound.defs.quest.QuestArcDescriptor import ru.dbotthepony.kstarbound.defs.tile.TileDamage +import ru.dbotthepony.kstarbound.io.Vector2iCodec import ru.dbotthepony.kstarbound.json.JsonPath import ru.dbotthepony.kstarbound.json.mergeJson import ru.dbotthepony.kstarbound.json.stream @@ -73,7 +74,6 @@ import ru.dbotthepony.kstarbound.lua.set import ru.dbotthepony.kstarbound.lua.tableOf import ru.dbotthepony.kstarbound.lua.toJson import ru.dbotthepony.kstarbound.lua.toJsonFromLua -import ru.dbotthepony.kstarbound.math.vector.Vector2iCodec import ru.dbotthepony.kstarbound.util.ManualLazy import ru.dbotthepony.kstarbound.util.asStringOrNull import ru.dbotthepony.kstarbound.world.Direction diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt index b7cae36f..2bef7f2f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt @@ -19,8 +19,8 @@ import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.gl.vertex.GeometryType import ru.dbotthepony.kommons.gson.consumeNull import ru.dbotthepony.kommons.io.readCollection -import ru.dbotthepony.kstarbound.math.vector.readVector2d -import ru.dbotthepony.kstarbound.math.vector.readVector2f +import ru.dbotthepony.kstarbound.io.readVector2d +import ru.dbotthepony.kstarbound.io.readVector2f import ru.dbotthepony.kommons.io.writeCollection import ru.dbotthepony.kommons.io.writeStruct2d import ru.dbotthepony.kommons.io.writeStruct2f