fix: Init chat screen on init, not ctor, also fix the render order (#36)

* fix: Add the dialog container to chat screen on init, not ctor

* Inject at head, not tail

* Always render chat screen on top of dialog container

* Finish my sentence

Author: lucyydotp

api/src/main/java/com/noxcrew/sheeplib/mixin/ChatScreenMixin.java

@@ -35,11 +35,11 @@ protected ChatScreenMixin(Component component) {
      * Adds the dialog container screen as a child of this screen.
      */
     @Inject(
-            method = "<init>",
-            at = @At("TAIL")
+            method = "init",
+            at = @At("HEAD")
     )
-    public void init(String string, boolean bl, CallbackInfo ci) {
-        this.addWidget(DialogContainer.INSTANCE);
+    public void init(CallbackInfo ci) {
+        this.addRenderableWidget(DialogContainer.INSTANCE);
     }
 
     /**

api/src/main/java/com/noxcrew/sheeplib/mixin/GuiMixin.java

@@ -2,25 +2,36 @@
 
 import com.noxcrew.sheeplib.DialogContainer;
 import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.screens.ChatScreen;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 /**
- * Adds the {@link DialogContainer} as a render layer.
+ * Renders the {@link DialogContainer}.
  */
 @Mixin(Gui.class)
 public class GuiMixin {
+    @Shadow
+    @Final
+    private Minecraft minecraft;
+
     @Inject(
             method = "render",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/client/gui/Gui;renderTabList(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V"
             ))
     public void render(GuiGraphics graphics, DeltaTracker deltaTracker, CallbackInfo ci) {
-        DialogContainer.INSTANCE.render(graphics, deltaTracker);
+        // Only render when not in a chat screen, otherwise chat is rendered over the top of dialogs.
+        if (!(this.minecraft.screen instanceof ChatScreen)) {
+            DialogContainer.INSTANCE.render(graphics, 0, 0, deltaTracker.getGameTimeDeltaTicks());
+        }
     }
 }

api/src/main/kotlin/com/noxcrew/sheeplib/DialogContainer.kt

@@ -21,7 +21,7 @@ import kotlin.reflect.jvm.jvmName
 /**
  * The container for all open dialogs.
  */
-public object DialogContainer : ContainerEventHandler, NarratableEntry {
+public object DialogContainer : ContainerEventHandler, NarratableEntry, Renderable {
 
     private val minecraft = Minecraft.getInstance()
     private val logger = LoggerFactory.getLogger("SheepLib")
@@ -36,13 +36,13 @@ public object DialogContainer : ContainerEventHandler, NarratableEntry {
     private var isDragging: Boolean = false
 
     /** Renders all opened dialogs. */
-    public fun render(guiGraphics: GuiGraphics, deltaTracker: DeltaTracker) {
+    public override fun render(guiGraphics: GuiGraphics, i: Int, j: Int, f: Float) {
         val cursorIsActive = minecraft?.screen is ChatScreen
 
         val childX = if (cursorIsActive) minecraft.mouseHandler.getScaledXPos(minecraft.window) else -1
         val childY = if (cursorIsActive) minecraft.mouseHandler.getScaledYPos(minecraft.window) else -1
         children.value.forEach {
-            (it as Renderable).render(guiGraphics, childX.toInt(), childY.toInt(), deltaTracker.gameTimeDeltaTicks)
+            (it as Renderable).render(guiGraphics, childX.toInt(), childY.toInt(), f)
         }
     }