fixes

DeDiamondPro · Oct 30, 2022 · dcb50e0 · dcb50e0
1 parent 51ef1f5
commit dcb50e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/main/kotlin/dev/dediamondpro/skyguide/hud/MiniMap.kt b/src/main/kotlin/dev/dediamondpro/skyguide/hud/MiniMap.kt
@@ -27,7 +27,7 @@ class MiniMap {
     private var prevImage: Textures? = null
 
     @SubscribeEvent
-    fun draw(event: RenderGameOverlayEvent) {
+    fun draw(event: RenderGameOverlayEvent.Post) {
         if (event.type != RenderGameOverlayEvent.ElementType.ALL || !shouldShow()) return
         val island = SkyblockMap.getCurrentIsland() ?: return
         val scale = Config.miniMapScale
@@ -90,9 +90,14 @@ class MiniMap {
             if (Config.smoothImages) GL11.GL_LINEAR else GL11.GL_NEAREST
         )
         UGraphics.color4f(1f, 1f, 1f, 1f)
-        GL11.glDisable(GL11.GL_SCISSOR_TEST)
         UGraphics.GL.popMatrix()
         UGraphics.GL.pushMatrix()
+        GL11.glScissor(
+            (x * UResolution.scaleFactor).toInt(),
+            ((UResolution.scaledHeight - y - 150 * scale) * UResolution.scaleFactor).toInt(),
+            (150f * scale * UResolution.scaleFactor).toInt(),
+            (150f * scale * UResolution.scaleFactor).toInt()
+        )
         UGraphics.GL.translate(x + 75.0 * scale, y + 75.0 * scale, 0.0)
         if (!Config.rotateWithPlayer) {
             UGraphics.GL.rotate(
@@ -109,6 +114,7 @@ class MiniMap {
             Config.miniMapPointerSize * scale,
             Config.miniMapPointerSize * scale
         )
+        GL11.glDisable(GL11.GL_SCISSOR_TEST)
         UGraphics.GL.popMatrix()
         if (fadeProgress == 1f) {
             if (island != prevIsland) prevIsland = island

diff --git a/src/main/kotlin/dev/dediamondpro/skyguide/utils/GuiUtils.kt b/src/main/kotlin/dev/dediamondpro/skyguide/utils/GuiUtils.kt
@@ -4,8 +4,10 @@ import gg.essential.universal.UMinecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraftforge.client.event.GuiScreenEvent
 import net.minecraftforge.client.event.RenderGameOverlayEvent
+import net.minecraftforge.client.event.RenderWorldEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent.Phase
 import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent
 import org.lwjgl.input.Mouse
@@ -14,7 +16,7 @@ import kotlin.math.absoluteValue
 class GuiUtils {
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRenderEvent(event: RenderTickEvent) {
-        if (event.phase != Phase.START) return
+        if (event.phase != Phase.START || event.type != TickEvent.Type.RENDER) return
         if (time == -1L) {
             time = UMinecraft.getTime()
             return
@@ -48,9 +50,9 @@ class GuiUtils {
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
-    fun onHudRenderEvent(event: RenderGameOverlayEvent.Pre) {
+    fun onHudRenderEvent(event: RenderGameOverlayEvent.Post) {
         if (event.type != RenderGameOverlayEvent.ElementType.ALL) return
-        hudDeltaTime = -1L
+        hudDeltaTime = 0L
     }
 
     companion object {