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

Свойство для указывания символьного имени которое на данный момент прочитывается

Browse Source
This commit is contained in:
DBotThePony 2022-12-29 15:47:30 +07:00
parent 176ca9db65
commit 5f3c33d9cb
Signed by: DBot
GPG Key ID: DCC23B5715498507
4 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

38
src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt
View File

@ -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<T : Any>(
val types: ImmutableList<Pair<KProperty1<T, *>, TypeAdapter<*>>>,
val asList: Boolean = false
) : TypeAdapter<T>() {
fun register(gsonBuilder: GsonBuilder) {
gsonBuilder.registerTypeAdapter(bound.java, this)
}
private val returnTypeCache = Object2ObjectArrayMap<KProperty1<T, *>, KType>()
private val mapped = Object2IntArrayMap<String>()
private val internedStrings = Interners.newWeakInterner<String>()
private val loggedMisses = ObjectArraySet<String>()
var currentSymbolicName by ThreadLocal<String>()
init {
for ((field) in types) {
returnTypeCache[field] = field.returnType
@ -190,6 +191,9 @@ class KConcreteTypeAdapter<T : Any>(
}
}
/**
* Обычный конструктор класса (без флагов "значения по умолчанию")
*/
private val regularFactory: KFunction<T> = bound.constructors.firstOrNull first@{
if (it.parameters.size == types.size) {
val iterator = types.iterator()
@ -211,6 +215,9 @@ class KConcreteTypeAdapter<T : Any>(
return@first false
} ?: throw NoSuchElementException("Unable to determine constructor for ${bound.qualifiedName} matching (${types.joinToString(", ")})")
/**
* Синтетический конструктор класса, который создаётся Kotlin'ном, для создания классов со значениями по умолчанию
*/
private val syntheticFactory: Constructor<T>? = try {
bound.java.getDeclaredConstructor(*types.map { (it.first.returnType.classifier as KClass<*>).java }.also {
it as MutableList
@ -282,7 +289,11 @@ class KConcreteTypeAdapter<T : Any>(
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<T : Any>(
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<T : Any>(
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<T : Any>(
}
// если у нас есть все значения для конструктора (все значения присутствуют в исходном json объекте)
// или у нас нет Java'вского конструктора, то делаем вызов "обычного" конструктора
// или у нас нет синтетического конструктора, то делаем вызов "обычного" конструктора
if (syntheticFactory == null || presentValues.all { it }) {
for ((i, pair) in types.withIndex()) {
val (field) = pair
@ -359,8 +378,11 @@ class KConcreteTypeAdapter<T : Any>(
@Suppress("unchecked_cast")
return regularFactory.call(*readValues as Array<out Any>)
// иначе - в бой вступает синтетический конструктор, с флагами "значения по умолчанию"
} 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