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

Fix some bloppers

Browse Source
This commit is contained in:
DBotThePony 2024-03-28 19:19:24 +07:00
parent 602c21edfc
commit 6df7710dc2
Signed by: DBot
GPG Key ID: DCC23B5715498507
14 changed files with 129 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m
kotlinVersion=1.9.10
kotlinCoroutinesVersion=1.8.0
kommonsVersion=2.10.2
kommonsVersion=2.11.0
ffiVersion=2.2.13
lwjglVersion=3.3.0

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

@ -104,7 +104,7 @@ fun main() {
Starbound.mailboxInitialized.submit {
val server = IntegratedStarboundServer(File("./"))
//val world = ServerWorld.create(server, WorldGeometry(Vector2i(3000, 2000), true, false), LegacyWorldStorage.file(db))
val world = ServerWorld.load(server, LegacyWorldStorage.file(db)).get()
//world.thread.start()
//ply = PlayerEntity(client.world!!)

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

@ -244,7 +244,7 @@ object Registries {
try {
val json = Starbound.gson.getAdapter(JsonObject::class.java).read(JsonReader(listedFile.reader()).also { it.isLenient = true })
val name = json["name"]?.asString ?: throw JsonSyntaxException("Missing 'name' field")
val factory = TerrainSelectorType.factory(json)
val factory = TerrainSelectorType.factory(json, false)
terrainSelectors.add {
terrainSelectors.add(name, factory)

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

@ -58,6 +58,8 @@ import ru.dbotthepony.kstarbound.json.factory.SingletonTypeAdapterFactory
import ru.dbotthepony.kstarbound.math.*
import ru.dbotthepony.kstarbound.server.world.UniverseChunk
import ru.dbotthepony.kstarbound.item.ItemStack
import ru.dbotthepony.kstarbound.util.Directives
import ru.dbotthepony.kstarbound.util.ExceptionLogger
import ru.dbotthepony.kstarbound.util.SBPattern
import ru.dbotthepony.kstarbound.util.HashTableInterner
import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise
@ -104,10 +106,12 @@ object Starbound : ISBFileLocator {
return if (USE_CAFFEINE_INTERNER) Interner.newWeakInterner() else HashTableInterner(bits)
}
private val LOGGER = LogManager.getLogger()
val thread = Thread(::universeThread, "Starbound Universe")
val mailbox = MailboxExecutorService(thread)
val mailboxBootstrapped = MailboxExecutorService(thread)
val mailboxInitialized = MailboxExecutorService(thread)
val mailbox = MailboxExecutorService(thread).also { it.exceptionHandler = ExceptionLogger(LOGGER) }
val mailboxBootstrapped = MailboxExecutorService(thread).also { it.exceptionHandler = ExceptionLogger(LOGGER) }
val mailboxInitialized = MailboxExecutorService(thread).also { it.exceptionHandler = ExceptionLogger(LOGGER) }
init {
thread.isDaemon = true
@ -121,6 +125,11 @@ object Starbound : ISBFileLocator {
val thread = Thread(it, "Starbound Storage IO ${ioPoolCounter.getAndIncrement()}")
thread.isDaemon = true
thread.priority = Thread.MIN_PRIORITY
thread.uncaughtExceptionHandler = Thread.UncaughtExceptionHandler { t, e ->
LOGGER.error("I/O thread died due to uncaught exception", e)
}
return@ThreadFactory thread
})
@ -146,8 +155,6 @@ object Starbound : ISBFileLocator {
@JvmField
val STRINGS: Interner<String> = interner(5)
private val LOGGER = LogManager.getLogger()
val gson: Gson = with(GsonBuilder()) {
serializeNulls()
setDateFormat(DateFormat.LONG)
@ -236,6 +243,8 @@ object Starbound : ISBFileLocator {
registerTypeAdapterFactory(ThingDescription.Factory(STRINGS))
registerTypeAdapterFactory(TerrainSelectorType.Companion)
registerTypeAdapter(Directives.Companion)
registerTypeAdapter(EnumAdapter(DamageType::class, default = DamageType.DAMAGE))
registerTypeAdapter(InventoryIcon.Companion)

4
src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
View File

@ -62,6 +62,8 @@ import ru.dbotthepony.kstarbound.client.world.ClientWorld
import ru.dbotthepony.kstarbound.defs.image.Image
import ru.dbotthepony.kstarbound.math.roundTowardsNegativeInfinity
import ru.dbotthepony.kstarbound.math.roundTowardsPositiveInfinity
import ru.dbotthepony.kstarbound.server.StarboundServer
import ru.dbotthepony.kstarbound.util.ExceptionLogger
import ru.dbotthepony.kstarbound.util.ExecutionSpinner
import ru.dbotthepony.kstarbound.util.formatBytesShort
import ru.dbotthepony.kstarbound.world.Direction
@ -117,7 +119,7 @@ class StarboundClient private constructor(val clientID: Int) : Closeable {
}
}, null, false)
val mailbox = MailboxExecutorService(thread)
val mailbox = MailboxExecutorService(thread).also { it.exceptionHandler = ExceptionLogger(LOGGER) }
val capabilities: GLCapabilities
var viewportX: Int = 0

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

@ -116,7 +116,7 @@ class Parallax(
return Layer(
parallaxValue = parallax.map({ Vector2d(it, it) }, { it }),
repeat = repeatX to repeatY,
repeat = Either.left(repeatX to repeatY),
tileLimitTop = tileLimitTop,
tileLimitBottom = tileLimitBottom,
verticalOrigin = verticalOrigin,
@ -138,9 +138,9 @@ class Parallax(
data class Layer(
var directives: Directives,
val textures: ImmutableList<String>,
val alpha: Double,
val alpha: Double = 1.0,
val parallaxValue: Vector2d,
val repeat: Pair<Boolean, Boolean>,
val repeat: Either<Pair<Boolean, Boolean>, Pair<Int, Int>>,
val tileLimitTop: Double? = null,
val tileLimitBottom: Double? = null,
val verticalOrigin: Double,

3
src/main/kotlin/ru/dbotthepony/kstarbound/server/StarboundServer.kt
View File

@ -9,6 +9,7 @@ import ru.dbotthepony.kstarbound.network.packets.clientbound.UniverseTimeUpdateP
import ru.dbotthepony.kstarbound.server.world.ServerUniverse
import ru.dbotthepony.kstarbound.server.world.ServerWorld
import ru.dbotthepony.kstarbound.util.Clock
import ru.dbotthepony.kstarbound.util.ExceptionLogger
import ru.dbotthepony.kstarbound.util.ExecutionSpinner
import java.io.Closeable
import java.io.File
@ -30,7 +31,7 @@ sealed class StarboundServer(val root: File) : Closeable {
val worlds: MutableList<ServerWorld> = Collections.synchronizedList(ArrayList<ServerWorld>())
val serverID = threadCounter.getAndIncrement()
val mailbox = MailboxExecutorService()
val mailbox = MailboxExecutorService().also { it.exceptionHandler = ExceptionLogger(LOGGER) }
val spinner = ExecutionSpinner(mailbox::executeQueuedTasks, ::spin, Starbound.TIMESTEP_NANOS)
val thread = Thread(spinner, "Starbound Server $serverID")
val universe = ServerUniverse()

19
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorld.kt
View File

@ -21,6 +21,7 @@ import ru.dbotthepony.kstarbound.network.packets.clientbound.CentralStructureUpd
import ru.dbotthepony.kstarbound.network.packets.clientbound.WorldStartPacket
import ru.dbotthepony.kstarbound.server.StarboundServer
import ru.dbotthepony.kstarbound.server.ServerConnection
import ru.dbotthepony.kstarbound.util.AssetPathStack
import ru.dbotthepony.kstarbound.util.ExecutionSpinner
import ru.dbotthepony.kstarbound.world.ChunkPos
import ru.dbotthepony.kstarbound.world.IChunkListener
@ -483,15 +484,17 @@ class ServerWorld private constructor(
fun load(server: StarboundServer, storage: WorldStorage): CompletableFuture<ServerWorld> {
return storage.loadMetadata().thenApply {
val meta = it.map { Starbound.gson.fromJson(it.data.content, MetadataJson::class.java) }.orThrow { NoSuchElementException("No world metadata is present") }
AssetPathStack("/") { _ ->
val meta = it.map { Starbound.gson.fromJson(it.data.content, MetadataJson::class.java) }.orThrow { NoSuchElementException("No world metadata is present") }
val world = create(server, WorldTemplate.fromJson(meta.worldTemplate), storage)
world.playerSpawnPosition = meta.playerStart
world.respawnInWorld = meta.respawnInWorld
world.adjustPlayerSpawn = meta.adjustPlayerStart
world.centralStructure = meta.centralStructure
world.protectedDungeonIDs.addAll(meta.protectedDungeonIds)
world
val world = create(server, WorldTemplate.fromJson(meta.worldTemplate), storage)
world.playerSpawnPosition = meta.playerStart
world.respawnInWorld = meta.respawnInWorld
world.adjustPlayerSpawn = meta.adjustPlayerStart
world.centralStructure = meta.centralStructure
world.protectedDungeonIDs.addAll(meta.protectedDungeonIds)
world
}
}
}
}

46
src/main/kotlin/ru/dbotthepony/kstarbound/util/Directives.kt
View File

@ -1,8 +1,13 @@
package ru.dbotthepony.kstarbound.util
import com.google.gson.TypeAdapter
import com.google.gson.stream.JsonReader
import com.google.gson.stream.JsonWriter
import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap
import it.unimi.dsi.fastutil.objects.Object2ObjectMap
import it.unimi.dsi.fastutil.objects.Object2ObjectMaps
import ru.dbotthepony.kommons.gson.consumeNull
import ru.dbotthepony.kstarbound.Starbound
class Directives private constructor(private val directivesInternal: Object2ObjectAVLTreeMap<String, String>) {
constructor() : this(Object2ObjectAVLTreeMap())
@ -14,8 +19,8 @@ class Directives private constructor(private val directivesInternal: Object2Obje
}
// assume it is just "name=value"
val key = directives.substringBefore('=')
val value = directives.substringAfter('=')
val key = Starbound.STRINGS.intern(directives.substringBefore('='))
val value = Starbound.STRINGS.intern(directives.substringAfter('='))
directivesInternal[key] = value
} else {
// gets interesting
@ -24,8 +29,8 @@ class Directives private constructor(private val directivesInternal: Object2Obje
throw IllegalArgumentException("Missing render directive delimiter in '$pair' (full string: '$directives')")
}
val key = pair.substringBefore('=')
val value = pair.substringAfter('=')
val key = Starbound.STRINGS.intern(pair.substringBefore('='))
val value = Starbound.STRINGS.intern(pair.substringAfter('='))
directivesInternal[key] = value
}
}
@ -38,7 +43,14 @@ class Directives private constructor(private val directivesInternal: Object2Obje
if (directivesInternal.isEmpty())
return "Directives[empty]"
else
return "Directives[?${directivesInternal.entries.joinToString("?") { "${it.key}=${it.value}" }}]"
return "Directives[$directivesString]"
}
val directivesString by lazy {
if (directivesInternal.isEmpty())
""
else
"?${directivesInternal.entries.joinToString("?") { "${it.key}=${it.value}" }}"
}
override fun equals(other: Any?): Boolean {
@ -65,8 +77,8 @@ class Directives private constructor(private val directivesInternal: Object2Obje
}
// assume it is just "name=value"
val key = directives.substringBefore('=')
val value = directives.substringAfter('=')
val key = Starbound.STRINGS.intern(directives.substringBefore('='))
val value = Starbound.STRINGS.intern(directives.substringAfter('='))
return add(key, value)
} else {
// gets interesting
@ -82,12 +94,28 @@ class Directives private constructor(private val directivesInternal: Object2Obje
throw IllegalArgumentException("Missing render directive delimiter in '$pair' (full string: $directives)")
}
val key = pair.substringBefore('=')
val value = pair.substringAfter('=')
val key = Starbound.STRINGS.intern(pair.substringBefore('='))
val value = Starbound.STRINGS.intern(pair.substringAfter('='))
copy[key] = value
}
return Directives(copy)
}
}
companion object : TypeAdapter<Directives>() {
override fun write(out: JsonWriter, value: Directives?) {
if (value == null)
out.nullValue()
else
out.value(value.directivesString)
}
override fun read(`in`: JsonReader): Directives? {
if (`in`.consumeNull())
return null
return Directives(`in`.nextString())
}
}
}

10
src/main/kotlin/ru/dbotthepony/kstarbound/util/ExceptionLogger.kt Normal file
View File

@ -0,0 +1,10 @@
package ru.dbotthepony.kstarbound.util
import org.apache.logging.log4j.Logger
import java.util.function.Consumer
class ExceptionLogger(private val logger: Logger) : Consumer<Throwable> {
override fun accept(t: Throwable) {
logger.error("Error while executing queued task", t)
}
}

9
src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
View File

@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.ints.IntArraySet
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap
import it.unimi.dsi.fastutil.objects.ObjectArraySet
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.arrays.Object2DArray
import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.util.IStruct2d
@ -19,6 +20,8 @@ import ru.dbotthepony.kstarbound.defs.world.WorldTemplate
import ru.dbotthepony.kstarbound.math.*
import ru.dbotthepony.kstarbound.network.IPacket
import ru.dbotthepony.kstarbound.network.packets.clientbound.SetPlayerStartPacket
import ru.dbotthepony.kstarbound.server.StarboundServer
import ru.dbotthepony.kstarbound.util.ExceptionLogger
import ru.dbotthepony.kstarbound.util.ParallelPerform
import ru.dbotthepony.kstarbound.world.api.ICellAccess
import ru.dbotthepony.kstarbound.world.api.AbstractCell
@ -42,7 +45,7 @@ import java.util.stream.Stream
abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, ChunkType>>(val template: WorldTemplate) : ICellAccess, Closeable {
val background = TileView.Background(this)
val foreground = TileView.Foreground(this)
val mailbox = MailboxExecutorService()
val mailbox = MailboxExecutorService().also { it.exceptionHandler = ExceptionLogger(LOGGER) }
val sky = Sky()
val geometry: WorldGeometry = template.geometry
@ -330,4 +333,8 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
fun gravityAt(pos: IStruct2d): Vector2d {
return gravity
}
companion object {
private val LOGGER = LogManager.getLogger()
}
}

16
src/main/kotlin/ru/dbotthepony/kstarbound/world/entities/AbstractEntity.kt
View File

@ -1,6 +1,7 @@
package ru.dbotthepony.kstarbound.world.entities
import it.unimi.dsi.fastutil.bytes.ByteArrayList
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.kommons.util.MailboxExecutorService
import ru.dbotthepony.kommons.vector.Vector2d
import ru.dbotthepony.kstarbound.Starbound
@ -11,12 +12,15 @@ import ru.dbotthepony.kstarbound.defs.JsonDriven
import ru.dbotthepony.kstarbound.network.packets.EntityDestroyPacket
import ru.dbotthepony.kstarbound.network.syncher.MasterElement
import ru.dbotthepony.kstarbound.network.syncher.NetworkedGroup
import ru.dbotthepony.kstarbound.server.StarboundServer
import ru.dbotthepony.kstarbound.util.ExceptionLogger
import ru.dbotthepony.kstarbound.world.Chunk
import ru.dbotthepony.kstarbound.world.ChunkPos
import ru.dbotthepony.kstarbound.world.LightCalculator
import ru.dbotthepony.kstarbound.world.World
import ru.dbotthepony.kstarbound.world.entities.player.PlayerEntity
import java.io.DataOutputStream
import java.util.function.Consumer
import kotlin.concurrent.withLock
abstract class AbstractEntity(path: String) : JsonDriven(path) {
@ -67,7 +71,11 @@ abstract class AbstractEntity(path: String) : JsonDriven(path) {
var connectionID: Int = 0
private set
var mailbox = MailboxExecutorService()
private val exceptionLogger = Consumer<Throwable> {
LOGGER.error("Error while executing queued task on $this", it)
}
var mailbox = MailboxExecutorService().also { it.exceptionHandler = exceptionLogger }
private set
private var innerWorld: World<*, *>? = null
@ -117,7 +125,7 @@ abstract class AbstractEntity(path: String) : JsonDriven(path) {
check(!world.entities.containsKey(entityID)) { "Duplicate entity ID: $entityID" }
if (mailbox.isShutdown)
mailbox = MailboxExecutorService()
mailbox = MailboxExecutorService().also { it.exceptionHandler = exceptionLogger }
innerWorld = world
world.entities[entityID] = this
@ -169,4 +177,8 @@ abstract class AbstractEntity(path: String) : JsonDriven(path) {
open fun addLights(lightCalculator: LightCalculator, xOffset: Int, yOffset: Int) {
}
companion object {
private val LOGGER = LogManager.getLogger()
}
}

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/RotateTerrainSelector.kt
View File

@ -15,7 +15,7 @@ class RotateTerrainSelector(data: Data, parameters: TerrainSelectorParameters) :
val source: JsonObject,
)
private val source = TerrainSelectorType.create(data.source)
private val source = TerrainSelectorType.create(data.source, parameters)
private val deltaX = parameters.worldWidth * data.rotationWidth
private val deltaY = parameters.worldHeight * data.rotationHeight

32
src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorType.kt
View File

@ -72,27 +72,41 @@ enum class TerrainSelectorType(val jsonName: String, private val data: Data<*, *
if (`in`.consumeNull())
return null
return create(objects.read(`in`))
return load(objects.read(`in`))
}
fun factory(json: JsonObject): Factory<*, *> {
fun factory(json: JsonObject, isSerializedForm: Boolean): Factory<*, *> {
val type = json["type"]?.asString?.lowercase() ?: throw JsonSyntaxException("Missing 'type' element of terrain json")
for (value in entries) {
if (value.lowercase == type) {
return Factory(value.data.adapter.fromJsonTree(json), value.data.factory as ((Any, TerrainSelectorParameters) -> AbstractTerrainSelector<Any>))
if (isSerializedForm) {
val config = json["config"]?.asJsonObject ?: throw JsonSyntaxException("Missing 'config' element of terrain json")
for (value in entries) {
if (value.lowercase == type) {
return Factory(value.data.adapter.fromJsonTree(config), value.data.factory as ((Any, TerrainSelectorParameters) -> AbstractTerrainSelector<Any>))
}
}
} else {
for (value in entries) {
if (value.lowercase == type) {
return Factory(value.data.adapter.fromJsonTree(json), value.data.factory as ((Any, TerrainSelectorParameters) -> AbstractTerrainSelector<Any>))
}
}
}
throw IllegalArgumentException("Unknown terrain selector type $type")
}
fun create(json: JsonObject): AbstractTerrainSelector<*> {
return factory(json).create(Starbound.gson.fromJson(json["parameters"] ?: throw JsonSyntaxException("Missing 'parameters' element of terrain json"), TerrainSelectorParameters::class.java))
fun create(json: JsonObject, parameters: TerrainSelectorParameters): AbstractTerrainSelector<*> {
return factory(json, false).create(parameters)
}
fun create(json: JsonObject, parameters: TerrainSelectorParameters): AbstractTerrainSelector<*> {
return factory(json).create(parameters)
fun load(json: JsonObject): AbstractTerrainSelector<*> {
return factory(json, true).create(Starbound.gson.fromJson(json["parameters"] ?: throw JsonSyntaxException("Missing 'parameters' element of terrain json"), TerrainSelectorParameters::class.java))
}
fun load(json: JsonObject, parameters: TerrainSelectorParameters): AbstractTerrainSelector<*> {
return factory(json, true).create(parameters)
}
}
}