From 5f3c33d9cb7e1e3e64572a49861a66ec13fc3846 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 29 Dec 2022 15:47:30 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D0=BE=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BA=D0=B0=D0=B7=D1=8B?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=20=D0=BF=D1=80=D0=BE=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/dbotthepony/kstarbound/Starbound.kt | 13 +++---- .../kstarbound/defs/tile/RenderTemplate.kt | 18 +++++---- .../kstarbound/defs/tile/TileDefinition.kt | 3 +- .../kstarbound/io/KConcreteTypeAdapter.kt | 38 +++++++++++++++---- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index b1e092ff..5f69cb94 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -343,7 +343,7 @@ object Starbound { private fun loadParallax(callback: (String) -> Unit) { for (fs in fileSystems) { - for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".parallax") && it.isFile }) { + for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".parallax") }) { try { callback("Loading $listedFile") @@ -364,7 +364,7 @@ object Starbound { readingFolder = "/tiles/materials" for (fs in fileSystems) { - for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".matmod") && it.isFile }) { + for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".matmod") }) { try { callback("Loading $listedFile") @@ -391,7 +391,7 @@ object Starbound { private fun loadLiquidDefinitions(callback: (String) -> Unit) { for (fs in fileSystems) { - for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".liquid") && it.isFile }) { + for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".liquid") }) { try { callback("Loading $listedFile") @@ -410,17 +410,16 @@ object Starbound { } } } - - readingFolder = null } private fun loadItemDefinitions(callback: (String) -> Unit) { for (fs in fileSystems) { - for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".item") && it.isFile }) { + for (listedFile in fs.explore().filter { it.isFile }.filter { it.name.endsWith(".item") }) { try { callback("Loading $listedFile") readingFolder = listedFile.computeDirectory() + ItemDefinition.ADAPTER.currentSymbolicName = listedFile.computeFullPath() val def = gson.fromJson(listedFile.reader(), ItemDefinition::class.java) check(items.put(def.itemName, def) == null) { "Already has item with name ${def.itemName} loaded!" } @@ -433,7 +432,5 @@ object Starbound { } } } - - readingFolder = null } } 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 3c8e9ff1..95042e2c 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/RenderTemplate.kt @@ -11,6 +11,7 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.io.EnumAdapter import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter +import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kstarbound.util.WriteOnce import ru.dbotthepony.kstarbound.world.ITileGetter import ru.dbotthepony.kstarbound.world.ITileState @@ -265,15 +266,16 @@ data class RenderTemplate( .build() fun registerGson(gsonBuilder: GsonBuilder) { - RenderPiece.ADAPTER.register(gsonBuilder) - RenderRuleList.Entry.ADAPTER.register(gsonBuilder) - RenderRuleList.ADAPTER.register(gsonBuilder) - RenderMatch.ADAPTER.register(gsonBuilder) - RenderMatch.PIECE_ADAPTER.register(gsonBuilder) - RenderMatch.MATCHER_ADAPTER.register(gsonBuilder) - RenderMatchList.ADAPTER.register(gsonBuilder) + gsonBuilder.registerTypeAdapter(RenderPiece.ADAPTER) + gsonBuilder.registerTypeAdapter(RenderRuleList.ADAPTER) + gsonBuilder.registerTypeAdapter(RenderMatch.ADAPTER) + gsonBuilder.registerTypeAdapter(RenderMatch.PIECE_ADAPTER) + gsonBuilder.registerTypeAdapter(RenderMatch.MATCHER_ADAPTER) + gsonBuilder.registerTypeAdapter(RenderMatchList.ADAPTER) - ADAPTER.register(gsonBuilder) + gsonBuilder.registerTypeAdapter(RenderRuleList.Entry.ADAPTER) + + gsonBuilder.registerTypeAdapter(ADAPTER) gsonBuilder.registerTypeAdapter(RenderRuleList.Combination::class.java, EnumAdapter(RenderRuleList.Combination::class.java)) } 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 47068311..3a8cd2ce 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/TileDefinition.kt @@ -2,6 +2,7 @@ package ru.dbotthepony.kstarbound.defs.tile import com.google.gson.GsonBuilder import ru.dbotthepony.kstarbound.io.KConcreteTypeAdapter +import ru.dbotthepony.kstarbound.registerTypeAdapter import ru.dbotthepony.kvector.vector.Color data class TileDefinition( @@ -44,7 +45,7 @@ data class TileDefinition( .build() fun registerGson(gsonBuilder: GsonBuilder) { - ADAPTER.register(gsonBuilder) + gsonBuilder.registerTypeAdapter(ADAPTER) } } } diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt index 62715c38..e510432e 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt @@ -15,7 +15,10 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap import it.unimi.dsi.fastutil.objects.ObjectArraySet import org.apache.logging.log4j.LogManager import ru.dbotthepony.kstarbound.Starbound +import ru.dbotthepony.kstarbound.getValue +import ru.dbotthepony.kstarbound.setValue import java.lang.reflect.Constructor +import java.util.BitSet import kotlin.jvm.internal.DefaultConstructorMarker import kotlin.reflect.* import kotlin.reflect.full.isSuperclassOf @@ -169,15 +172,13 @@ class KConcreteTypeAdapter( val types: ImmutableList, TypeAdapter<*>>>, val asList: Boolean = false ) : TypeAdapter() { - fun register(gsonBuilder: GsonBuilder) { - gsonBuilder.registerTypeAdapter(bound.java, this) - } - private val returnTypeCache = Object2ObjectArrayMap, KType>() private val mapped = Object2IntArrayMap() private val internedStrings = Interners.newWeakInterner() private val loggedMisses = ObjectArraySet() + var currentSymbolicName by ThreadLocal() + init { for ((field) in types) { returnTypeCache[field] = field.returnType @@ -190,6 +191,9 @@ class KConcreteTypeAdapter( } } + /** + * Обычный конструктор класса (без флагов "значения по умолчанию") + */ private val regularFactory: KFunction = bound.constructors.firstOrNull first@{ if (it.parameters.size == types.size) { val iterator = types.iterator() @@ -211,6 +215,9 @@ class KConcreteTypeAdapter( return@first false } ?: throw NoSuchElementException("Unable to determine constructor for ${bound.qualifiedName} matching (${types.joinToString(", ")})") + /** + * Синтетический конструктор класса, который создаётся Kotlin'ном, для создания классов со значениями по умолчанию + */ private val syntheticFactory: Constructor? = try { bound.java.getDeclaredConstructor(*types.map { (it.first.returnType.classifier as KClass<*>).java }.also { it as MutableList @@ -282,7 +289,11 @@ class KConcreteTypeAdapter( val name = fieldId.toString() if (loggedMisses.add(name)) { - LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field") + if (currentSymbolicName == null) { + LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field") + } else { + LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field (reading: $currentSymbolicName)") + } } reader.skipValue() @@ -310,7 +321,11 @@ class KConcreteTypeAdapter( if (fieldId == -1) { if (loggedMisses.add(name)) { - LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field") + if (currentSymbolicName == null) { + LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field") + } else { + LOGGER.warn("Skipping JSON field with name $name because ${bound.simpleName} has no such field (reading: $currentSymbolicName)") + } } reader.skipValue() @@ -321,7 +336,11 @@ class KConcreteTypeAdapter( readValues[fieldId] = adapter.read(reader) presentValues[fieldId] = true } catch(err: Throwable) { - throw JsonSyntaxException("Exception reading field ${field.name} for ${bound.qualifiedName}", err) + if (currentSymbolicName == null) { + throw JsonSyntaxException("Exception reading field ${field.name} for ${bound.qualifiedName}", err) + } else { + throw JsonSyntaxException("Exception reading field ${field.name} for ${bound.qualifiedName} (reading: $currentSymbolicName)", err) + } } } } @@ -341,7 +360,7 @@ class KConcreteTypeAdapter( } // если у нас есть все значения для конструктора (все значения присутствуют в исходном json объекте) - // или у нас нет Java'вского конструктора, то делаем вызов "обычного" конструктора + // или у нас нет синтетического конструктора, то делаем вызов "обычного" конструктора if (syntheticFactory == null || presentValues.all { it }) { for ((i, pair) in types.withIndex()) { val (field) = pair @@ -359,8 +378,11 @@ class KConcreteTypeAdapter( @Suppress("unchecked_cast") return regularFactory.call(*readValues as Array) + // иначе - в бой вступает синтетический конструктор, с флагами "значения по умолчанию" } else { + // количество bitflag'ов значений по умолчанию val ints = if (presentValues.size % 31 == 0) presentValues.size / 31 else presentValues.size / 31 + 1 + // максимум считанных значений + bitflag аргументы значений по умолчанию + null типа DefaultConstructorMarker val copied = readValues.copyOf(readValues.size + ints + 1) var intIndex = readValues.size var target = 0