Compare commits

..

2 Commits

Author SHA1 Message Date
2aaeb7b039
Bump version to 0.3.6
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
2025-04-16 20:24:34 +02:00
6416a03001
Fix my stupid configuration system
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
2025-04-16 20:20:05 +02:00
3 changed files with 11 additions and 20 deletions

View File

@ -26,7 +26,7 @@ plugins {
} }
group = "fr.username404" group = "fr.username404"
version = "0.3.5" version = "0.3.6"
val groupAndName = "${rootProject.group}.${rootProject.name.lowercase()}" val groupAndName = "${rootProject.group}.${rootProject.name.lowercase()}"
val javaVer: String = "21" val javaVer: String = "21"

View File

@ -95,11 +95,7 @@ object Configuration {
val enabledFeatures = mutableMapOf<String, Boolean>().apply { val enabledFeatures = mutableMapOf<String, Boolean>().apply {
"enabledFeatures".let { obtained.run { "enabledFeatures".let { obtained.run {
if (hasPath(it)) { if (hasPath(it)) {
putAll(extract<Map<out String, Boolean>>(it).filterKeys { keyName -> ClickGui.clickBoxes.any { putAll(extract<Map<out String, Boolean>>(it))
it.buttons.any { button ->
button.info.shouldSave() && button.title == keyName
}
}})
} }
} } } }
} }

View File

@ -17,25 +17,20 @@ sealed class ButtonImpl: ColoredElement(0.0, 0.0, 73, 8, opacity = 0.60F) {
private fun addButtons(vararg buttons: ButtonImpl) { private fun addButtons(vararg buttons: ButtonImpl) {
buttons.groupBy { impl -> buttons.groupBy { impl ->
ClickGui.clickBoxes.find { box -> ClickGui.clickBoxes.find { box ->
with(impl) { box.isCategory(impl.info.parent)
}
}.entries.forEach { entry -> entry.run {
key?.buttons?.clear()
value.forEach { if (!it.isDisabled) {
key?.buttons?.add(it.apply {
if (info.shouldSave() && !info.parent.shouldHide) { if (info.shouldSave() && !info.parent.shouldHide) {
Configuration.enabledFeatures[title]?.let { bool -> Configuration.enabledFeatures[title]?.let { bool ->
toggled = bool toggled = bool
} }
} }
box.isCategory(info.parent) })
} } }
} } }
}.entries.forEach { entry ->
with(entry) {
key?.buttons?.clear()
value.forEach {
if (!it.isDisabled) {
key?.buttons?.add(it)
}
}
}
}
} }
@JvmStatic @JvmStatic
fun initButtons() = addButtons( fun initButtons() = addButtons(