1 files changed, 38 insertions, 29 deletions

diff --git a/src/main/kotlin/util/MoulConfigUtils.kt b/src/main/kotlin/util/MoulConfigUtils.kt
index 362a4d9..51ff340 100644
--- a/src/main/kotlin/util/MoulConfigUtils.kt
+++ b/src/main/kotlin/util/MoulConfigUtils.kt
@@ -35,6 +35,21 @@ import moe.nea.firmament.gui.TickComponent
 import moe.nea.firmament.util.render.isUntranslatedGuiDrawContext
 
 object MoulConfigUtils {
+	@JvmStatic
+	fun main(args: Array<out String>) {
+		generateXSD(File("MoulConfig.xsd"), XMLUniverse.MOULCONFIG_XML_NS)
+		generateXSD(File("MoulConfig.Firmament.xsd"), firmUrl)
+		File("wrapper.xsd").writeText(
+			"""
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:import namespace="http://notenoughupdates.org/moulconfig" schemaLocation="MoulConfig.xsd"/>
+    <xs:import namespace="http://firmament.nea.moe/moulconfig" schemaLocation="MoulConfig.Firmament.xsd"/>
+</xs:schema>
+        """.trimIndent()
+		)
+	}
+
 	val firmUrl = "http://firmament.nea.moe/moulconfig"
 	val universe = XMLUniverse.getDefaultUniverse().also { uni ->
 		uni.registerMapper(java.awt.Color::class.java) {
@@ -81,9 +96,11 @@ object MoulConfigUtils {
 			override fun createInstance(context: XMLContext<*>, element: Element): FirmHoverComponent {
 				return FirmHoverComponent(
 					context.getChildFragment(element),
-					context.getPropertyFromAttribute(element,
-					                                 QName("lines"),
-					                                 List::class.java) as Supplier<List<String>>,
+					context.getPropertyFromAttribute(
+						element,
+						QName("lines"),
+						List::class.java
+					) as Supplier<List<String>>,
 					context.getPropertyFromAttribute(element, QName("delay"), Duration::class.java, 0.6.seconds),
 				)
 			}
@@ -179,10 +196,8 @@ object MoulConfigUtils {
 		uni.registerLoader(object : XMLGuiLoader.Basic<FixedComponent> {
 			override fun createInstance(context: XMLContext<*>, element: Element): FixedComponent {
 				return FixedComponent(
-					context.getPropertyFromAttribute(element, QName("width"), Int::class.java)
-						?: error("Requires width specified"),
-					context.getPropertyFromAttribute(element, QName("height"), Int::class.java)
-						?: error("Requires height specified"),
+					context.getPropertyFromAttribute(element, QName("width"), Int::class.java),
+					context.getPropertyFromAttribute(element, QName("height"), Int::class.java),
 					context.getChildFragment(element)
 				)
 			}
@@ -196,7 +211,7 @@ object MoulConfigUtils {
 			}
 
 			override fun getAttributeNames(): Map<String, Boolean> {
-				return mapOf("width" to true, "height" to true)
+				return mapOf("width" to false, "height" to false)
 			}
 		})
 	}
@@ -210,29 +225,21 @@ object MoulConfigUtils {
 		generator.dumpToFile(file)
 	}
 
-	@JvmStatic
-	fun main(args: Array<out String>) {
-		generateXSD(File("MoulConfig.xsd"), XMLUniverse.MOULCONFIG_XML_NS)
-		generateXSD(File("MoulConfig.Firmament.xsd"), firmUrl)
-		File("wrapper.xsd").writeText("""
-<?xml version="1.0" encoding="UTF-8" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xs:import namespace="http://notenoughupdates.org/moulconfig" schemaLocation="MoulConfig.xsd"/>
-    <xs:import namespace="http://firmament.nea.moe/moulconfig" schemaLocation="MoulConfig.Firmament.xsd"/>
-</xs:schema>
-        """.trimIndent())
-	}
-
-	fun loadScreen(name: String, bindTo: Any, parent: Screen?): Screen {
-		return object : GuiComponentWrapper(loadGui(name, bindTo)) {
+	fun wrapScreen(guiContext: GuiContext, parent: Screen?, onClose: () -> Unit = {}): Screen {
+		return object : GuiComponentWrapper(guiContext) {
 			override fun close() {
 				if (context.onBeforeClose() == CloseEventListener.CloseAction.NO_OBJECTIONS_TO_CLOSE) {
 					client!!.setScreen(parent)
+					onClose()
 				}
 			}
 		}
 	}
 
+	fun loadScreen(name: String, bindTo: Any, parent: Screen?): Screen {
+		return wrapScreen(loadGui(name, bindTo), parent)
+	}
+
 	// TODO: move this utility into moulconfig (also rework guicontext into an interface so i can make this mesh better into vanilla)
 	fun GuiContext.adopt(element: GuiComponent) = element.foldRecursive(Unit, { comp, unit -> comp.context = this })
 
@@ -288,12 +295,14 @@ object MoulConfigUtils {
 		assert(drawContext?.isUntranslatedGuiDrawContext() != false)
 		val context = drawContext?.let(::ModernRenderContext)
 			?: IMinecraft.instance.provideTopLevelRenderContext()
-		val immContext = GuiImmediateContext(context,
-		                                     0, 0, 0, 0,
-		                                     mouseX, mouseY,
-		                                     mouseX, mouseY,
-		                                     mouseX.toFloat(),
-		                                     mouseY.toFloat())
+		val immContext = GuiImmediateContext(
+			context,
+			0, 0, 0, 0,
+			mouseX, mouseY,
+			mouseX, mouseY,
+			mouseX.toFloat(),
+			mouseY.toFloat()
+		)
 		return immContext
 	}