From 8af66ff359169e39ce6c724b147d63811b6a7635 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 10 Nov 2023 22:51:32 +0700 Subject: [PATCH] move json out of io package --- .../kotlin/ru/dbotthepony/kstarbound/Main.kt | 2 +- .../ru/dbotthepony/kstarbound/Registry.kt | 2 +- .../ru/dbotthepony/kstarbound/Starbound.kt | 50 +++++++++---------- .../kstarbound/defs/BaseMovementParameters.kt | 4 +- .../dbotthepony/kstarbound/defs/DamageType.kt | 2 +- .../dbotthepony/kstarbound/defs/Drawable.kt | 4 +- .../kstarbound/defs/IScriptable.kt | 4 +- .../kstarbound/defs/IThingWithDescription.kt | 2 +- .../kstarbound/defs/ItemReference.kt | 6 +-- .../kstarbound/defs/JsonFunction.kt | 4 +- .../kstarbound/defs/JsonReference.kt | 4 +- .../kstarbound/defs/JumpProfile.kt | 2 +- .../kstarbound/defs/MovementParameters.kt | 4 +- .../ru/dbotthepony/kstarbound/defs/Species.kt | 2 +- .../kstarbound/defs/StatModifier.kt | 2 +- .../kstarbound/defs/StatusEffectDefinition.kt | 2 +- .../kstarbound/defs/TouchDamage.kt | 2 +- .../defs/animation/AnimationDefinition.kt | 2 +- .../kstarbound/defs/image/Image.kt | 2 +- .../kstarbound/defs/image/SpriteReference.kt | 2 +- .../kstarbound/defs/item/IInventoryIcon.kt | 2 +- .../defs/item/ILeveledStatusEffect.kt | 4 +- .../kstarbound/defs/item/InventoryIcon.kt | 4 +- .../kstarbound/defs/item/ItemRarity.kt | 2 +- .../defs/item/TreasurePoolDefinition.kt | 4 +- .../defs/item/api/IArmorItemDefinition.kt | 6 +-- .../defs/item/api/IItemDefinition.kt | 2 +- .../defs/item/impl/ArmorItemDefinition.kt | 4 +- .../defs/item/impl/CurrencyItemDefinition.kt | 6 +-- .../defs/item/impl/FlashlightDefinition.kt | 4 +- .../defs/item/impl/HarvestingToolPrototype.kt | 4 +- .../defs/item/impl/ItemDefinition.kt | 4 +- .../defs/item/impl/LiquidItemDefinition.kt | 8 +-- .../defs/item/impl/MaterialItemDefinition.kt | 8 +-- .../defs/monster/MonsterSkillDefinition.kt | 2 +- .../defs/monster/MonsterTypeDefinition.kt | 4 +- .../kstarbound/defs/npc/NpcTypeDefinition.kt | 2 +- .../kstarbound/defs/npc/TenantDefinition.kt | 2 +- .../kstarbound/defs/object/DamageTeam.kt | 2 +- .../defs/object/ObjectDefinition.kt | 8 +-- .../defs/object/ObjectOrientation.kt | 8 +-- .../defs/object/ParticleEmissionEntry.kt | 2 +- .../defs/particle/IParticleConfig.kt | 2 +- .../defs/particle/IParticleVariance.kt | 2 +- .../defs/particle/ParticleConfig.kt | 2 +- .../defs/particle/ParticleCreator.kt | 2 +- .../defs/particle/ParticleDefinition.kt | 2 +- .../defs/particle/ParticleEmitter.kt | 2 +- .../defs/particle/ParticleVariance.kt | 2 +- .../kstarbound/defs/player/BagFilterConfig.kt | 2 +- .../defs/player/BlueprintLearnList.kt | 2 +- .../defs/player/CompanionsConfig.kt | 2 +- .../defs/player/DeploymentConfig.kt | 2 +- .../kstarbound/defs/player/InventoryConfig.kt | 2 +- .../defs/player/MatterManipulatorConfig.kt | 2 +- .../defs/player/PlayerDefinition.kt | 2 +- .../defs/player/PlayerMovementModifiers.kt | 2 +- .../defs/player/PlayerMovementParameters.kt | 6 +-- .../defs/player/RecipeDefinition.kt | 2 +- .../kstarbound/defs/player/SplashConfig.kt | 2 +- .../defs/player/StatusControllerSettings.kt | 2 +- .../kstarbound/defs/player/TechDefinition.kt | 2 +- .../defs/projectile/ProjectileDefinition.kt | 2 +- .../kstarbound/defs/quest/QuestTemplate.kt | 2 +- .../kstarbound/defs/tile/LiquidDefinition.kt | 2 +- .../kstarbound/defs/tile/MaterialModifier.kt | 4 +- .../kstarbound/defs/tile/RenderParameters.kt | 4 +- .../kstarbound/defs/tile/RenderTemplate.kt | 2 +- .../kstarbound/defs/tile/TileDamageConfig.kt | 2 +- .../kstarbound/defs/tile/TileDefinition.kt | 6 +-- .../dbotthepony/kstarbound/io/StarboundPak.kt | 2 +- .../kstarbound/{io => }/json/AABBJson.kt | 2 +- .../{io => }/json/BinaryJsonReader.kt | 2 +- .../kstarbound/{io => }/json/ColorJson.kt | 2 +- .../json/ContextualizedTypeAdapter.kt | 2 +- .../{io => }/json/EitherTypeAdapter.kt | 2 +- .../kstarbound/{io => }/json/Ext.kt | 2 +- .../json/FastutilTypeAdapterFactory.kt | 2 +- .../json/InternedJsonElementAdapter.kt | 2 +- .../{io => }/json/JsonArraySpliterator.kt | 2 +- .../{io => }/json/KOptionalTypeAdapter.kt | 2 +- .../{io => }/json/KotlinAdapters.kt | 2 +- .../{io => }/json/NothingAdapter.kt | 2 +- .../{io => }/json/OneOfTypeAdapter.kt | 2 +- .../kstarbound/{io => }/json/VectorJson.kt | 2 +- .../kstarbound/{io => }/json/VersionedJson.kt | 2 +- .../{io => }/json/builder/Annotations.kt | 2 +- .../{io => }/json/builder/BuilderAdapter.kt | 2 +- .../{io => }/json/builder/EnumAdapter.kt | 2 +- .../{io => }/json/builder/FactoryAdapter.kt | 6 +-- .../{io => }/json/builder/IJsonHolder.kt | 2 +- .../json/builder/INativeJsonHolder.kt | 2 +- .../{io => }/json/builder/Properties.kt | 2 +- .../json/factory/ArrayListAdapterFactory.kt | 2 +- .../json/factory/ArrayListTypeAdapter.kt | 2 +- .../factory/ImmutableArrayMapTypeAdapter.kt | 2 +- .../ImmutableCollectionAdapterFactory.kt | 2 +- .../json/factory/ImmutableListTypeAdapter.kt | 2 +- .../json/factory/ImmutableMapTypeAdapter.kt | 2 +- .../json/factory/ImmutableSetTypeAdapter.kt | 2 +- .../json/factory/PairAdapterFactory.kt | 4 +- .../dbotthepony/kstarbound/lua/Functions.kt | 2 +- .../ru/dbotthepony/kstarbound/math/LineF.kt | 2 +- .../kstarbound/player/QuestDescriptor.kt | 2 +- .../dbotthepony/kstarbound/tools/Sbon2Json.kt | 2 +- .../ru/dbotthepony/kstarbound/util/Either.kt | 2 +- .../ru/dbotthepony/kstarbound/util/Ext.kt | 2 +- .../dbotthepony/kstarbound/util/ItemStack.kt | 2 +- .../kstarbound/world/physics/Poly.kt | 4 +- 109 files changed, 175 insertions(+), 175 deletions(-) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/AABBJson.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/BinaryJsonReader.kt (99%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/ColorJson.kt (98%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/ContextualizedTypeAdapter.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/EitherTypeAdapter.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/Ext.kt (99%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/FastutilTypeAdapterFactory.kt (98%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/InternedJsonElementAdapter.kt (98%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/JsonArraySpliterator.kt (96%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/KOptionalTypeAdapter.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/KotlinAdapters.kt (94%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/NothingAdapter.kt (88%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/OneOfTypeAdapter.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/VectorJson.kt (98%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/VersionedJson.kt (89%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/Annotations.kt (98%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/BuilderAdapter.kt (99%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/EnumAdapter.kt (99%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/FactoryAdapter.kt (99%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/IJsonHolder.kt (91%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/INativeJsonHolder.kt (89%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/builder/Properties.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ArrayListAdapterFactory.kt (92%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ArrayListTypeAdapter.kt (95%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ImmutableArrayMapTypeAdapter.kt (96%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ImmutableCollectionAdapterFactory.kt (97%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ImmutableListTypeAdapter.kt (96%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ImmutableMapTypeAdapter.kt (96%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/ImmutableSetTypeAdapter.kt (96%) rename src/main/kotlin/ru/dbotthepony/kstarbound/{io => }/json/factory/PairAdapterFactory.kt (96%) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt index 4d629d96..928c794c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.io.BTreeDB import ru.dbotthepony.kstarbound.player.Avatar import ru.dbotthepony.kstarbound.world.entities.ItemEntity -import ru.dbotthepony.kstarbound.io.json.VersionedJson +import ru.dbotthepony.kstarbound.json.VersionedJson import ru.dbotthepony.kstarbound.io.readVarInt import ru.dbotthepony.kstarbound.util.AssetPathStack import ru.dbotthepony.kstarbound.world.api.MutableCell diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt index f922f339..65d2d6ed 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt @@ -21,7 +21,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMaps import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.api.IStarboundFile -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.util.Either import java.lang.reflect.ParameterizedType import java.util.concurrent.locks.ReentrantLock diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index a9aa3969..579ad95d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -23,29 +23,29 @@ import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList import ru.dbotthepony.kstarbound.defs.player.PlayerDefinition import ru.dbotthepony.kstarbound.util.JsonArrayCollector import ru.dbotthepony.kstarbound.io.* -import ru.dbotthepony.kstarbound.io.json.AABBTypeAdapter -import ru.dbotthepony.kstarbound.io.json.AABBiTypeAdapter -import ru.dbotthepony.kstarbound.io.json.ColorTypeAdapter -import ru.dbotthepony.kstarbound.io.json.EitherTypeAdapter -import ru.dbotthepony.kstarbound.io.json.FastutilTypeAdapterFactory -import ru.dbotthepony.kstarbound.io.json.InternedJsonElementAdapter -import ru.dbotthepony.kstarbound.io.json.InternedStringAdapter -import ru.dbotthepony.kstarbound.io.json.KOptionalTypeAdapter -import ru.dbotthepony.kstarbound.io.json.LongRangeAdapter -import ru.dbotthepony.kstarbound.io.json.NothingAdapter -import ru.dbotthepony.kstarbound.io.json.OneOfTypeAdapter -import ru.dbotthepony.kstarbound.io.json.Vector2dTypeAdapter -import ru.dbotthepony.kstarbound.io.json.Vector2fTypeAdapter -import ru.dbotthepony.kstarbound.io.json.Vector2iTypeAdapter -import ru.dbotthepony.kstarbound.io.json.Vector4dTypeAdapter -import ru.dbotthepony.kstarbound.io.json.Vector4iTypeAdapter -import ru.dbotthepony.kstarbound.io.json.builder.EnumAdapter -import ru.dbotthepony.kstarbound.io.json.builder.BuilderAdapter -import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementationTypeFactory -import ru.dbotthepony.kstarbound.io.json.factory.ArrayListAdapterFactory -import ru.dbotthepony.kstarbound.io.json.factory.ImmutableCollectionAdapterFactory -import ru.dbotthepony.kstarbound.io.json.factory.PairAdapterFactory +import ru.dbotthepony.kstarbound.json.AABBTypeAdapter +import ru.dbotthepony.kstarbound.json.AABBiTypeAdapter +import ru.dbotthepony.kstarbound.json.ColorTypeAdapter +import ru.dbotthepony.kstarbound.json.EitherTypeAdapter +import ru.dbotthepony.kstarbound.json.FastutilTypeAdapterFactory +import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter +import ru.dbotthepony.kstarbound.json.InternedStringAdapter +import ru.dbotthepony.kstarbound.json.KOptionalTypeAdapter +import ru.dbotthepony.kstarbound.json.LongRangeAdapter +import ru.dbotthepony.kstarbound.json.NothingAdapter +import ru.dbotthepony.kstarbound.json.OneOfTypeAdapter +import ru.dbotthepony.kstarbound.json.Vector2dTypeAdapter +import ru.dbotthepony.kstarbound.json.Vector2fTypeAdapter +import ru.dbotthepony.kstarbound.json.Vector2iTypeAdapter +import ru.dbotthepony.kstarbound.json.Vector4dTypeAdapter +import ru.dbotthepony.kstarbound.json.Vector4iTypeAdapter +import ru.dbotthepony.kstarbound.json.builder.EnumAdapter +import ru.dbotthepony.kstarbound.json.builder.BuilderAdapter +import ru.dbotthepony.kstarbound.json.builder.FactoryAdapter +import ru.dbotthepony.kstarbound.json.builder.JsonImplementationTypeFactory +import ru.dbotthepony.kstarbound.json.factory.ArrayListAdapterFactory +import ru.dbotthepony.kstarbound.json.factory.ImmutableCollectionAdapterFactory +import ru.dbotthepony.kstarbound.json.factory.PairAdapterFactory import ru.dbotthepony.kstarbound.math.* import ru.dbotthepony.kstarbound.util.ITimeSource import ru.dbotthepony.kstarbound.util.ItemStack @@ -152,8 +152,8 @@ object Starbound : ISBFileLocator { registerTypeAdapter(StatModifier::Adapter) // математические классы - registerTypeAdapter(AABBTypeAdapter) - registerTypeAdapter(AABBiTypeAdapter) + registerTypeAdapter(ru.dbotthepony.kstarbound.json.AABBTypeAdapter) + registerTypeAdapter(ru.dbotthepony.kstarbound.json.AABBiTypeAdapter) registerTypeAdapter(Vector2dTypeAdapter) registerTypeAdapter(Vector2fTypeAdapter) registerTypeAdapter(Vector2iTypeAdapter) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/BaseMovementParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/BaseMovementParameters.kt index dfc28256..f6144b97 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/BaseMovementParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/BaseMovementParameters.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableSet -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation import ru.dbotthepony.kstarbound.util.KOptional @JsonImplementation(BaseMovementParameters.Impl::class) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/DamageType.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/DamageType.kt index eb466a62..2db8c2ae 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/DamageType.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/DamageType.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.builder.IStringSerializable +import ru.dbotthepony.kstarbound.json.builder.IStringSerializable enum class DamageType(private vararg val aliases: String) : IStringSerializable { NORMAL, diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt index 877180f9..adb99308 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt @@ -13,8 +13,8 @@ import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.gl.vertex.GeometryType import ru.dbotthepony.kstarbound.client.render.IGeometryLayer import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.math.LineF import ru.dbotthepony.kstarbound.util.Either import ru.dbotthepony.kstarbound.util.contains diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IScriptable.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IScriptable.kt index d01117f7..b21202a7 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IScriptable.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IScriptable.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableList -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation @JsonImplementation(IScriptable.Impl::class) interface IScriptable { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IThingWithDescription.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IThingWithDescription.kt index 4334f466..4c0c19ea 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IThingWithDescription.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/IThingWithDescription.kt @@ -9,7 +9,7 @@ import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation @JsonImplementation(ThingDescription::class) interface IThingWithDescription { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt index 3e368ce1..6777df37 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt @@ -11,9 +11,9 @@ import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.builder.FactoryAdapter +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.util.ItemStack /** diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt index 6429085a..ea053dd0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt @@ -10,8 +10,8 @@ import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.builder.EnumAdapter -import ru.dbotthepony.kstarbound.io.json.Vector2dTypeAdapter +import ru.dbotthepony.kstarbound.json.builder.EnumAdapter +import ru.dbotthepony.kstarbound.json.Vector2dTypeAdapter import ru.dbotthepony.kvector.util.linearInterpolation import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonReference.kt index a0efe8bd..f107b6d9 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonReference.kt @@ -13,8 +13,8 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Starbound -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.value +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.value import ru.dbotthepony.kstarbound.util.AssetPathStack sealed class JsonReference(val path: String?, val fullPath: String?) { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JumpProfile.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JumpProfile.kt index bf222697..7042a6ae 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JumpProfile.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/JumpProfile.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.KOptional @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt index 24e6dd8c..b0edcbf4 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kstarbound.util.KOptional import ru.dbotthepony.kstarbound.world.physics.Poly diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt index 61f0d7cf..90dd6dbe 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class Species( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatModifier.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatModifier.kt index bcf61126..6e5ba5df 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatModifier.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatModifier.kt @@ -7,7 +7,7 @@ import com.google.gson.JsonSyntaxException import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.util.contains import ru.dbotthepony.kstarbound.util.get diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt index 5f80b1ff..6bc81ebf 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class StatusEffectDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/TouchDamage.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/TouchDamage.kt index bd283d1a..9e5a7549 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/TouchDamage.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/TouchDamage.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.Vector2d @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt index 745b2aac..64003000 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt @@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import ru.dbotthepony.kstarbound.defs.image.SpriteReference import ru.dbotthepony.kstarbound.defs.particle.ParticleEmitter -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.Either import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt index 5584c09f..47105860 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt @@ -29,7 +29,7 @@ import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.api.IStarboundFile import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.gl.GLTexture2D -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.util.contains import ru.dbotthepony.kstarbound.util.get import ru.dbotthepony.kstarbound.util.getObject diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt index 013dc147..1ff26e29 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt @@ -6,7 +6,7 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.AssetPath -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.util.AssetPathStack import ru.dbotthepony.kstarbound.util.SBPattern diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IInventoryIcon.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IInventoryIcon.kt index 678a88dd..211c11a8 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IInventoryIcon.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IInventoryIcon.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.item import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation @JsonImplementation(InventoryIcon::class) interface IInventoryIcon { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledStatusEffect.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledStatusEffect.kt index 46745666..7545e177 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledStatusEffect.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledStatusEffect.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.item -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation @JsonImplementation(LeveledStatusEffect::class) interface ILeveledStatusEffect { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/InventoryIcon.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/InventoryIcon.kt index 07b13fdf..976cbd6c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/InventoryIcon.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/InventoryIcon.kt @@ -8,8 +8,8 @@ import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.FactoryAdapter +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.AssetPathStack data class InventoryIcon( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemRarity.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemRarity.kt index 1e889c3a..9a3fa702 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemRarity.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemRarity.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.item import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.builder.IStringSerializable +import ru.dbotthepony.kstarbound.json.builder.IStringSerializable enum class ItemRarity(val canonical: String) : IStringSerializable { COMMON("Common"), diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt index b444416f..4bdccc15 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt @@ -14,8 +14,8 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.ItemReference -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.stream +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.stream import ru.dbotthepony.kstarbound.util.Either import ru.dbotthepony.kstarbound.util.ItemStack import ru.dbotthepony.kstarbound.util.WriteOnce diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt index b40296c9..0be07030 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt @@ -8,9 +8,9 @@ import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.FactoryAdapter +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation interface IArmorItemDefinition : ILeveledItemDefinition, IScriptableItemDefinition { /** diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt index 6bf53e90..54bdf69b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.kstarbound.defs.IThingWithDescription import ru.dbotthepony.kstarbound.defs.item.IInventoryIcon import ru.dbotthepony.kstarbound.defs.item.ItemRarity import ru.dbotthepony.kstarbound.defs.item.impl.ItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation @JsonImplementation(ItemDefinition::class) interface IItemDefinition : IThingWithDescription { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemDefinition.kt index f7503303..1f2eee10 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemDefinition.kt @@ -5,8 +5,8 @@ import ru.dbotthepony.kstarbound.defs.IScriptable import ru.dbotthepony.kstarbound.defs.item.api.IArmorItemDefinition import ru.dbotthepony.kstarbound.defs.item.LeveledStatusEffect import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat @JsonFactory(logMisses = false) data class ArmorItemDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemDefinition.kt index 2a8d2965..fe5a4e6e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemDefinition.kt @@ -2,9 +2,9 @@ package ru.dbotthepony.kstarbound.defs.item.impl import ru.dbotthepony.kstarbound.defs.item.api.ICurrencyItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonBuilder +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat @JsonFactory data class CurrencyItemDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightDefinition.kt index fba1cf36..0c175d34 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightDefinition.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.kstarbound.defs.item.impl import ru.dbotthepony.kstarbound.defs.item.api.IFlashlightDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt index 359ad203..cb6554ca 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt @@ -3,8 +3,8 @@ package ru.dbotthepony.kstarbound.defs.item.impl import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.item.api.IHarvestingToolDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kvector.vector.Vector2d @JsonFactory(logMisses = false) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt index 3831ec26..cbedd824 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt @@ -8,8 +8,8 @@ import ru.dbotthepony.kstarbound.defs.ThingDescription import ru.dbotthepony.kstarbound.defs.item.IInventoryIcon import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.ItemRarity -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat @JsonFactory(logMisses = false) data class ItemDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt index 0f65ad44..079a54f0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt @@ -2,10 +2,10 @@ package ru.dbotthepony.kstarbound.defs.item.impl import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem -import ru.dbotthepony.kstarbound.io.json.builder.JsonAlias -import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonAlias +import ru.dbotthepony.kstarbound.json.builder.JsonBuilder +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kstarbound.util.Either @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt index 7a207d9d..a74e2fd2 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt @@ -3,10 +3,10 @@ package ru.dbotthepony.kstarbound.defs.item.impl import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition import ru.dbotthepony.kstarbound.defs.item.api.ILiquidItem import ru.dbotthepony.kstarbound.defs.item.api.IMaterialItem -import ru.dbotthepony.kstarbound.io.json.builder.JsonAlias -import ru.dbotthepony.kstarbound.io.json.builder.JsonBuilder -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonAlias +import ru.dbotthepony.kstarbound.json.builder.JsonBuilder +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kstarbound.util.Either @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterSkillDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterSkillDefinition.kt index 7a913d30..7dbe9c65 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterSkillDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterSkillDefinition.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.monster import com.google.common.collect.ImmutableMap import com.google.gson.JsonElement import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class MonsterSkillDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt index 7cef7bb0..61a8d267 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt @@ -10,8 +10,8 @@ import ru.dbotthepony.kstarbound.defs.IThingWithDescription import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kstarbound.util.Either @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/NpcTypeDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/NpcTypeDefinition.kt index f70e7533..d1a59138 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/NpcTypeDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/NpcTypeDefinition.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.npc -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class NpcTypeDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/TenantDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/TenantDefinition.kt index 4687ae20..3f1c6820 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/TenantDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/TenantDefinition.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.npc import com.google.common.collect.ImmutableMap import it.unimi.dsi.fastutil.objects.Object2IntMap -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import java.util.function.Predicate @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/DamageTeam.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/DamageTeam.kt index 10b8699b..dbb000f6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/DamageTeam.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/DamageTeam.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.`object` import ru.dbotthepony.kstarbound.defs.TeamType -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class DamageTeam( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt index 3ae0defa..46ebb27c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt @@ -18,10 +18,10 @@ import ru.dbotthepony.kstarbound.defs.JsonReference import ru.dbotthepony.kstarbound.defs.StatModifier import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition import ru.dbotthepony.kstarbound.defs.tile.TileDamageConfig -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.listAdapter -import ru.dbotthepony.kstarbound.io.json.stream +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.listAdapter +import ru.dbotthepony.kstarbound.json.stream import ru.dbotthepony.kstarbound.math.PeriodicFunction import ru.dbotthepony.kstarbound.util.Either import ru.dbotthepony.kstarbound.util.contains diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt index 22af88c8..a2e55220 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt @@ -15,10 +15,10 @@ import ru.dbotthepony.kstarbound.client.render.RenderLayer import ru.dbotthepony.kstarbound.defs.Drawable import ru.dbotthepony.kstarbound.defs.JsonReference import ru.dbotthepony.kstarbound.defs.tile.BuiltinMetaMaterials -import ru.dbotthepony.kstarbound.io.json.clear -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.listAdapter -import ru.dbotthepony.kstarbound.io.json.setAdapter +import ru.dbotthepony.kstarbound.json.clear +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.listAdapter +import ru.dbotthepony.kstarbound.json.setAdapter import ru.dbotthepony.kstarbound.util.contains import ru.dbotthepony.kstarbound.util.get import ru.dbotthepony.kstarbound.util.set diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ParticleEmissionEntry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ParticleEmissionEntry.kt index 0a67d13c..68001e70 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ParticleEmissionEntry.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ParticleEmissionEntry.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.`object` -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class ParticleEmissionEntry( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt index a80dcb93..d6614dce 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.particle import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation import ru.dbotthepony.kstarbound.util.VirtualProperty import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleVariance.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleVariance.kt index 6b1b2cfb..ea69aa6d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleVariance.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleVariance.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.particle import com.google.common.collect.ImmutableList -import ru.dbotthepony.kstarbound.io.json.builder.JsonImplementation +import ru.dbotthepony.kstarbound.json.builder.JsonImplementation import ru.dbotthepony.kstarbound.util.VirtualProperty import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt index a60bc6a0..c46aa72b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt @@ -4,7 +4,7 @@ import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.animation.DestructionAction import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt index 516abf61..c1db3671 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.particle import ru.dbotthepony.kstarbound.Registry -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.Either @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleDefinition.kt index b93bbced..e55a3999 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleDefinition.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.particle -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class ParticleDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt index a7f67692..91314bf7 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.particle import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.animation.DestructionAction -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleVariance.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleVariance.kt index d68ea9ba..8a0f3671 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleVariance.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleVariance.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.particle -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d import ru.dbotthepony.kvector.vector.Vector4d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt index 66320fdc..3601d781 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableSet -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.ItemStack import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt index c3fbb882..d0f298eb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt @@ -12,7 +12,7 @@ import com.google.gson.stream.JsonWriter import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory class BlueprintLearnList private constructor(private val tiers: Int2ObjectArrayMap>) { constructor(tiers: Map>) : this(Int2ObjectArrayMap>().also { for ((k, v) in tiers.entries) it.put(k, ImmutableList.copyOf(v)) }) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt index 323ca27c..7b8a707b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableMap import ru.dbotthepony.kstarbound.defs.AssetPath import ru.dbotthepony.kstarbound.defs.IScriptable import ru.dbotthepony.kstarbound.util.SBPattern -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class CompanionsConfig( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt index 769ea0c6..ade683db 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.AssetPath import ru.dbotthepony.kstarbound.defs.IScriptable import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class DeploymentConfig( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt index 1a32d35b..84bd48e1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableMap -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.WriteOnce @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt index f6fa5439..c67c4ef1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableList -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.Vector2d @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt index bab74ab6..4af53605 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.kstarbound.defs.Species import ru.dbotthepony.kstarbound.util.SBPattern import ru.dbotthepony.kstarbound.defs.animation.AnimationDefinition import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.util2d.AABB import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt index b7b52deb..8a0a5c6e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.player -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory class PlayerMovementModifiers( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt index 90b2173f..6d2d9848 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt @@ -2,9 +2,9 @@ package ru.dbotthepony.kstarbound.defs.player import ru.dbotthepony.kstarbound.defs.BaseMovementParameters import ru.dbotthepony.kstarbound.defs.JumpProfile -import ru.dbotthepony.kstarbound.io.json.builder.JsonAlias -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonAlias +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat import ru.dbotthepony.kstarbound.util.KOptional import ru.dbotthepony.kstarbound.world.physics.Poly diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt index a42fb1f3..0110f4f6 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt @@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableSet import ru.dbotthepony.kstarbound.defs.ItemReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class RecipeDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt index 62e12860..20458e41 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.player -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.RGBAColor import ru.dbotthepony.kvector.vector.Vector2d diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt index c452a0f0..0dd7d39d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.Vector2d @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt index 3a3e6d46..af7032dd 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.player import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.AssetPath import ru.dbotthepony.kstarbound.defs.IScriptable -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class TechDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/ProjectileDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/ProjectileDefinition.kt index ba59037c..530896a8 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/ProjectileDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/ProjectileDefinition.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.defs.projectile -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class ProjectileDefinition( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt index 6efaa8ee..0167a342 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.quest import com.google.common.collect.ImmutableSet import com.google.gson.JsonObject import ru.dbotthepony.kstarbound.defs.AssetPath -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class QuestTemplate( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt index b883deb9..60645c5e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.kstarbound.defs.tile import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.defs.StatusEffectDefinition -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kvector.vector.RGBAColor @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/MaterialModifier.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/MaterialModifier.kt index 9b1b083a..1cce0791 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/MaterialModifier.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/MaterialModifier.kt @@ -4,8 +4,8 @@ import com.google.common.collect.ImmutableList import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.defs.IThingWithDescription import ru.dbotthepony.kstarbound.defs.ThingDescription -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat @JsonFactory data class MaterialModifier( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderParameters.kt index 0377911d..89100a05 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderParameters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderParameters.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.kstarbound.defs.tile import ru.dbotthepony.kstarbound.defs.image.SpriteReference -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonNotNull +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonNotNull @JsonFactory data class RenderParameters( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt index 35bc81c8..264785a7 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableMap import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.defs.image.Image -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory import ru.dbotthepony.kstarbound.util.WriteOnce import ru.dbotthepony.kstarbound.world.api.ITileAccess import ru.dbotthepony.kstarbound.world.api.AbstractTileState diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDamageConfig.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDamageConfig.kt index 736bf00e..a9e73482 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDamageConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDamageConfig.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.tile import it.unimi.dsi.fastutil.objects.Object2DoubleMap import it.unimi.dsi.fastutil.objects.Object2DoubleMaps -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory class TileDamageConfig( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt index b34d472f..2334058d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt @@ -5,9 +5,9 @@ import ru.dbotthepony.kstarbound.defs.AssetReference import ru.dbotthepony.kstarbound.world.physics.CollisionType import ru.dbotthepony.kstarbound.defs.IThingWithDescription import ru.dbotthepony.kstarbound.defs.ThingDescription -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory -import ru.dbotthepony.kstarbound.io.json.builder.JsonFlat -import ru.dbotthepony.kstarbound.io.json.builder.JsonIgnore +import ru.dbotthepony.kstarbound.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFlat +import ru.dbotthepony.kstarbound.json.builder.JsonIgnore import ru.dbotthepony.kvector.vector.RGBAColor @JsonFactory diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt index 5c0fca3c..a5b7a302 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.api.IStarboundFile import ru.dbotthepony.kstarbound.getValue -import ru.dbotthepony.kstarbound.io.json.BinaryJsonReader +import ru.dbotthepony.kstarbound.json.BinaryJsonReader import java.io.BufferedInputStream import java.io.Closeable import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/AABBJson.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/AABBJson.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/AABBJson.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/AABBJson.kt index 4d95374e..839911fb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/AABBJson.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/AABBJson.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BinaryJsonReader.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/BinaryJsonReader.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BinaryJsonReader.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/BinaryJsonReader.kt index a9c7febf..7e2798a3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BinaryJsonReader.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/BinaryJsonReader.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ColorJson.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/ColorJson.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ColorJson.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/ColorJson.kt index ee7a8da5..ef4894e3 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ColorJson.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/ColorJson.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ContextualizedTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/ContextualizedTypeAdapter.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ContextualizedTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/ContextualizedTypeAdapter.kt index 8e329c40..1a523715 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ContextualizedTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/ContextualizedTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/EitherTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/EitherTypeAdapter.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/EitherTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/EitherTypeAdapter.kt index 9cd27a14..03375d6d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/EitherTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/EitherTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/Ext.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/Ext.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/Ext.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/Ext.kt index 94597d1b..4b02519d 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/Ext.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FastutilTypeAdapterFactory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/FastutilTypeAdapterFactory.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FastutilTypeAdapterFactory.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/FastutilTypeAdapterFactory.kt index 62d737f6..08031f65 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FastutilTypeAdapterFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/FastutilTypeAdapterFactory.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.github.benmanes.caffeine.cache.Interner import com.google.gson.Gson diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/InternedJsonElementAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/InternedJsonElementAdapter.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/InternedJsonElementAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/InternedJsonElementAdapter.kt index 6a5fd18f..3781ff26 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/InternedJsonElementAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/InternedJsonElementAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.github.benmanes.caffeine.cache.Interner import com.google.gson.JsonArray diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/JsonArraySpliterator.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/JsonArraySpliterator.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/JsonArraySpliterator.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/JsonArraySpliterator.kt index cd53f684..3399a167 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/JsonArraySpliterator.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/JsonArraySpliterator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KOptionalTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/KOptionalTypeAdapter.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KOptionalTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/KOptionalTypeAdapter.kt index 20c103b5..09b6c2a9 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KOptionalTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/KOptionalTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.Gson import com.google.gson.JsonSyntaxException diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KotlinAdapters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/KotlinAdapters.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KotlinAdapters.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/KotlinAdapters.kt index 171c513b..5210fcdf 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KotlinAdapters.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/KotlinAdapters.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/NothingAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/NothingAdapter.kt similarity index 88% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/NothingAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/NothingAdapter.kt index a9dbd919..472f1d2e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/NothingAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/NothingAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/OneOfTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/OneOfTypeAdapter.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/OneOfTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/OneOfTypeAdapter.kt index 6e69615c..29ed8e60 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/OneOfTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/OneOfTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.Gson import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VectorJson.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/VectorJson.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VectorJson.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/VectorJson.kt index 0a6caef6..c822cee5 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VectorJson.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/VectorJson.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VersionedJson.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/VersionedJson.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VersionedJson.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/VersionedJson.kt index 92464b66..1039fb1c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VersionedJson.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/VersionedJson.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json +package ru.dbotthepony.kstarbound.json import com.google.gson.JsonElement import java.io.DataInputStream diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Annotations.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Annotations.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Annotations.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Annotations.kt index 6e5ec3d8..2f758af9 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Annotations.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Annotations.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.gson.Gson import com.google.gson.TypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/BuilderAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/BuilderAdapter.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/BuilderAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/BuilderAdapter.kt index fe57c92f..1c1bfbca 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/BuilderAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/BuilderAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.common.collect.ImmutableMap import com.github.benmanes.caffeine.cache.Interner diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/EnumAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/EnumAdapter.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/EnumAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/EnumAdapter.kt index e51e0a36..4909eaf4 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/EnumAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/EnumAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/FactoryAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/FactoryAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt index 465360e2..ebd488eb 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/FactoryAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap @@ -26,8 +26,8 @@ import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.util.enrollList import ru.dbotthepony.kstarbound.defs.util.enrollMap import ru.dbotthepony.kstarbound.defs.util.flattenJsonElement -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.value +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.value import ru.dbotthepony.kstarbound.util.Either import java.lang.reflect.Constructor import java.util.Collections diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/IJsonHolder.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/IJsonHolder.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/IJsonHolder.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/IJsonHolder.kt index 7927f257..834fb1ee 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/IJsonHolder.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/IJsonHolder.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.gson.JsonObject diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/INativeJsonHolder.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/INativeJsonHolder.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/INativeJsonHolder.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/INativeJsonHolder.kt index 0898ef90..66b6523b 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/INativeJsonHolder.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/INativeJsonHolder.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.gson.JsonObject import ru.dbotthepony.kstarbound.defs.util.flattenJsonElement diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Properties.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Properties.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt index 906e2bb7..6c999ee1 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Properties.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.builder +package ru.dbotthepony.kstarbound.json.builder import com.google.gson.Gson import com.google.gson.TypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListAdapterFactory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListAdapterFactory.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListAdapterFactory.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListAdapterFactory.kt index 1e91b7fa..c9448268 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListAdapterFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListAdapterFactory.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.gson.Gson import com.google.gson.TypeAdapter diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListTypeAdapter.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListTypeAdapter.kt index 691cda30..e2c898c0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableArrayMapTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableArrayMapTypeAdapter.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableArrayMapTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableArrayMapTypeAdapter.kt index 566ca361..87d13a98 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableArrayMapTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableArrayMapTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableCollectionAdapterFactory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableCollectionAdapterFactory.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableCollectionAdapterFactory.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableCollectionAdapterFactory.kt index 8638fbf2..fe6527b0 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableCollectionAdapterFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableCollectionAdapterFactory.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableListTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableListTypeAdapter.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableListTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableListTypeAdapter.kt index 8ae7c34a..3c3fb0bc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableListTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableListTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.common.collect.ImmutableList import com.google.gson.JsonSyntaxException diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableMapTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableMapTypeAdapter.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableMapTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableMapTypeAdapter.kt index b6b443f0..e66582bc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableMapTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableMapTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableSetTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableSetTypeAdapter.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableSetTypeAdapter.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableSetTypeAdapter.kt index e321953b..18de1d0f 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableSetTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableSetTypeAdapter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/PairAdapterFactory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/PairAdapterFactory.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/PairAdapterFactory.kt rename to src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/PairAdapterFactory.kt index 85e43235..2d791c8e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/PairAdapterFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/PairAdapterFactory.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.kstarbound.io.json.factory +package ru.dbotthepony.kstarbound.json.factory import com.google.gson.Gson import com.google.gson.JsonSyntaxException @@ -8,7 +8,7 @@ import com.google.gson.reflect.TypeToken import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import java.lang.reflect.ParameterizedType object PairAdapterFactory : TypeAdapterFactory { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt index d2bd68c1..fe43039c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/lua/Functions.kt @@ -24,7 +24,7 @@ import org.classdump.luna.runtime.AbstractFunction4 import org.classdump.luna.runtime.AbstractFunctionAnyArg import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.LuaFunction -import ru.dbotthepony.kstarbound.io.json.InternedJsonElementAdapter +import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter import ru.dbotthepony.kvector.api.IStruct2i import ru.dbotthepony.kvector.api.IStruct3i import ru.dbotthepony.kvector.api.IStruct4i diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/math/LineF.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/math/LineF.kt index a8385bb4..7d4b8de9 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/math/LineF.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/math/LineF.kt @@ -5,7 +5,7 @@ import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import ru.dbotthepony.kstarbound.Starbound -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kvector.vector.Vector2f data class LineF(val start: Vector2f, val end: Vector2f) { diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/player/QuestDescriptor.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/player/QuestDescriptor.kt index d1376dd7..c1dd6a25 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/player/QuestDescriptor.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/player/QuestDescriptor.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.player import com.google.gson.JsonObject -import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory +import ru.dbotthepony.kstarbound.json.builder.JsonFactory @JsonFactory data class QuestDescriptor( diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/tools/Sbon2Json.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/tools/Sbon2Json.kt index e6383ac0..42dc2701 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/tools/Sbon2Json.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/tools/Sbon2Json.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.kstarbound.tools import com.google.gson.GsonBuilder -import ru.dbotthepony.kstarbound.io.json.BinaryJsonReader +import ru.dbotthepony.kstarbound.json.BinaryJsonReader import ru.dbotthepony.kstarbound.io.readHeader import ru.dbotthepony.kstarbound.io.readString import ru.dbotthepony.kstarbound.io.readVarInt diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Either.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Either.kt index f2be38b0..94842bab 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Either.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Either.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.kstarbound.util -import ru.dbotthepony.kstarbound.io.json.EitherTypeAdapter +import ru.dbotthepony.kstarbound.json.EitherTypeAdapter /** * Представляет собой контейнер с "или тот или другой" значениями diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Ext.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Ext.kt index f031f54d..70dd8d2a 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/Ext.kt @@ -7,7 +7,7 @@ import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import com.google.gson.JsonSyntaxException import com.google.gson.TypeAdapter -import ru.dbotthepony.kstarbound.io.json.InternedJsonElementAdapter +import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter import java.lang.ref.Reference operator fun JsonObject.set(key: String, value: JsonElement?) { add(key, value) } diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/ItemStack.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/ItemStack.kt index 82486d61..5ac9b120 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/ItemStack.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/ItemStack.kt @@ -12,7 +12,7 @@ import ru.dbotthepony.kstarbound.Registry import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.defs.item.ItemDescriptor import ru.dbotthepony.kstarbound.defs.item.api.IItemDefinition -import ru.dbotthepony.kstarbound.io.json.consumeNull +import ru.dbotthepony.kstarbound.json.consumeNull import ru.dbotthepony.kstarbound.lua.from class ItemStack private constructor(item: Registry.Entry?, count: Long, val parameters: JsonObject, marker: Unit) { 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 c24296ca..c8615363 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/physics/Poly.kt @@ -11,8 +11,8 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import org.lwjgl.opengl.GL11.GL_LINES import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.gl.vertex.GeometryType -import ru.dbotthepony.kstarbound.io.json.consumeNull -import ru.dbotthepony.kstarbound.io.json.listAdapter +import ru.dbotthepony.kstarbound.json.consumeNull +import ru.dbotthepony.kstarbound.json.listAdapter import ru.dbotthepony.kvector.api.IStruct2d import ru.dbotthepony.kvector.arrays.Matrix3f import ru.dbotthepony.kvector.util2d.AABB