Switch to yarn mappings

This commit is contained in:
nea
2022-08-27 01:38:49 +02:00
parent 4c7bd601c4
commit 973c13e84f
18 changed files with 142 additions and 129 deletions

View File

@@ -10,7 +10,7 @@ import io.github.cottonmc.cotton.gui.widget.data.Insets
import io.github.cottonmc.cotton.gui.widget.data.VerticalAlignment
import moe.nea.notenoughupdates.NotEnoughUpdates
import moe.nea.notenoughupdates.util.ConfigHolder
import net.minecraft.network.chat.Component
import net.minecraft.text.Text
import kotlin.reflect.KMutableProperty1
class ConfigGui<K>(val holder: ConfigHolder<K>, val build: ConfigGui<K>.() -> Unit) : LightweightGuiDescription() {
@@ -24,48 +24,48 @@ class ConfigGui<K>(val holder: ConfigHolder<K>, val build: ConfigGui<K>.() -> Un
reload()
}
fun title(component: Component) {
fun title(text: Text) {
if (col != 0) {
NotEnoughUpdates.logger.warn("Set title not at the top of the ConfigGui")
}
val label = WLabel(component)
val label = WLabel(text)
label.verticalAlignment = VerticalAlignment.TOP
label.horizontalAlignment = HorizontalAlignment.CENTER
root.add(label, 0, col, 11, 1)
col++
}
private fun label(component: Component) {
val label = WLabel(component)
private fun label(text: Text) {
val label = WLabel(text)
label.verticalAlignment = VerticalAlignment.CENTER
root.add(label, 0, col, 5, 1)
}
fun toggle(component: Component, prop: KMutableProperty1<K, Boolean>) {
val toggle = WToggleButton(component)
fun toggle(text: Text, prop: KMutableProperty1<K, Boolean>) {
val toggle = WToggleButton(text)
reloadables.add { toggle.toggle = prop.get(holder.config) }
toggle.setOnToggle {
prop.set(holder.config, true)
holder.markDirty()
}
root.add(toggle, 5, col, 6, 1)
label(component)
label(text)
col++
}
fun button(component: Component, buttonText: Component, runnable: () -> Unit) {
fun button(text: Text, buttonText: Text, runnable: () -> Unit) {
val button = WButton(buttonText)
button.setOnClick {
runnable.invoke()
}
root.add(button, 5, col, 6, 1)
label(component)
label(text)
col++
}
fun textfield(
component: Component,
background: Component,
text: Text,
background: Text,
prop: KMutableProperty1<K, String>,
maxLength: Int = 255
) {
@@ -80,7 +80,7 @@ class ConfigGui<K>(val holder: ConfigHolder<K>, val build: ConfigGui<K>.() -> Un
holder.markDirty()
}
root.add(textfield, 5, col, 6, 11)
label(component)
label(text)
col++
}

View File

@@ -1,31 +1,31 @@
package moe.nea.notenoughupdates.gui
import moe.nea.notenoughupdates.repo.RepoManager
import net.minecraft.network.chat.Component
import net.minecraft.text.Text
fun repoGui(): ConfigGui<RepoManager.Config> {
return ConfigGui(RepoManager) {
title(Component.literal("NotEnoughUpdates Repo Settings"))
toggle(Component.literal("Auto Update"), RepoManager.Config::autoUpdate)
title(Text.literal("NotEnoughUpdates Repo Settings"))
toggle(Text.literal("Auto Update"), RepoManager.Config::autoUpdate)
textfield(
Component.literal("Repo Username"),
Component.literal("<github user>"),
Text.literal("Repo Username"),
Text.literal("<github user>"),
RepoManager.Config::user,
maxLength = 255
)
textfield(
Component.literal("Repo Name"),
Component.literal("<repo name>"),
Text.literal("Repo Name"),
Text.literal("<repo name>"),
RepoManager.Config::repo
)
textfield(
Component.literal("Repo Branch"),
Component.literal("<repo branch>"),
Text.literal("Repo Branch"),
Text.literal("<repo branch>"),
RepoManager.Config::branch
)
button(
Component.literal("Reset to Defaults"),
Component.literal("Reset"),
Text.literal("Reset to Defaults"),
Text.literal("Reset"),
) {
RepoManager.config.user = "NotEnoughUpdates"
RepoManager.config.repo = "NotEnoughUpdates-REPO"