DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

move json out of io package

Browse Source
This commit is contained in:
DBotThePony 2023-11-10 22:51:32 +07:00
parent 24529aba3e
commit 8af66ff359
Signed by: DBot
GPG Key ID: DCC23B5715498507
109 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt
View File

@ -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

50
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -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)

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/BaseMovementParameters.kt
View File

@ -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)

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/DamageType.kt
View File

@ -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,

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Drawable.kt
View File

@ -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

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/IScriptable.kt
View File

@ -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 {

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/IThingWithDescription.kt
View File

@ -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 {

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/ItemReference.kt
View File

@ -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
/**

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonFunction.kt
View File

@ -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

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/JsonReference.kt
View File

@ -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<E : JsonElement?>(val path: String?, val fullPath: String?) {

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/JumpProfile.kt
View File

@ -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

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/MovementParameters.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/Species.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatModifier.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/StatusEffectDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/TouchDamage.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/animation/AnimationDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/SpriteReference.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/IInventoryIcon.kt
View File

@ -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 {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ILeveledStatusEffect.kt
View File

@ -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 {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/InventoryIcon.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/ItemRarity.kt
View File

@ -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"),

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/TreasurePoolDefinition.kt
View File

@ -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

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IArmorItemDefinition.kt
View File

@ -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 {
/**

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/api/IItemDefinition.kt
View File

@ -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 {

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ArmorItemDefinition.kt
View File

@ -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(

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/CurrencyItemDefinition.kt
View File

@ -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(

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/FlashlightDefinition.kt
View File

@ -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

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/HarvestingToolPrototype.kt
View File

@ -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)

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/ItemDefinition.kt
View File

@ -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(

8
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/LiquidItemDefinition.kt
View File

@ -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

8
src/main/kotlin/ru/dbotthepony/kstarbound/defs/item/impl/MaterialItemDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterSkillDefinition.kt
View File

@ -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(

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/monster/MonsterTypeDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/NpcTypeDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/npc/TenantDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/DamageTeam.kt
View File

@ -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(

8
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectDefinition.kt
View File

@ -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

8
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ObjectOrientation.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/object/ParticleEmissionEntry.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/IParticleVariance.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleCreator.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleEmitter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/particle/ParticleVariance.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BagFilterConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/BlueprintLearnList.kt
View File

@ -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<ImmutableList<Entry>>) {
constructor(tiers: Map<Int, List<Entry>>) : this(Int2ObjectArrayMap<ImmutableList<Entry>>().also { for ((k, v) in tiers.entries) it.put(k, ImmutableList.copyOf(v)) })

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/CompanionsConfig.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/DeploymentConfig.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/InventoryConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/MatterManipulatorConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementModifiers.kt
View File

@ -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(

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/PlayerMovementParameters.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/RecipeDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/SplashConfig.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/StatusControllerSettings.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/player/TechDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/projectile/ProjectileDefinition.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/quest/QuestTemplate.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt
View File

@ -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

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/MaterialModifier.kt
View File

@ -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(

4
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderParameters.kt
View File

@ -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(

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDamageConfig.kt
View File

@ -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(

6
src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/AABBJson.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/AABBJson.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/BinaryJsonReader.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/BinaryJsonReader.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ColorJson.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/ColorJson.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/ContextualizedTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/ContextualizedTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/EitherTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/EitherTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/Ext.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/Ext.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/FastutilTypeAdapterFactory.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/FastutilTypeAdapterFactory.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/InternedJsonElementAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/InternedJsonElementAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/JsonArraySpliterator.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/JsonArraySpliterator.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KOptionalTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/KOptionalTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/KotlinAdapters.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/KotlinAdapters.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/NothingAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/NothingAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/OneOfTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/OneOfTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VectorJson.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/VectorJson.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/VersionedJson.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/VersionedJson.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io.json
package ru.dbotthepony.kstarbound.json
import com.google.gson.JsonElement
import java.io.DataInputStream

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Annotations.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Annotations.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/BuilderAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/BuilderAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/EnumAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/EnumAdapter.kt
View File

@ -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

6
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/FactoryAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/FactoryAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/IJsonHolder.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/IJsonHolder.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io.json.builder
package ru.dbotthepony.kstarbound.json.builder
import com.google.gson.JsonObject

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/INativeJsonHolder.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/INativeJsonHolder.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/builder/Properties.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/builder/Properties.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListAdapterFactory.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListAdapterFactory.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ArrayListTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ArrayListTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableArrayMapTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableArrayMapTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableCollectionAdapterFactory.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableCollectionAdapterFactory.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableListTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableListTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableMapTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableMapTypeAdapter.kt
View File

@ -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

2
src/main/kotlin/ru/dbotthepony/kstarbound/io/json/factory/ImmutableSetTypeAdapter.kt → src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/ImmutableSetTypeAdapter.kt
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More