1 files changed, 47 insertions, 45 deletions
diff --git a/src/main/kotlin/gui/hud/MoulConfigHud.kt b/src/main/kotlin/gui/hud/MoulConfigHud.kt
index e99b069..8259ebe 100644
--- a/src/main/kotlin/gui/hud/MoulConfigHud.kt
+++ b/src/main/kotlin/gui/hud/MoulConfigHud.kt
@@ -1,66 +1,68 @@
-
 package moe.nea.firmament.gui.hud
 
-import io.github.notenoughupdates.moulconfig.gui.GuiComponentWrapper
 import io.github.notenoughupdates.moulconfig.gui.GuiContext
 import io.github.notenoughupdates.moulconfig.gui.component.TextComponent
+import io.github.notenoughupdates.moulconfig.platform.MoulConfigScreenComponent
 import net.minecraft.resource.ResourceManager
 import net.minecraft.resource.SynchronousResourceReloader
+import net.minecraft.text.Text
 import moe.nea.firmament.events.FinalizeResourceManagerEvent
 import moe.nea.firmament.events.HudRenderEvent
 import moe.nea.firmament.gui.config.HudMeta
+import moe.nea.firmament.jarvis.JarvisIntegration
 import moe.nea.firmament.util.MC
 import moe.nea.firmament.util.MoulConfigUtils
 
 abstract class MoulConfigHud(
-    val name: String,
-    val hudMeta: HudMeta,
+	val name: String,
+	val hudMeta: HudMeta,
 ) {
-    companion object {
-        private val componentWrapper by lazy {
-            object : GuiComponentWrapper(GuiContext(TextComponent("§cERROR"))) {
-                init {
-                    this.client = MC.instance
-                }
-            }
-        }
-    }
+	companion object {
+		private val componentWrapper by lazy {
+			object : MoulConfigScreenComponent(Text.empty(), GuiContext(TextComponent("§cERROR")), null) {
+				init {
+					this.client = MC.instance
+				}
+			}
+		}
+	}
 
-    private var fragment: GuiContext? = null
+	private var fragment: GuiContext? = null
 
-    fun forceInit() {
-    }
+	fun forceInit() {
+	}
 
-    open fun shouldRender(): Boolean {
-        return true
-    }
+	open fun shouldRender(): Boolean {
+		return true
+	}
 
-    init {
-        require(name.matches("^[a-z_/]+$".toRegex()))
-        HudRenderEvent.subscribe("MoulConfigHud:render") {
-            if (!shouldRender()) return@subscribe
-            val renderContext = componentWrapper.createContext(it.context)
-            if (fragment == null)
-                loadFragment()
-            it.context.matrices.push()
-            hudMeta.applyTransformations(it.context.matrices)
-            val renderContextTranslated =
-                renderContext.translated(hudMeta.absoluteX, hudMeta.absoluteY, hudMeta.width, hudMeta.height)
-                    .scaled(hudMeta.scale)
-            fragment!!.root.render(renderContextTranslated)
-            it.context.matrices.pop()
-        }
-        FinalizeResourceManagerEvent.subscribe("MoulConfigHud:finalizeResourceManager") {
-            MC.resourceManager.registerReloader(object : SynchronousResourceReloader {
-                override fun reload(manager: ResourceManager?) {
-                    fragment = null
-                }
-            })
-        }
-    }
+	init {
+		require(name.matches("^[a-z_/]+$".toRegex()))
+		HudRenderEvent.subscribe("MoulConfigHud:render") {
+			if (!shouldRender()) return@subscribe
+			val renderContext = componentWrapper.createContext(it.context)
+			if (fragment == null)
+				loadFragment()
+			it.context.matrices.pushMatrix()
+			hudMeta.applyTransformations(it.context.matrices)
+			val pos = hudMeta.getEffectivePosition(JarvisIntegration.jarvis)
+			val renderContextTranslated =
+				renderContext.translated(pos.x(), pos.y(), hudMeta.effectiveWidth, hudMeta.effectiveHeight)
+					.scaled(hudMeta.scale)
+			fragment!!.root.render(renderContextTranslated)
+			it.context.matrices.popMatrix()
+		}
+		FinalizeResourceManagerEvent.subscribe("MoulConfigHud:finalizeResourceManager") {
+			MC.resourceManager.registerReloader(object : SynchronousResourceReloader {
+				override fun reload(manager: ResourceManager?) {
+					fragment = null
+				}
+			})
+		}
+	}
 
-    fun loadFragment() {
-        fragment = MoulConfigUtils.loadGui(name, this)
-    }
+	fun loadFragment() {
+		fragment = MoulConfigUtils.loadGui(name, this)
+	}
 
 }