diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/RenderData.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt) | 14 |
3 files changed, 13 insertions, 5 deletions
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/RenderGuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt index 6479816ef..9688add2c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt @@ -1,6 +1,7 @@ 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 @@ -9,14 +10,15 @@ 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 RenderGuiData { +class RenderData { @SubscribeEvent fun onRenderOverlay(event: RenderGameOverlayEvent.Pre) { if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return - if (!SkyHanniDebugsAndTests.globalRenderToggle) return + if (!SkyHanniDebugsAndTests.globalRender) return if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() @@ -24,7 +26,7 @@ class RenderGuiData { @SubscribeEvent fun onBackgroundDraw(event: GuiScreenEvent.BackgroundDrawnEvent) { - if (!SkyHanniDebugsAndTests.globalRenderToggle) return + if (!SkyHanniDebugsAndTests.globalRender) return if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return val currentScreen = Minecraft.getMinecraft().currentScreen ?: return if (currentScreen !is GuiInventory && currentScreen !is GuiChest) return @@ -40,4 +42,10 @@ class RenderGuiData { GlStateManager.popMatrix() } + + @SubscribeEvent + fun onRenderWorld(event: RenderWorldLastEvent) { + if (!SkyHanniDebugsAndTests.globalRender) return + LorenzRenderWorldEvent(event.partialTicks).postAndCatch() + } }
\ No newline at end of file |
