Use RenderEvent.GUI.Fixed event to render text

Author: IceTank

common/src/main/java/com/lambda/mixin/render/GenericContainerScreenMixin.java

@@ -42,9 +42,6 @@ sealed class RenderEvent {
         class Scaled(scaleFactor: Double) : GUI(scaleFactor)
         class HUD(scaleFactor: Double) : GUI(scaleFactor)
         class Fixed : GUI(1.0)
-        class Container(val genericContainerScreen: GenericContainerScreen, val drawContext: DrawContext, val mouseX: Int, val mouseY: Int, val delta: Float) : GUI(1.0) {
-            val mouse = Vec2d(mouseX, mouseY)
-        }
 
         val screenSize = Vec2d(mc.window.framebufferWidth, mc.window.framebufferHeight) / scale
     }

common/src/main/kotlin/com/lambda/event/events/RenderEvent.kt

@@ -21,18 +21,21 @@ import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.graphics.renderer.gui.FontRenderer
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.Communication.info
 import com.lambda.util.collections.LimitedDecayQueue
-import com.mojang.blaze3d.systems.RenderSystem
-import net.minecraft.client.gui.DrawContext
-import net.minecraft.client.gui.screen.ingame.HandledScreen
+import com.lambda.util.math.Vec2d
+import net.minecraft.client.gui.screen.ingame.GenericContainerScreen
 import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket
-import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.*
+import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.Full
+import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.LookAndOnGround
+import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.OnGroundOnly
+import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.PositionAndOnGround
 import net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket
-import net.minecraft.text.Text
+import java.awt.Color
 import kotlin.math.floor
 
 // ToDo: HUD info
@@ -92,34 +95,33 @@ object PacketLimiter : Module(
                 }
             }
 
-//            [email protected]("Packet sent: ${it.packet::class.simpleName} (${packetQueue.size} / $limit) ${Instant.now()}")
+            //            [email protected]("Packet sent: ${it.packet::class.simpleName} (${packetQueue.size} / $limit) ${Instant.now()}")
             if (packetQueue.add(it)) return@listen
 
             it.cancel()
             this@PacketLimiter.info("Packet limit reached, dropping packet: ${it.packet::class.simpleName} (${packetQueue.size} / $limit)")
         }
 
-        listen<PlayerEvent.SlotClick>{
+        listen<PlayerEvent.SlotClick> {
             if (!limitClickPackets) return@listen
             if (!canSendClickPackets(1)) {
                 it.cancel()
                 return@listen
             }
         }
 
-        listen<RenderEvent.GUI.Container> {
-            if (!limitClickRender) return@listen
-            val renderScreen: HandledScreen<*> = it.genericContainerScreen
-            val context: DrawContext = it.drawContext
-            val x = renderScreen.x
-            val y = renderScreen.y
-
-            RenderSystem.disableDepthTest()
+        listen<RenderEvent.GUI.Fixed> {
+            if (!limitClickRender) {
+                return@listen
+            }
+            val sh = mc.currentScreen as? GenericContainerScreen ?: return@listen
             val remainingText = "Clicks Remaining: $clickPacketsRemaining"
-            context.drawText(renderScreen.textRenderer, Text.literal(remainingText), x + renderScreen.backgroundWidth, y, 4210752, false)
-            RenderSystem.enableDepthTest()
+            val mcScale = mc.window.scaleFactor
+            val fontScale = mcScale * 1.5
+            val fontHeight = FontRenderer.getHeight(fontScale)
+            FontRenderer.drawString(remainingText, Vec2d(sh.x * mcScale, sh.y * mcScale - fontHeight), Color(0x9DFFFF), fontScale, false)
         }
     }
 
-    fun canSendClickPackets(packets: Int) = clickPacketQueue.size + packets < clickPacketsWindowAmount
+    fun canSendClickPackets(packets: Int) = clickPacketQueue.size + packets <= clickPacketsWindowAmount
 }

common/src/main/kotlin/com/lambda/module/modules/network/PacketLimiter.kt

@@ -37,7 +37,6 @@
     "render.DebugHudMixin",
     "render.ElytraFeatureRendererMixin",
     "render.GameRendererMixin",
-    "render.GenericContainerScreenMixin",
     "render.GlStateManagerMixin",
     "render.HandledScreenMixin",
     "render.InGameHudMixin",