11 files changed, 44 insertions, 44 deletions
diff --git a/src/main/kotlin/gui/config/AllConfigsGui.kt b/src/main/kotlin/gui/config/AllConfigsGui.kt
index 869bda6..60711ca 100644
--- a/src/main/kotlin/gui/config/AllConfigsGui.kt
+++ b/src/main/kotlin/gui/config/AllConfigsGui.kt
@@ -2,8 +2,8 @@ package moe.nea.firmament.gui.config
 
 import io.github.notenoughupdates.moulconfig.observer.ObservableList
 import io.github.notenoughupdates.moulconfig.xml.Bind
-import net.minecraft.client.gui.screen.Screen
-import net.minecraft.text.Text
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.commands.RestArgumentType
 import moe.nea.firmament.commands.get
@@ -41,12 +41,12 @@ object AllConfigsGui {
 
 		@Bind
 		fun close() {
-			MC.screen?.close()
+			MC.screen?.onClose()
 		}
 
 		class EntryMapping(val config: ManagedConfig) {
 			@Bind
-			fun name() = Text.translatable("firmament.config.${config.name}")
+			fun name() = Component.translatable("firmament.config.${config.name}")
 
 			@Bind
 			fun openEditor() {
diff --git a/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt b/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt
index 8ecdfa2..6495e68 100644
--- a/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt
+++ b/src/main/kotlin/gui/config/BuiltInConfigScreenProvider.kt
@@ -1,7 +1,7 @@
 package moe.nea.firmament.gui.config
 
 import com.google.auto.service.AutoService
-import net.minecraft.client.gui.screen.Screen
+import net.minecraft.client.gui.screens.Screen
 
 @AutoService(FirmamentConfigScreenProvider::class)
 class BuiltInConfigScreenProvider : FirmamentConfigScreenProvider {
diff --git a/src/main/kotlin/gui/config/ChoiceHandler.kt b/src/main/kotlin/gui/config/ChoiceHandler.kt
index 321b40d..494d08a 100644
--- a/src/main/kotlin/gui/config/ChoiceHandler.kt
+++ b/src/main/kotlin/gui/config/ChoiceHandler.kt
@@ -7,7 +7,7 @@ import io.github.notenoughupdates.moulconfig.gui.component.RowComponent
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import kotlinx.serialization.json.JsonElement
 import kotlin.jvm.optionals.getOrNull
-import net.minecraft.util.StringIdentifiable
+import net.minecraft.util.StringRepresentable
 import moe.nea.firmament.gui.CheckboxComponent
 import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.data.ManagedConfig
@@ -16,8 +16,8 @@ import moe.nea.firmament.util.json.KJsonOps
 class ChoiceHandler<E>(
 	val enumClass: Class<E>,
 	val universe: List<E>,
-) : ManagedConfig.OptionHandler<E> where E : Enum<E>, E : StringIdentifiable {
-	val codec = StringIdentifiable.createCodec {
+) : ManagedConfig.OptionHandler<E> where E : Enum<E>, E : StringRepresentable {
+	val codec = StringRepresentable.fromEnum {
 		@Suppress("UNCHECKED_CAST", "PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 		(universe as java.util.List<*>).toArray(arrayOfNulls<Enum<E>>(0)) as Array<E>
 	}
diff --git a/src/main/kotlin/gui/config/EnumRenderer.kt b/src/main/kotlin/gui/config/EnumRenderer.kt
index 3b80b7e..a2dee69 100644
--- a/src/main/kotlin/gui/config/EnumRenderer.kt
+++ b/src/main/kotlin/gui/config/EnumRenderer.kt
@@ -1,14 +1,14 @@
 package moe.nea.firmament.gui.config
 
-import net.minecraft.text.Text
+import net.minecraft.network.chat.Component
 
 interface EnumRenderer<E : Any> {
-	fun getName(option: ManagedOption<E>, value: E): Text
+	fun getName(option: ManagedOption<E>, value: E): Component
 
 	companion object {
 		fun <E : Enum<E>> default() = object : EnumRenderer<E> {
-			override fun getName(option: ManagedOption<E>, value: E): Text {
-				return Text.translatable(option.rawLabelText + ".choice." + value.name.lowercase())
+			override fun getName(option: ManagedOption<E>, value: E): Component {
+				return Component.translatable(option.rawLabelText + ".choice." + value.name.lowercase())
 			}
 		}
 	}
diff --git a/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
index 8700ffa..d2a8ab6 100644
--- a/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
+++ b/src/main/kotlin/gui/config/FirmamentConfigScreenProvider.kt
@@ -1,6 +1,6 @@
 package moe.nea.firmament.gui.config
 
-import net.minecraft.client.gui.screen.Screen
+import net.minecraft.client.gui.screens.Screen
 import moe.nea.firmament.util.compatloader.CompatLoader
 
 interface FirmamentConfigScreenProvider {
diff --git a/src/main/kotlin/gui/config/GuiAppender.kt b/src/main/kotlin/gui/config/GuiAppender.kt
index 329319d..ba28400 100644
--- a/src/main/kotlin/gui/config/GuiAppender.kt
+++ b/src/main/kotlin/gui/config/GuiAppender.kt
@@ -6,8 +6,8 @@ import io.github.notenoughupdates.moulconfig.gui.GuiComponent
 import io.github.notenoughupdates.moulconfig.gui.component.RowComponent
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import io.github.notenoughupdates.moulconfig.observer.GetSetter
-import net.minecraft.client.gui.screen.Screen
-import net.minecraft.text.Text
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.gui.FixedComponent
 
 class GuiAppender(val width: Int, val screenAccessor: () -> Screen) {
@@ -18,7 +18,7 @@ class GuiAppender(val width: Int, val screenAccessor: () -> Screen) {
         reloadables.add(reloadable)
     }
 
-    fun appendLabeledRow(label: Text, right: GuiComponent) {
+    fun appendLabeledRow(label: Component, right: GuiComponent) {
         appendSplitRow(
             TextComponent(label.string),
             right
diff --git a/src/main/kotlin/gui/config/HudMetaHandler.kt b/src/main/kotlin/gui/config/HudMetaHandler.kt
index fae827d..915dcf3 100644
--- a/src/main/kotlin/gui/config/HudMetaHandler.kt
+++ b/src/main/kotlin/gui/config/HudMetaHandler.kt
@@ -5,9 +5,9 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.decodeFromJsonElement
 import kotlinx.serialization.json.encodeToJsonElement
-import net.minecraft.client.gui.screen.Screen
-import net.minecraft.text.MutableText
-import net.minecraft.text.Text
+import net.minecraft.client.gui.screens.Screen
+import net.minecraft.network.chat.MutableComponent
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.gui.FirmButtonComponent
 import moe.nea.firmament.jarvis.JarvisIntegration
@@ -15,11 +15,11 @@ import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.data.ManagedConfig
 
 class HudMetaHandler(
-	val config: ManagedConfig,
-	val propertyName: String,
-	val label: MutableText,
-	val width: Int,
-	val height: Int
+    val config: ManagedConfig,
+    val propertyName: String,
+    val label: MutableComponent,
+    val width: Int,
+    val height: Int
 ) :
 	ManagedConfig.OptionHandler<HudMeta> {
 	override fun toJson(element: HudMeta): JsonElement? {
@@ -42,7 +42,7 @@ class HudMetaHandler(
 			opt.labelText,
 			FirmButtonComponent(
 				TextComponent(
-					Text.stringifiedTranslatable("firmament.hud.edit", label).string
+					Component.translatableEscape("firmament.hud.edit", label).string
 				),
 			) {
 				openEditor(opt, guiAppender.screenAccessor())
diff --git a/src/main/kotlin/gui/config/JAnyHud.kt b/src/main/kotlin/gui/config/JAnyHud.kt
index 1cde4f9..63975c6 100644
--- a/src/main/kotlin/gui/config/JAnyHud.kt
+++ b/src/main/kotlin/gui/config/JAnyHud.kt
@@ -5,8 +5,8 @@ import org.joml.Matrix3x2f
 import org.joml.Vector2i
 import org.joml.Vector2ic
 import kotlinx.serialization.Serializable
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import moe.nea.firmament.jarvis.JarvisIntegration
 
 @Serializable
@@ -18,13 +18,13 @@ data class HudPosition(
 
 
 data class HudMeta(
-	val position: HudPosition,
-	private val id: Identifier,
-	private val label: Text,
-	private val width: Int,
-	private val height: Int,
+    val position: HudPosition,
+    private val id: ResourceLocation,
+    private val label: Component,
+    private val width: Int,
+    private val height: Int,
 ) : JarvisHud, JarvisHud.Scalable {
-	override fun getLabel(): Text = label
+	override fun getLabel(): Component = label
 	override fun getUnscaledWidth(): Int {
 		return width
 	}
@@ -33,7 +33,7 @@ data class HudMeta(
 		return height
 	}
 
-	override fun getHudId(): Identifier {
+	override fun getHudId(): ResourceLocation {
 		return id
 	}
 
diff --git a/src/main/kotlin/gui/config/KeyBindingStateManager.kt b/src/main/kotlin/gui/config/KeyBindingStateManager.kt
index d8ec359..9cf2771 100644
--- a/src/main/kotlin/gui/config/KeyBindingStateManager.kt
+++ b/src/main/kotlin/gui/config/KeyBindingStateManager.kt
@@ -8,8 +8,8 @@ import io.github.notenoughupdates.moulconfig.gui.KeyboardEvent
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
 import io.github.notenoughupdates.moulconfig.platform.MoulConfigPlatform
 import org.lwjgl.glfw.GLFW
-import net.minecraft.text.Text
-import net.minecraft.util.Formatting
+import net.minecraft.network.chat.Component
+import net.minecraft.ChatFormatting
 import moe.nea.firmament.gui.FirmButtonComponent
 import moe.nea.firmament.keybindings.GenericInputButton
 import moe.nea.firmament.keybindings.InputModifiers
@@ -23,7 +23,7 @@ class KeyBindingStateManager(
 ) {
 	var editing = false
 	var lastPressed: GenericInputButton? = null
-	var label: Text = Text.literal("")
+	var label: Component = Component.literal("")
 
 	fun onClick(mouseButton: Int) {
 		if (editing) {
@@ -89,14 +89,14 @@ class KeyBindingStateManager(
 	fun updateLabel() {
 		var stroke = value().format()
 		if (editing) {
-			stroke = Text.empty()
+			stroke = Component.empty()
 			val modifiers = InputModifiers.current()
 			if (!modifiers.isEmpty()) {
 				stroke.append(modifiers.format())
 				stroke.append(" + ")
 			}
 			stroke.append("???")
-			stroke.styled { it.withColor(Formatting.YELLOW) }
+			stroke.withStyle { it.withColor(ChatFormatting.YELLOW) }
 		}
 		label = stroke
 	}
diff --git a/src/main/kotlin/gui/config/ManagedOption.kt b/src/main/kotlin/gui/config/ManagedOption.kt
index 1f742a7..4c228de 100644
--- a/src/main/kotlin/gui/config/ManagedOption.kt
+++ b/src/main/kotlin/gui/config/ManagedOption.kt
@@ -5,7 +5,7 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
-import net.minecraft.text.Text
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.util.ErrorUtil
 import moe.nea.firmament.util.data.ManagedConfig
 
@@ -24,9 +24,9 @@ class ManagedOption<T : Any>(
 	}
 
 	val rawLabelText = "firmament.config.${element.name}.${propertyName}"
-	val labelText: Text = Text.translatable(rawLabelText)
+	val labelText: Component = Component.translatable(rawLabelText)
 	val descriptionTranslationKey = "firmament.config.${element.name}.${propertyName}.description"
-	val labelDescription: Text = Text.translatable(descriptionTranslationKey)
+	val labelDescription: Component = Component.translatable(descriptionTranslationKey)
 
 	var _actualValue: T? = null
 	var value: T
diff --git a/src/main/kotlin/gui/config/StringHandler.kt b/src/main/kotlin/gui/config/StringHandler.kt
index f1eacab..17bb981 100644
--- a/src/main/kotlin/gui/config/StringHandler.kt
+++ b/src/main/kotlin/gui/config/StringHandler.kt
@@ -7,7 +7,7 @@ import io.github.notenoughupdates.moulconfig.observer.GetSetter
 import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonPrimitive
-import net.minecraft.text.Text
+import net.minecraft.network.chat.Component
 import moe.nea.firmament.util.data.ManagedConfig
 
 class StringHandler(val config: ManagedConfig) : ManagedConfig.OptionHandler<String> {
@@ -30,7 +30,7 @@ class StringHandler(val config: ManagedConfig) : ManagedConfig.OptionHandler<Str
                     }
                 },
                 130,
-                suggestion = Text.translatableWithFallback(opt.rawLabelText + ".hint", "").string
+                suggestion = Component.translatableWithFallback(opt.rawLabelText + ".hint", "").string
             ),
         )
     }