Skip to content

Commit

Permalink
Add custom serialization for identifiers
Browse files Browse the repository at this point in the history
  • Loading branch information
PotatoPresident committed Jun 18, 2024
1 parent 3d5eccc commit 9e90c7f
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ interface ActionType {
fun getMessage(source: ServerCommandSource): Text

fun isBlacklisted() = config[ActionsSpec.typeBlacklist].contains(identifier) ||
config[ActionsSpec.objectBlacklist].map { it.identifier }.contains(objectIdentifier) ||
config[ActionsSpec.objectBlacklist].map { it.identifier }.contains(oldObjectIdentifier) ||
config[ActionsSpec.objectBlacklist].contains(objectIdentifier) ||
config[ActionsSpec.objectBlacklist].contains(oldObjectIdentifier) ||
config[ActionsSpec.sourceBlacklist].contains(sourceName) ||
config[ActionsSpec.sourceBlacklist].contains("@${sourceProfile?.name}") ||
config[ActionsSpec.worldBlacklist].map { it.identifier }.contains(world)
config[ActionsSpec.worldBlacklist].contains(world)
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.github.quiltservertools.ledger.config

import com.github.quiltservertools.ledger.config.util.IdentifierWrapper
import com.uchuhimo.konf.ConfigSpec
import net.minecraft.util.Identifier

object ActionsSpec : ConfigSpec() {
val typeBlacklist by required<List<String>>()
val worldBlacklist by required<List<IdentifierWrapper>>()
val objectBlacklist by required<List<IdentifierWrapper>>()
val worldBlacklist by required<List<Identifier>>()
val objectBlacklist by required<List<Identifier>>()
val sourceBlacklist by required<List<String>>()
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.github.quiltservertools.ledger.config

import com.github.quiltservertools.ledger.config.util.IdentifierMixin
import com.uchuhimo.konf.Config
import com.uchuhimo.konf.source.toml
import net.fabricmc.loader.api.FabricLoader
import net.minecraft.util.Identifier

const val CONFIG_PATH = "ledger.toml"

Expand All @@ -13,6 +15,7 @@ val config: Config = Config {
addSpec(ColorSpec)
addSpec(NetworkingSpec)
}
.apply { this.mapper.addMixIn(Identifier::class.java, IdentifierMixin::class.java) }
.from.toml.resource(CONFIG_PATH)
.from.toml.watchFile(FabricLoader.getInstance().configDir.resolve("ledger.toml").toFile())
.from.env()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.github.quiltservertools.ledger.config.util

import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.core.JsonParser
import com.fasterxml.jackson.databind.DeserializationContext
import com.fasterxml.jackson.databind.JsonDeserializer
import com.fasterxml.jackson.databind.JsonSerializer
import com.fasterxml.jackson.databind.SerializerProvider
import com.fasterxml.jackson.databind.annotation.JsonDeserialize
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import net.minecraft.util.Identifier

object IdentifierSerializer : JsonSerializer<Identifier>() {
override fun serialize(value: Identifier, gen: JsonGenerator, serializers: SerializerProvider) {
gen.writeString(value.toString())
}
}

object IdentifierDeserializer : JsonDeserializer<Identifier>() {
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Identifier = Identifier.of(p.valueAsString)
}

@JsonSerialize(using = IdentifierSerializer::class)
@JsonDeserialize(using = IdentifierDeserializer::class)
abstract class IdentifierMixin

This file was deleted.

0 comments on commit 9e90c7f

Please sign in to comment.