1 files changed, 17 insertions, 11 deletions
diff --git a/src/main/kotlin/gui/config/ManagedConfig.kt b/src/main/kotlin/gui/config/ManagedConfig.kt
index 12b82d6..2f4144c 100644
--- a/src/main/kotlin/gui/config/ManagedConfig.kt
+++ b/src/main/kotlin/gui/config/ManagedConfig.kt
@@ -3,7 +3,6 @@ package moe.nea.firmament.gui.config
 import com.mojang.serialization.Codec
 import io.github.notenoughupdates.moulconfig.ChromaColour
 import io.github.notenoughupdates.moulconfig.gui.CloseEventListener
-import io.github.notenoughupdates.moulconfig.gui.GuiComponentWrapper
 import io.github.notenoughupdates.moulconfig.gui.GuiContext
 import io.github.notenoughupdates.moulconfig.gui.component.CenterComponent
 import io.github.notenoughupdates.moulconfig.gui.component.ColumnComponent
@@ -11,7 +10,9 @@ import io.github.notenoughupdates.moulconfig.gui.component.PanelComponent
 import io.github.notenoughupdates.moulconfig.gui.component.RowComponent
 import io.github.notenoughupdates.moulconfig.gui.component.ScrollPanelComponent
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
+import io.github.notenoughupdates.moulconfig.platform.MoulConfigScreenComponent
 import moe.nea.jarvis.api.Point
+import org.joml.Vector2i
 import org.lwjgl.glfw.GLFW
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonElement
@@ -119,7 +120,7 @@ abstract class ManagedConfig(
 		return option(propertyName, default, BooleanHandler(this))
 	}
 
-	protected fun colour(propertyName: String, default: ()-> ChromaColour) : ManagedOption<ChromaColour> {
+	protected fun colour(propertyName: String, default: () -> ChromaColour): ManagedOption<ChromaColour> {
 		return option(propertyName, default, ColourHandler(this))
 	}
 
@@ -172,13 +173,13 @@ abstract class ManagedConfig(
 		propertyName: String,
 		width: Int,
 		height: Int,
-		default: () -> Point,
+		default: () -> Vector2i,
 	): ManagedOption<HudMeta> {
 		val label = Text.translatable("firmament.config.${name}.${propertyName}")
 		return option(propertyName, {
 			val p = default()
-			HudMeta(HudPosition(p.x, p.y, 1F), label, width, height)
-		}, HudMetaHandler(this, label, width, height))
+			HudMeta(HudPosition(p.x(), p.y(), 1F), Firmament.identifier(propertyName), label, width, height)
+		}, HudMetaHandler(this, propertyName, label, width, height))
 	}
 
 	protected fun keyBinding(
@@ -228,7 +229,8 @@ abstract class ManagedConfig(
 		var screen: Screen? = null
 		val guiapp = GuiAppender(400) { requireNotNull(screen) { "Screen Accessor called too early" } }
 		latestGuiAppender = guiapp
-		guiapp.appendFullRow(RowComponent(
+		guiapp.appendFullRow(
+			RowComponent(
 			FirmButtonComponent(TextComponent("←")) {
 				if (parent != null) {
 					save()
@@ -240,12 +242,16 @@ abstract class ManagedConfig(
 		))
 		sortedOptions.forEach { it.appendToGui(guiapp) }
 		guiapp.reloadables.forEach { it() }
-		val component = CenterComponent(PanelComponent(ScrollPanelComponent(400, 300, ColumnComponent(guiapp.panel)),
-		                                               10,
-		                                               PanelComponent.DefaultBackgroundRenderer.VANILLA))
-		screen = object : GuiComponentWrapper(GuiContext(component)) {
+		val component = CenterComponent(
+			PanelComponent(
+				ScrollPanelComponent(400, 300, ColumnComponent(guiapp.panel)),
+				10,
+				PanelComponent.DefaultBackgroundRenderer.VANILLA
+			)
+		)
+		screen = object : MoulConfigScreenComponent(Text.empty(), GuiContext(component), parent) {
 			override fun close() {
-				if (context.onBeforeClose() == CloseEventListener.CloseAction.NO_OBJECTIONS_TO_CLOSE) {
+				if (guiContext.onBeforeClose() == CloseEventListener.CloseAction.NO_OBJECTIONS_TO_CLOSE) {
 					client!!.setScreen(parent)
 				}
 			}