Перемещены классы для работы с json в пакет json

This commit is contained in:
DBotThePony 2022-12-30 16:38:55 +07:00
parent 35151c8187
commit b939373298
Signed by: DBot
GPG Key ID: DCC23B5715498507
30 changed files with 45 additions and 54 deletions

View File

@ -2,7 +2,6 @@ package ru.dbotthepony.kstarbound
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.gson.* import com.google.gson.*
import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
@ -22,6 +21,12 @@ import ru.dbotthepony.kstarbound.defs.tile.TileDefinition
import ru.dbotthepony.kstarbound.defs.world.SkyParameters import ru.dbotthepony.kstarbound.defs.world.SkyParameters
import ru.dbotthepony.kstarbound.defs.world.dungeon.DungeonWorldDef import ru.dbotthepony.kstarbound.defs.world.dungeon.DungeonWorldDef
import ru.dbotthepony.kstarbound.io.* 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.CustomEnumTypeAdapter
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.math.* import ru.dbotthepony.kstarbound.math.*
import ru.dbotthepony.kvector.util2d.AABB import ru.dbotthepony.kvector.util2d.AABB
import ru.dbotthepony.kvector.util2d.AABBi import ru.dbotthepony.kvector.util2d.AABBi

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs package ru.dbotthepony.kstarbound.defs
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
enum class DamageType(private vararg val aliases: String) : IStringSerializable { enum class DamageType(private vararg val aliases: String) : IStringSerializable {
NORMAL, NORMAL,

View File

@ -2,15 +2,13 @@ package ru.dbotthepony.kstarbound.defs
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.JsonArray
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter
import ru.dbotthepony.kstarbound.io.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.io.json.IStringSerializable
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.Vector2dTypeAdapter
import ru.dbotthepony.kstarbound.io.Vector2dTypeAdapter
import ru.dbotthepony.kvector.vector.ndouble.Vector2d import ru.dbotthepony.kvector.vector.ndouble.Vector2d
enum class JsonFunctionInterpolation(vararg aliases: String) : IStringSerializable { enum class JsonFunctionInterpolation(vararg aliases: String) : IStringSerializable {

View File

@ -6,7 +6,7 @@ import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.KTypeAdapter import ru.dbotthepony.kstarbound.io.json.KTypeAdapter
import ru.dbotthepony.kvector.vector.ndouble.Vector2d import ru.dbotthepony.kvector.vector.ndouble.Vector2d
import kotlin.properties.Delegates import kotlin.properties.Delegates

View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.item
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter
import ru.dbotthepony.kvector.vector.ndouble.Vector2d import ru.dbotthepony.kvector.vector.ndouble.Vector2d

View File

@ -3,8 +3,8 @@ package ru.dbotthepony.kstarbound.defs.item
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter
enum class ItemRarity(val canonical: String) : IStringSerializable { enum class ItemRarity(val canonical: String) : IStringSerializable {

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.liquid package ru.dbotthepony.kstarbound.defs.liquid
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter
import ru.dbotthepony.kvector.vector.Color import ru.dbotthepony.kvector.vector.Color

View File

@ -7,9 +7,9 @@ import it.unimi.dsi.fastutil.objects.ObjectArraySet
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.defs.* import ru.dbotthepony.kstarbound.defs.*
import ru.dbotthepony.kstarbound.io.ConfigurableTypeAdapter import ru.dbotthepony.kstarbound.io.json.ConfigurableTypeAdapter
import ru.dbotthepony.kstarbound.io.KTypeAdapter import ru.dbotthepony.kstarbound.io.json.KTypeAdapter
import ru.dbotthepony.kstarbound.io.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter
import ru.dbotthepony.kvector.vector.Color import ru.dbotthepony.kvector.vector.Color
import kotlin.properties.Delegates import kotlin.properties.Delegates

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.projectile package ru.dbotthepony.kstarbound.defs.projectile
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
enum class ProjectilePhysics(private vararg val aliases: String) : IStringSerializable { enum class ProjectilePhysics(private vararg val aliases: String) : IStringSerializable {
GAS, GAS,

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.tile package ru.dbotthepony.kstarbound.defs.tile
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
data class MaterialModifier( data class MaterialModifier(
val modId: Int, val modId: Int,

View File

@ -2,7 +2,7 @@ package ru.dbotthepony.kstarbound.defs.tile
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
const val TILE_COLOR_VARIANTS = 9 const val TILE_COLOR_VARIANTS = 9

View File

@ -9,8 +9,8 @@ import com.google.gson.stream.JsonWriter
import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.ObjectArraySet
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.io.EnumAdapter import ru.dbotthepony.kstarbound.io.json.EnumAdapter
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter
import ru.dbotthepony.kstarbound.util.WriteOnce import ru.dbotthepony.kstarbound.util.WriteOnce
import ru.dbotthepony.kstarbound.world.ITileGetter import ru.dbotthepony.kstarbound.world.ITileGetter

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.tile package ru.dbotthepony.kstarbound.defs.tile
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter import ru.dbotthepony.kstarbound.io.json.KConcreteTypeAdapter
import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.registerTypeAdapter
import ru.dbotthepony.kvector.vector.Color import ru.dbotthepony.kvector.vector.Color

View File

@ -6,11 +6,10 @@ import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kstarbound.io.ColorTypeAdapter import ru.dbotthepony.kstarbound.io.ColorTypeAdapter
import ru.dbotthepony.kstarbound.io.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter
import ru.dbotthepony.kstarbound.io.KTypeAdapter import ru.dbotthepony.kstarbound.io.json.KTypeAdapter
import ru.dbotthepony.kvector.vector.Color import ru.dbotthepony.kvector.vector.Color
import ru.dbotthepony.kvector.vector.ndouble.Vector2d import ru.dbotthepony.kvector.vector.ndouble.Vector2d
import kotlin.properties.Delegates
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KProperty import kotlin.reflect.KProperty

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.world package ru.dbotthepony.kstarbound.defs.world
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
enum class SkyType(vararg aliases: String) : IStringSerializable { enum class SkyType(vararg aliases: String) : IStringSerializable {
ATMOSPHERIC, ATMOSPHERIC,

View File

@ -1,9 +1,7 @@
package ru.dbotthepony.kstarbound.defs.world package ru.dbotthepony.kstarbound.defs.world
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.io.KTypeAdapter import ru.dbotthepony.kstarbound.io.json.KTypeAdapter
import ru.dbotthepony.kvector.vector.Color
import kotlin.properties.Delegates
class WorldProperties { class WorldProperties {
var nonCombat = false var nonCombat = false

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.world.dungeon package ru.dbotthepony.kstarbound.defs.world.dungeon
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
enum class BeamUpRule(vararg aliases: String) : IStringSerializable { enum class BeamUpRule(vararg aliases: String) : IStringSerializable {
NOWHERE, NOWHERE,

View File

@ -3,8 +3,8 @@ package ru.dbotthepony.kstarbound.defs.world.dungeon
import com.google.gson.GsonBuilder import com.google.gson.GsonBuilder
import ru.dbotthepony.kstarbound.defs.world.SkyParameters import ru.dbotthepony.kstarbound.defs.world.SkyParameters
import ru.dbotthepony.kstarbound.defs.world.WorldProperties import ru.dbotthepony.kstarbound.defs.world.WorldProperties
import ru.dbotthepony.kstarbound.io.CustomEnumTypeAdapter import ru.dbotthepony.kstarbound.io.json.CustomEnumTypeAdapter
import ru.dbotthepony.kstarbound.io.KTypeAdapter import ru.dbotthepony.kstarbound.io.json.KTypeAdapter
import kotlin.properties.Delegates import kotlin.properties.Delegates
class DungeonWorldDef { class DungeonWorldDef {

View File

@ -1,7 +1,7 @@
package ru.dbotthepony.kstarbound.defs.world.dungeon package ru.dbotthepony.kstarbound.defs.world.dungeon
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.IStringSerializable import ru.dbotthepony.kstarbound.io.json.IStringSerializable
enum class DungeonType(vararg aliases: String) : IStringSerializable { enum class DungeonType(vararg aliases: String) : IStringSerializable {
FLOATING("FloatingDungeon"), FLOATING("FloatingDungeon"),

View File

@ -3,6 +3,7 @@ package ru.dbotthepony.kstarbound.io
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import ru.dbotthepony.kstarbound.api.IStarboundFile import ru.dbotthepony.kstarbound.api.IStarboundFile
import ru.dbotthepony.kstarbound.io.json.BinaryJson
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.Closeable import java.io.Closeable
import java.io.DataInputStream import java.io.DataInputStream
@ -11,7 +12,6 @@ import java.io.IOError
import java.io.IOException import java.io.IOException
import java.io.InputStream import java.io.InputStream
import java.io.RandomAccessFile import java.io.RandomAccessFile
import java.nio.ByteBuffer
import java.nio.channels.Channels import java.nio.channels.Channels
import java.util.* import java.util.*

View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader

View File

@ -1,8 +1,10 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.gson.* import com.google.gson.*
import ru.dbotthepony.kstarbound.io.readASCIIString
import ru.dbotthepony.kstarbound.io.readVarInt
import ru.dbotthepony.kstarbound.io.readVarLong
import java.io.DataInputStream import java.io.DataInputStream
import java.io.InputStream
import java.io.RandomAccessFile import java.io.RandomAccessFile
/** /**

View File

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

View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader

View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap
import com.google.gson.JsonSyntaxException import com.google.gson.JsonSyntaxException

View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableMap
@ -674,15 +674,5 @@ class KConcreteTypeAdapter<T : Any> private constructor(
companion object { companion object {
private val LOGGER = LogManager.getLogger() private val LOGGER = LogManager.getLogger()
/*fun <T : Any> simple(clazz: KClass<T>, asList: Boolean = false): KConcreteTypeAdapter<T> {
val builder = Builder(clazz)
for (argument in clazz.primaryConstructor!!.parameters) {
builder.plain(argument.)
}
return builder.build(asList = asList)
}*/
} }
} }

View File

@ -1,9 +1,8 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.google.gson.JsonSyntaxException import com.google.gson.JsonSyntaxException
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.internal.bind.TypeAdapters
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter

View File

@ -1,4 +1,4 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io.json
import com.google.gson.TypeAdapter import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader

View File

@ -5,7 +5,7 @@ import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonToken
import com.google.gson.stream.JsonWriter import com.google.gson.stream.JsonWriter
import ru.dbotthepony.kstarbound.io.Vector2dTypeAdapter import ru.dbotthepony.kstarbound.io.json.Vector2dTypeAdapter
import ru.dbotthepony.kvector.vector.ndouble.Vector2d import ru.dbotthepony.kvector.vector.ndouble.Vector2d
class Poly(vararg points: Vector2d) { class Poly(vararg points: Vector2d) {