diff --git a/build.gradle.kts b/build.gradle.kts index 372df36..275097a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,10 +20,10 @@ base { group = "net.shadowfacts" version = "0.1.0" -val minecraftVersion = "1.14.2" -val yarnMappings = "1.14.2+build.7" -val loaderVersion = "0.4.8+build.155" -val fabricVersion = "0.3.0+build.185" +val minecraftVersion = "1.14.4" +val yarnMappings = "1.14.4+build.9" +val loaderVersion = "0.4.8+build.159" +val fabricVersion = "0.3.1+build.208" val fabricKotlinVersion = "1.3.40+build.1" val junitVersion = "5.4.0" diff --git a/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt b/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt index 996a1a5..9561f80 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt @@ -2,8 +2,8 @@ package net.shadowfacts.cacao import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.screen.Screen -import net.minecraft.network.chat.TextComponent import net.minecraft.sound.SoundEvents +import net.minecraft.text.LiteralText import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.util.MouseButton import net.shadowfacts.cacao.util.RenderHelper @@ -16,7 +16,7 @@ import java.util.* * * @author shadowfacts */ -open class CacaoScreen: Screen(TextComponent("CacaoScreen")) { +open class CacaoScreen: Screen(LiteralText("CacaoScreen")) { // _windows is the internal, mutable object, since we only want it to by mutated by the add/removeWindow methods. private val _windows = LinkedList() diff --git a/src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt b/src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt index 83b9cda..992f349 100644 --- a/src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt @@ -1,6 +1,5 @@ package net.shadowfacts.cacao.view -import net.minecraft.ChatFormat import net.shadowfacts.cacao.Window import net.shadowfacts.cacao.geometry.Axis import net.shadowfacts.cacao.util.Color @@ -50,7 +49,7 @@ class DialogView( vStack = hStack.addArrangedSubview(StackView(Axis.VERTICAL, spacing = 4.0)) - vStack.addArrangedSubview(Label(ChatFormat.BOLD.toString() + title, shadow = false).apply { + vStack.addArrangedSubview(Label(title, shadow = false).apply { textColor = Color(0x404040) }) messageLabel = vStack.addArrangedSubview(Label(message, shadow = false).apply {