Also fire RenderHudEvent when HUD is hidden

Renamed the event to RenderGuiEvent because that makes more sense now
zeroeightysix · Aug 22, 2020 · 9527a98 · 9527a98
1 parent 42f5717
commit 9527a98
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/me/zeroeightsix/kami/feature/module/render/ArmourHUD.java b/src/main/java/me/zeroeightsix/kami/feature/module/render/ArmourHUD.java
@@ -4,7 +4,7 @@
 import io.github.fablabsmc.fablabs.api.fiber.v1.annotation.Setting;
 import me.zero.alpine.listener.EventHandler;
 import me.zero.alpine.listener.Listener;
-import me.zeroeightsix.kami.event.RenderHudEvent;
+import me.zeroeightsix.kami.event.RenderGuiEvent;
 import me.zeroeightsix.kami.feature.module.Module;
 import me.zeroeightsix.kami.util.Wrapper;
 import net.minecraft.client.MinecraftClient;
@@ -20,7 +20,7 @@ public class ArmourHUD extends Module {
     private boolean damage = false;
 
     @EventHandler
-    public Listener<RenderHudEvent> renderListener = new Listener<>(event -> {
+    public Listener<RenderGuiEvent> renderListener = new Listener<>(event -> {
         ItemRenderer itemRenderer = Wrapper.getMinecraft().getItemRenderer();
 
         GlStateManager.enableTexture();

diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinGameRenderer.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinGameRenderer.java
@@ -4,7 +4,7 @@
 import me.zeroeightsix.kami.KamiMod;
 import me.zeroeightsix.kami.event.CameraHurtEvent;
 import me.zeroeightsix.kami.event.RenderEvent;
-import me.zeroeightsix.kami.event.RenderHudEvent;
+import me.zeroeightsix.kami.event.RenderGuiEvent;
 import me.zeroeightsix.kami.event.TargetEntityEvent;
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
@@ -65,7 +65,7 @@ private EntityHitResult rayTrace(Entity entity, Vec3d vec3d, Vec3d vec3d2, Box b
 
     @Inject(
             method = "render",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;render(Lnet/minecraft/client/util/math/MatrixStack;F)V", shift = At.Shift.AFTER),
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V"),
             locals = LocalCapture.CAPTURE_FAILHARD,
             cancellable = true)
     public void onRender(float tickDelta,
@@ -76,7 +76,7 @@ public void onRender(float tickDelta,
                          int j,
                          Window window,
                          MatrixStack stack) {
-        RenderHudEvent event = new RenderHudEvent(window, stack);
+        RenderGuiEvent event = new RenderGuiEvent(window, stack);
         KamiMod.EVENT_BUS.post(event);
         if (event.isCancelled()) {
             ci.cancel();

diff --git a/src/main/kotlin/me/zeroeightsix/kami/event/Events.kt b/src/main/kotlin/me/zeroeightsix/kami/event/Events.kt
@@ -132,7 +132,7 @@ open class RenderEvent private constructor(private val stage: Stage) : KamiEvent
     }
 }
 
-class RenderHudEvent(
+class RenderGuiEvent(
     val window: Window,
     val matrixStack: MatrixStack
 ) : KamiEvent()

diff --git a/src/main/kotlin/me/zeroeightsix/kami/feature/hidden/PrepHandler.kt b/src/main/kotlin/me/zeroeightsix/kami/feature/hidden/PrepHandler.kt
@@ -9,7 +9,7 @@ import me.zero.alpine.listener.Listener
 import me.zeroeightsix.kami.KamiMod
 import me.zeroeightsix.kami.event.DisplaySizeChangedEvent
 import me.zeroeightsix.kami.event.RenderEvent
-import me.zeroeightsix.kami.event.RenderHudEvent
+import me.zeroeightsix.kami.event.RenderGuiEvent
 import me.zeroeightsix.kami.event.TickEvent
 import me.zeroeightsix.kami.feature.Feature
 import me.zeroeightsix.kami.feature.FindFeature
@@ -63,7 +63,7 @@ object PrepHandler : Feature, Listenable {
     @EventHandler
     var hudEventListener =
         Listener(
-            EventHook<RenderHudEvent> {
+            EventHook<RenderGuiEvent> {
                 if (Wrapper.getMinecraft().currentScreen !is KamiGuiScreen && (Settings.hudWithDebug || !Wrapper.getMinecraft().options.debugEnabled)) {
                     renderHud(it.matrixStack)
                 }

diff --git a/src/main/kotlin/me/zeroeightsix/kami/feature/module/EntitySpeed.kt b/src/main/kotlin/me/zeroeightsix/kami/feature/module/EntitySpeed.kt
@@ -5,7 +5,7 @@ import me.zero.alpine.listener.EventHandler
 import me.zero.alpine.listener.EventHook
 import me.zero.alpine.listener.Listener
 import me.zeroeightsix.kami.event.CanBeControlledEvent
-import me.zeroeightsix.kami.event.RenderHudEvent
+import me.zeroeightsix.kami.event.RenderGuiEvent
 import me.zeroeightsix.kami.event.TickEvent
 import me.zeroeightsix.kami.mixin.client.IEntity
 import me.zeroeightsix.kami.util.EntityUtil
@@ -118,7 +118,7 @@ object EntitySpeed : Module() {
 
     @EventHandler
     var renderListener =
-        Listener(EventHook<RenderHudEvent> {
+        Listener(EventHook<RenderGuiEvent> {
             val boat = boat ?: return@EventHook
             boat.yaw = mc.player?.yaw!!
             boat.setInputs(

diff --git a/src/main/kotlin/me/zeroeightsix/kami/feature/module/Nametags.kt b/src/main/kotlin/me/zeroeightsix/kami/feature/module/Nametags.kt
@@ -4,7 +4,7 @@ import me.zero.alpine.listener.EventHandler
 import me.zero.alpine.listener.EventHook
 import me.zero.alpine.listener.Listener
 import me.zeroeightsix.kami.event.RenderEvent
-import me.zeroeightsix.kami.event.RenderHudEvent
+import me.zeroeightsix.kami.event.RenderGuiEvent
 import me.zeroeightsix.kami.interpolatedPos
 import me.zeroeightsix.kami.util.VectorMath
 import net.minecraft.client.MinecraftClient
@@ -48,7 +48,7 @@ object Nametags : Module() {
     })
 
     @EventHandler
-    val hudRenderListener = Listener<RenderHudEvent>(EventHook {
+    val hudRenderListener = Listener<RenderGuiEvent>(EventHook {
         renderQueue?.forEach { (entity, pos) ->
             val text = entity.displayName.string
             val width = mc.textRenderer.getWidth(text)

diff --git a/src/main/kotlin/me/zeroeightsix/kami/gui/KamiHud.kt b/src/main/kotlin/me/zeroeightsix/kami/gui/KamiHud.kt
@@ -71,6 +71,7 @@ object KamiHud {
     }
 
     fun renderHud(matrixStack: MatrixStack) {
+        if (mc.options.hudHidden) return
         frame(matrixStack) {
             if (!EnabledWidgets.hideAll) {
                 PinnableWidget.drawFadedBackground = false