Fix line renderer

2 files changed, 26 insertions, 3 deletions

diff --git a/src/main/kotlin/events/DebugInstantiateEvent.kt b/src/main/kotlin/events/DebugInstantiateEvent.kt
new file mode 100644
index 0000000..3470a8c
--- /dev/null
+++ b/src/main/kotlin/events/DebugInstantiateEvent.kt
@@ -0,0 +1,9 @@
+package moe.nea.firmament.events
+
+/**
+ * Called in a devenv after minecraft has been initialized. This event should be used to force instantiation of lazy
+ * variables (and similar late init) to cause any possible issues to materialize.
+ */
+class DebugInstantiateEvent : FirmamentEvent() {
+	companion object : FirmamentEventBus<DebugInstantiateEvent>()
+}
diff --git a/src/main/kotlin/util/render/FirmamentShaders.kt b/src/main/kotlin/util/render/FirmamentShaders.kt
index 5147088..ba67dbb 100644
--- a/src/main/kotlin/util/render/FirmamentShaders.kt
+++ b/src/main/kotlin/util/render/FirmamentShaders.kt
@@ -3,14 +3,28 @@ package moe.nea.firmament.util.render
 import net.minecraft.client.gl.Defines
 import net.minecraft.client.gl.ShaderProgramKey
 import net.minecraft.client.render.RenderPhase
+import net.minecraft.client.render.VertexFormat
 import net.minecraft.client.render.VertexFormats
 import moe.nea.firmament.Firmament
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.events.DebugInstantiateEvent
+import moe.nea.firmament.util.MC
 
 object FirmamentShaders {
+	val shaders = mutableListOf<ShaderProgramKey>()
 
+	private fun shader(name: String, format: VertexFormat, defines: Defines): ShaderProgramKey {
+		val key = ShaderProgramKey(Firmament.identifier(name), format, defines)
+		shaders.add(key)
+		return key
+	}
 
-	val _LINES: ShaderProgramKey =
-		ShaderProgramKey(Firmament.identifier("rendertype_lines"), VertexFormats.LINES, Defines.EMPTY)
-	val LINES = RenderPhase.ShaderProgram(_LINES)
+	val LINES = RenderPhase.ShaderProgram(shader("core/rendertype_lines", VertexFormats.LINES, Defines.EMPTY))
 
+	@Subscribe
+	fun debugLoad(event: DebugInstantiateEvent) {
+		shaders.forEach {
+			MC.instance.shaderLoader.getOrCreateProgram(it)
+		}
+	}
 }