From aca189fe13935e641c0cac3b91693c6c3fcf91c7 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 12 Oct 2023 22:56:15 +0200
Subject: fixed globalRender description and replaced RenderWorldLastEvent with
 LorenzRenderWorldEvent

---
 .../at/hannibal2/skyhanni/data/GuiEditManager.kt   |  2 +-
 .../at/hannibal2/skyhanni/data/ItemTipHelper.kt    |  2 +-
 .../java/at/hannibal2/skyhanni/data/RenderData.kt  | 51 ++++++++++++++++++++++
 .../at/hannibal2/skyhanni/data/RenderGuiData.kt    | 43 ------------------
 4 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/RenderData.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index 69cbb0dd3..fa633eaa4 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -66,7 +66,7 @@ class GuiEditManager {
         @JvmStatic
         fun renderLast() {
             if (!isInGui()) return
-            if (!SkyHanniDebugsAndTests.globalRenderToggle) return
+            if (!SkyHanniDebugsAndTests.globalRender) return
 
             GlStateManager.translate(0f, 0f, 200f)
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
index f48829e22..22d299f17 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
@@ -40,7 +40,7 @@ class ItemTipHelper {
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRenderInventoryItemOverlayPost(event: DrawScreenAfterEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniDebugsAndTests.globalRenderToggle) return
+        if (!SkyHanniDebugsAndTests.globalRender) return
 
         val gui = Minecraft.getMinecraft().currentScreen
         if (gui !is GuiChest) return
diff --git a/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt
new file mode 100644
index 000000000..9688add2c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt
@@ -0,0 +1,51 @@
+package at.hannibal2.skyhanni.data
+
+import at.hannibal2.skyhanni.events.GuiRenderEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
+import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
+import net.minecraft.client.Minecraft
+import net.minecraft.client.gui.inventory.GuiChest
+import net.minecraft.client.gui.inventory.GuiInventory
+import net.minecraft.client.renderer.GlStateManager
+import net.minecraftforge.client.event.GuiScreenEvent
+import net.minecraftforge.client.event.RenderGameOverlayEvent
+import net.minecraftforge.client.event.RenderWorldLastEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+
+class RenderData {
+
+    @SubscribeEvent
+    fun onRenderOverlay(event: RenderGameOverlayEvent.Pre) {
+        if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return
+        if (!SkyHanniDebugsAndTests.globalRender) return
+        if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return
+
+        GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch()
+    }
+
+    @SubscribeEvent
+    fun onBackgroundDraw(event: GuiScreenEvent.BackgroundDrawnEvent) {
+        if (!SkyHanniDebugsAndTests.globalRender) return
+        if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return
+        val currentScreen = Minecraft.getMinecraft().currentScreen ?: return
+        if (currentScreen !is GuiInventory && currentScreen !is GuiChest) return
+
+        GlStateManager.pushMatrix()
+        GlStateManager.enableDepth()
+
+        if (GuiEditManager.isInGui()) {
+            GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch()
+        }
+
+        GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch()
+
+        GlStateManager.popMatrix()
+    }
+
+    @SubscribeEvent
+    fun onRenderWorld(event: RenderWorldLastEvent) {
+        if (!SkyHanniDebugsAndTests.globalRender) return
+        LorenzRenderWorldEvent(event.partialTicks).postAndCatch()
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt
deleted file mode 100644
index 6479816ef..000000000
--- a/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.hannibal2.skyhanni.data
-
-import at.hannibal2.skyhanni.events.GuiRenderEvent
-import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI
-import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
-import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.inventory.GuiChest
-import net.minecraft.client.gui.inventory.GuiInventory
-import net.minecraft.client.renderer.GlStateManager
-import net.minecraftforge.client.event.GuiScreenEvent
-import net.minecraftforge.client.event.RenderGameOverlayEvent
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-class RenderGuiData {
-
-    @SubscribeEvent
-    fun onRenderOverlay(event: RenderGameOverlayEvent.Pre) {
-        if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return
-        if (!SkyHanniDebugsAndTests.globalRenderToggle) return
-        if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return
-
-        GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch()
-    }
-
-    @SubscribeEvent
-    fun onBackgroundDraw(event: GuiScreenEvent.BackgroundDrawnEvent) {
-        if (!SkyHanniDebugsAndTests.globalRenderToggle) return
-        if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return
-        val currentScreen = Minecraft.getMinecraft().currentScreen ?: return
-        if (currentScreen !is GuiInventory && currentScreen !is GuiChest) return
-
-        GlStateManager.pushMatrix()
-        GlStateManager.enableDepth()
-
-        if (GuiEditManager.isInGui()) {
-            GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch()
-        }
-
-        GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch()
-
-        GlStateManager.popMatrix()
-    }
-}
\ No newline at end of file
-- 
cgit