Skip to content

Commit 06acbfe

Browse files
committed
revert: Multiple tag support
1 parent 7b97530 commit 06acbfe

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@ import com.lambda.util.math.Vec2d
77
import java.lang.reflect.Type
88

99
object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWindow> {
10-
1110
override fun serialize(
1211
src: TagWindow?,
1312
typeOfSrc: Type?,
1413
context: JsonSerializationContext?,
1514
): JsonElement = src?.let {
1615
JsonObject().apply {
1716
addProperty("title", it.title)
18-
addProperty("tag", it.tag.name)
17+
add("tags", JsonArray().apply {
18+
it.tags.forEach { tag ->
19+
add(tag.name)
20+
}
21+
})
1922
addProperty("width", it.width)
2023
addProperty("height", it.height)
2124
addProperty("isOpen", it.isOpen)
@@ -32,7 +35,9 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
3235
context: JsonDeserializationContext?,
3336
) = json?.asJsonObject?.let {
3437
TagWindow(
35-
tag = ModuleTag(it["tag"].asString),
38+
tags = it["tags"].asJsonArray.map { tag ->
39+
ModuleTag(tag.asString)
40+
}.toSet(),
3641
title = it["title"].asString,
3742
width = it["width"].asDouble,
3843
height = it["height"].asDouble

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/TagWindow.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import com.lambda.module.modules.client.ClickGui
77
import com.lambda.module.tag.ModuleTag
88

99
class TagWindow(
10-
val tag: ModuleTag,
11-
override var title: String = tag.name,
10+
val tags: Set<ModuleTag> = setOf(),
11+
override var title: String = "Untitled",
1212
override var width: Double = 110.0,
1313
override var height: Double = 300.0
1414
) : WindowComponent<ModuleButton>() {
1515
init {
16-
ModuleRegistry.modules/*.filter { module ->
17-
module.customTags.value.any { it.name.equals(tag.name, true) }
18-
}*/.forEach {
16+
ModuleRegistry.modules.filter { module ->
17+
module.customTags.value.any(tags::contains)
18+
}.forEach {
1919
children.add(ModuleButton(it, this))
2020
}
2121
}

0 commit comments

Comments
 (0)