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

Make RGBAColorTypeAdapter accept hex strings as input

Browse Source
This commit is contained in:
DBotThePony 2024-05-22 18:57:42 +07:00
parent 16ccb84d3b
commit 032f32626e
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/ru/dbotthepony/kstarbound/json/factory/RGBAColorTypeAdapter.kt
View File

@ -1,5 +1,6 @@
package ru.dbotthepony.kstarbound.json.factory package ru.dbotthepony.kstarbound.json.factory
import com.google.gson.JsonSyntaxException
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
@ -29,6 +30,12 @@ object RGBAColorTypeAdapter : TypeAdapter<RGBAColor>() {
if (`in`.consumeNull()) if (`in`.consumeNull())
return null return null
if (`in`.peek() == JsonToken.STRING) {
val str = `in`.nextString()
val color = RGBAColor.fromHexStringRGB(str) ?: throw JsonSyntaxException("Not a valid hex color: $str")
return color
}
`in`.beginArray() `in`.beginArray()
val red = `in`.nextInt() val red = `in`.nextInt()