From ebd2dd3ab1420410dc67bdbfd126cb34e24e18a7 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 10 Aug 2024 23:40:26 +0700 Subject: [PATCH] Update imports --- .../kstarbound/defs/PlayerWarping.kt | 2 +- .../defs/actor/player/PlayerBusyState.kt | 6 ++-- .../defs/actor/player/PlayerGamemode.kt | 6 ++-- .../kstarbound/defs/item/ItemDescriptor.kt | 2 +- .../dbotthepony/kstarbound/defs/world/Sky.kt | 2 +- .../ru/dbotthepony/kstarbound/io/Streams.kt | 23 --------------- .../kstarbound/item/ActiveItemStack.kt | 2 +- .../kstarbound/network/Connection.kt | 6 ++-- .../network/syncher/BasicNetworkedElement.kt | 2 +- .../network/syncher/EventCounterElement.kt | 2 +- .../kstarbound/network/syncher/Factories.kt | 29 +++++++------------ .../kstarbound/network/syncher/JsonCodec.kt | 2 +- .../network/syncher/NetworkedList.kt | 2 +- .../network/syncher/NetworkedMap.kt | 2 +- .../network/syncher/NetworkedSignal.kt | 2 +- .../ru/dbotthepony/kstarbound/util/Utils.kt | 2 +- .../dbotthepony/kstarbound/world/Direction.kt | 2 +- .../kstarbound/world/RayDirection.kt | 2 +- .../ru/dbotthepony/kstarbound/world/Sky.kt | 4 +-- .../kstarbound/world/SystemWorld.kt | 2 +- .../world/entities/AbstractEntity.kt | 2 +- .../world/entities/ActorMovementController.kt | 2 +- .../kstarbound/world/entities/Animator.kt | 4 +-- .../world/entities/EffectEmitter.kt | 2 +- .../world/entities/MonsterEntity.kt | 8 ++--- .../world/entities/MovementController.kt | 10 +++---- .../world/entities/StatusController.kt | 6 ++-- .../world/entities/player/HotbarIndex.kt | 2 +- .../world/entities/player/PlayerInventory.kt | 4 +-- .../world/entities/player/TechController.kt | 8 ++--- .../world/entities/tile/WireConnection.kt | 2 +- .../world/entities/tile/WorldObject.kt | 6 ++-- 32 files changed, 64 insertions(+), 94 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt index b9d2236b..0db2ea42 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/PlayerWarping.kt @@ -6,7 +6,7 @@ import com.google.gson.annotations.JsonAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import kotlinx.coroutines.future.await -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readUUID import ru.dbotthepony.kstarbound.io.readVector2d import ru.dbotthepony.kstarbound.io.readVector2f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerBusyState.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerBusyState.kt index d82a2ad1..90f18dec 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerBusyState.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerBusyState.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.defs.actor.player -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kstarbound.json.builder.IStringSerializable enum class PlayerBusyState(override val jsonName: String) : IStringSerializable { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerGamemode.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerGamemode.kt index fe94318a..f1f43a90 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerGamemode.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/actor/player/PlayerGamemode.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.defs.actor.player -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kstarbound.json.builder.IStringSerializable enum class PlayerGamemode(override val jsonName: String) : IStringSerializable { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt index 1b31f715..bdde14f2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemDescriptor.kt @@ -20,7 +20,7 @@ import org.classdump.luna.runtime.ExecutionContext import ru.dbotthepony.kommons.gson.contains import ru.dbotthepony.kommons.gson.get import ru.dbotthepony.kommons.gson.value -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readVarLong import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeVarLong diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Sky.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Sky.kt index 3fcb10a6..68e29999 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Sky.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/Sky.kt @@ -5,7 +5,7 @@ import com.google.gson.JsonObject import it.unimi.dsi.fastutil.ints.IntArrayList import ru.dbotthepony.kommons.gson.contains import ru.dbotthepony.kommons.gson.get -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.math.vector.Vector2i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt index 4bf9a4d1..317a4550 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/Streams.kt @@ -2,8 +2,6 @@ package ru.dbotthepony.kstarbound.io import it.unimi.dsi.fastutil.bytes.ByteArrayList import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream -import ru.dbotthepony.kommons.io.DelegateSyncher -import ru.dbotthepony.kommons.io.StreamCodec import ru.dbotthepony.kommons.io.readBinaryString import ru.dbotthepony.kommons.io.readDouble import ru.dbotthepony.kommons.io.readFloat @@ -263,27 +261,6 @@ val Vector4iCodec = StreamCodec.Impl(DataInputStream::readVector4i, DataOutputSt val Vector4dCodec = StreamCodec.Impl(DataInputStream::readVector4d, DataOutputStream::writeStruct4d) val Vector4fCodec = StreamCodec.Impl(DataInputStream::readVector4f, DataOutputStream::writeStruct4f) -fun DelegateSyncher.vec2i(value: Vector2i, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector2iCodec) -fun DelegateSyncher.vec2d(value: Vector2d, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector2dCodec) -fun DelegateSyncher.vec2f(value: Vector2f, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector2fCodec) - -fun DelegateSyncher.vec3i(value: Vector3i, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector3iCodec) -fun DelegateSyncher.vec3d(value: Vector3d, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector3dCodec) -fun DelegateSyncher.vec3f(value: Vector3f, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector3fCodec) - -fun DelegateSyncher.vec4i(value: Vector4i, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector4iCodec) -fun DelegateSyncher.vec4d(value: Vector4d, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector4dCodec) -fun DelegateSyncher.vec4f(value: Vector4f, setter: DelegateSetter = DelegateSetter.passthrough(), getter: DelegateGetter = DelegateGetter.passthrough()) = Slot( - ListenableDelegate.maskSmart(value, getter, setter), Vector4fCodec) - fun OutputStream.writeEnumStupid(index: Int, isLegacy: Boolean) { if (isLegacy) writeInt(index) else write(index) } diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/item/ActiveItemStack.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/item/ActiveItemStack.kt index 588a6dd7..baa610f6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/item/ActiveItemStack.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/item/ActiveItemStack.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.item import com.google.gson.JsonNull import com.google.gson.JsonObject -import ru.dbotthepony.kommons.io.koptional +import ru.dbotthepony.kstarbound.io.koptional import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/Connection.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/Connection.kt index 0f64bfce..c2bef0a8 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/Connection.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/Connection.kt @@ -13,9 +13,9 @@ import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.cancel import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.koptional +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.koptional import ru.dbotthepony.kstarbound.math.AABBi import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.getValue diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/BasicNetworkedElement.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/BasicNetworkedElement.kt index b8f1d0b3..87aecaf2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/BasicNetworkedElement.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/BasicNetworkedElement.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.network.syncher -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.util.Listenable import ru.dbotthepony.kommons.util.ListenableDelegate import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/EventCounterElement.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/EventCounterElement.kt index ecb943ea..16d3908d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/EventCounterElement.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/EventCounterElement.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.network.syncher -import ru.dbotthepony.kommons.io.UnsignedVarLongCodec +import ru.dbotthepony.kstarbound.io.UnsignedVarLongCodec import java.io.DataInputStream import java.util.function.Consumer 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 e03381b7..c3db383a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/Factories.kt @@ -4,34 +4,25 @@ import com.google.gson.JsonElement import com.google.gson.JsonNull import com.google.gson.JsonObject import com.google.gson.TypeAdapter -import ru.dbotthepony.kommons.io.BinaryStringCodec -import ru.dbotthepony.kommons.io.BooleanValueCodec -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.RGBACodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.UnsignedVarIntCodec -import ru.dbotthepony.kommons.io.UnsignedVarLongCodec -import ru.dbotthepony.kommons.io.VarIntValueCodec -import ru.dbotthepony.kommons.io.VarLongValueCodec -import ru.dbotthepony.kommons.io.koptional -import ru.dbotthepony.kommons.io.map import ru.dbotthepony.kommons.io.readByteArray -import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.io.readVarLong import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeByteArray -import ru.dbotthepony.kommons.io.writeShort -import ru.dbotthepony.kommons.io.writeVarInt import ru.dbotthepony.kommons.io.writeVarLong import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kommons.util.KOptional -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.IntValueCodec +import ru.dbotthepony.kstarbound.io.RGBACodec +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.UnsignedVarIntCodec +import ru.dbotthepony.kstarbound.io.UnsignedVarLongCodec +import ru.dbotthepony.kstarbound.io.VarIntValueCodec +import ru.dbotthepony.kstarbound.io.VarLongValueCodec import ru.dbotthepony.kstarbound.io.Vector2dCodec import ru.dbotthepony.kstarbound.io.Vector2fCodec +import ru.dbotthepony.kstarbound.io.koptional +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kstarbound.io.readAABB import ru.dbotthepony.kstarbound.io.readAABBLegacy import ru.dbotthepony.kstarbound.io.readAABBLegacyOptional @@ -45,6 +36,8 @@ 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.AABB +import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.world.physics.Poly import java.io.DataInputStream import java.io.DataOutputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/JsonCodec.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/JsonCodec.kt index 71f60b7a..c314cbaa 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/JsonCodec.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/JsonCodec.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.network.syncher import com.google.gson.TypeAdapter import it.unimi.dsi.fastutil.io.FastByteArrayInputStream import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readByteArray import ru.dbotthepony.kommons.io.writeByteArray import ru.dbotthepony.kstarbound.json.BinaryJsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedList.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedList.kt index 764bd565..5452ca95 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedList.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedList.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.network.syncher import it.unimi.dsi.fastutil.io.FastByteArrayInputStream import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readByteArray import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.io.writeVarInt diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedMap.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedMap.kt index 504e98e2..c3c284b9 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedMap.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedMap.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.network.syncher import ru.dbotthepony.kommons.collect.ListenableMap -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.io.writeVarInt import ru.dbotthepony.kommons.util.KOptional diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedSignal.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedSignal.kt index 904dbff0..3c0680f6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedSignal.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/network/syncher/NetworkedSignal.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.network.syncher -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.io.writeVarInt import ru.dbotthepony.kommons.util.KOptional diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt index 53de3471..0be722f0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Utils.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.util import com.google.gson.JsonElement -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.json.builder.IStringSerializable import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Direction.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Direction.kt index 34e65250..8e854bc4 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Direction.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Direction.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.json.builder.IStringSerializable diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/RayDirection.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/RayDirection.kt index 6b0b9a31..69792cb3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/RayDirection.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/RayDirection.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.json.builder.IStringSerializable diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Sky.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Sky.kt index d40f6105..4e45e928 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Sky.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Sky.kt @@ -1,7 +1,6 @@ package ru.dbotthepony.kstarbound.world -import ru.dbotthepony.kommons.io.VarIntValueCodec -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kommons.math.linearInterpolation import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue @@ -12,6 +11,7 @@ import ru.dbotthepony.kstarbound.defs.world.SkyGlobalConfig import ru.dbotthepony.kstarbound.defs.world.SkyParameters import ru.dbotthepony.kstarbound.defs.world.SkyType import ru.dbotthepony.kstarbound.defs.world.WarpPhase +import ru.dbotthepony.kstarbound.io.VarIntValueCodec import ru.dbotthepony.kstarbound.network.syncher.MasterElement import ru.dbotthepony.kstarbound.network.syncher.NetworkedGroup import ru.dbotthepony.kstarbound.network.syncher.networkedBoolean diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/SystemWorld.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/SystemWorld.kt index 795fe9e5..48a31335 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/SystemWorld.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/SystemWorld.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.world import com.google.gson.JsonObject -import ru.dbotthepony.kommons.io.koptional +import ru.dbotthepony.kstarbound.io.koptional import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/AbstractEntity.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/AbstractEntity.kt index 2b6e5afb..f0a1eb16 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/AbstractEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/AbstractEntity.kt @@ -7,7 +7,6 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayList import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import it.unimi.dsi.fastutil.objects.ObjectArrayList import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.io.nullable import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.client.StarboundClient @@ -20,6 +19,7 @@ import ru.dbotthepony.kstarbound.defs.DamageType import ru.dbotthepony.kstarbound.defs.EntityDamageTeam import ru.dbotthepony.kstarbound.defs.EntityType import ru.dbotthepony.kstarbound.defs.HitType +import ru.dbotthepony.kstarbound.io.nullable import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.network.packets.DamageNotificationPacket diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt index 016d48eb..b80c38d3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/ActorMovementController.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.kstarbound.world.entities -import ru.dbotthepony.kommons.io.nullable import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.kstarbound.Globals @@ -9,6 +8,7 @@ import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.defs.ActorMovementParameters import ru.dbotthepony.kstarbound.defs.JumpProfile import ru.dbotthepony.kstarbound.defs.MovementParameters +import ru.dbotthepony.kstarbound.io.nullable import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.network.syncher.networkedBoolean import ru.dbotthepony.kstarbound.network.syncher.networkedData diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/Animator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/Animator.kt index a7cf64c8..48be6fc1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/Animator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/Animator.kt @@ -9,8 +9,8 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.kommons.gson.contains import ru.dbotthepony.kommons.gson.getArray import ru.dbotthepony.kommons.gson.set -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kstarbound.math.matrix.Matrix3d import ru.dbotthepony.kstarbound.math.matrix.Matrix3f diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/EffectEmitter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/EffectEmitter.kt index ed90f611..e8cf89cb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/EffectEmitter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/EffectEmitter.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.world.entities import com.google.gson.JsonArray import com.google.gson.JsonElement import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.kstarbound.Starbound diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MonsterEntity.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MonsterEntity.kt index 8fd41088..c01ecd4f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MonsterEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MonsterEntity.kt @@ -12,10 +12,7 @@ import org.classdump.luna.ByteString import org.classdump.luna.Table import ru.dbotthepony.kommons.gson.get import ru.dbotthepony.kommons.gson.set -import ru.dbotthepony.kommons.io.DoubleValueCodec -import ru.dbotthepony.kommons.io.FloatValueCodec -import ru.dbotthepony.kommons.io.map -import ru.dbotthepony.kommons.io.nullable +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue @@ -39,6 +36,9 @@ import ru.dbotthepony.kstarbound.defs.actor.StatusControllerConfig import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition import ru.dbotthepony.kstarbound.defs.monster.MonsterVariant import ru.dbotthepony.kstarbound.fromJsonFast +import ru.dbotthepony.kstarbound.io.DoubleValueCodec +import ru.dbotthepony.kstarbound.io.FloatValueCodec +import ru.dbotthepony.kstarbound.io.nullable import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.lua.LuaEnvironment import ru.dbotthepony.kstarbound.lua.LuaMessageHandlerComponent diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MovementController.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MovementController.kt index 0b05c751..048b4bff 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MovementController.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/MovementController.kt @@ -1,11 +1,9 @@ package ru.dbotthepony.kstarbound.world.entities import it.unimi.dsi.fastutil.objects.ObjectArrayList -import ru.dbotthepony.kommons.io.DoubleValueCodec -import ru.dbotthepony.kommons.io.FloatValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.koptional -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.koptional +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.Listenable @@ -17,6 +15,8 @@ import ru.dbotthepony.kstarbound.Globals import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.MovementParameters import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition +import ru.dbotthepony.kstarbound.io.DoubleValueCodec +import ru.dbotthepony.kstarbound.io.FloatValueCodec import ru.dbotthepony.kstarbound.math.Interpolator import ru.dbotthepony.kstarbound.network.syncher.NetworkedGroup import ru.dbotthepony.kstarbound.network.syncher.networkedBoolean diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/StatusController.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/StatusController.kt index 9f1a6ebf..d8b32784 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/StatusController.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/StatusController.kt @@ -17,9 +17,8 @@ import ru.dbotthepony.kommons.collect.ListenableMap import ru.dbotthepony.kommons.collect.collect import ru.dbotthepony.kommons.collect.map import ru.dbotthepony.kommons.gson.set -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.nullable +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readKOptional import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeKOptional @@ -40,6 +39,7 @@ import ru.dbotthepony.kstarbound.defs.actor.StatModifier import ru.dbotthepony.kstarbound.defs.actor.StatModifierType import ru.dbotthepony.kstarbound.defs.actor.StatusControllerConfig import ru.dbotthepony.kstarbound.fromJsonFast +import ru.dbotthepony.kstarbound.io.nullable import ru.dbotthepony.kstarbound.io.readInternedString import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.lua.LuaEnvironment diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/HotbarIndex.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/HotbarIndex.kt index 8d12b1ed..7606f719 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/HotbarIndex.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/HotbarIndex.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.entities.player -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kstarbound.defs.actor.EssentialSlot import ru.dbotthepony.kstarbound.item.ItemStack import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/PlayerInventory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/PlayerInventory.kt index 522de3b1..bee10cb2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/PlayerInventory.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/PlayerInventory.kt @@ -3,8 +3,6 @@ package ru.dbotthepony.kstarbound.world.entities.player import com.google.common.collect.ImmutableMap import ru.dbotthepony.kommons.arrays.Object2DArray import ru.dbotthepony.kommons.guava.immutableList -import ru.dbotthepony.kommons.io.LongValueCodec -import ru.dbotthepony.kommons.io.UnsignedVarLongCodec import ru.dbotthepony.kommons.io.readKOptional import ru.dbotthepony.kommons.io.writeKOptional import ru.dbotthepony.kommons.util.KOptional @@ -14,6 +12,8 @@ import ru.dbotthepony.kstarbound.Globals import ru.dbotthepony.kstarbound.defs.actor.EquipmentSlot import ru.dbotthepony.kstarbound.defs.actor.EssentialSlot import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor +import ru.dbotthepony.kstarbound.io.LongValueCodec +import ru.dbotthepony.kstarbound.io.UnsignedVarLongCodec import ru.dbotthepony.kstarbound.item.ItemStack import ru.dbotthepony.kstarbound.network.syncher.NetworkedGroup import ru.dbotthepony.kstarbound.network.syncher.legacyCodec diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/TechController.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/TechController.kt index d0f49776..d359f17e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/TechController.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/player/TechController.kt @@ -1,9 +1,9 @@ package ru.dbotthepony.kstarbound.world.entities.player -import ru.dbotthepony.kommons.io.IntValueCodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.koptional -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.IntValueCodec +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.koptional +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kommons.io.readKOptional import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kommons.io.writeKOptional diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WireConnection.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WireConnection.kt index af4d2930..75f2f0c2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WireConnection.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/tile/WireConnection.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.world.entities.tile -import ru.dbotthepony.kommons.io.StreamCodec +import ru.dbotthepony.kstarbound.io.StreamCodec import ru.dbotthepony.kommons.io.readSignedVarInt import ru.dbotthepony.kommons.io.readVarInt import ru.dbotthepony.kommons.io.writeSignedVarInt 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 f073007a..d6cbead4 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 @@ -26,9 +26,8 @@ import ru.dbotthepony.kstarbound.defs.`object`.ObjectOrientation import ru.dbotthepony.kommons.gson.get import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.kommons.guava.immutableSet -import ru.dbotthepony.kommons.io.RGBACodec -import ru.dbotthepony.kommons.io.StreamCodec -import ru.dbotthepony.kommons.io.map +import ru.dbotthepony.kstarbound.io.StreamCodec +import ru.dbotthepony.kstarbound.io.map import ru.dbotthepony.kommons.io.writeBinaryString import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kommons.util.getValue @@ -46,6 +45,7 @@ import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor 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.RGBACodec import ru.dbotthepony.kstarbound.io.Vector2iCodec import ru.dbotthepony.kstarbound.json.JsonPath import ru.dbotthepony.kstarbound.json.jsonArrayOf