remove InGameHudMixin class and related HUD rendering logic

Lyzev · Jan 3, 2025 · 2e2295f · 2e2295f
1 parent 81db8ab
commit 2e2295f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 52 deletions.
diff --git a/src/main/java/dev/lyzev/hp/mixin/InGameHudMixin.java b/src/main/java/dev/lyzev/hp/mixin/InGameHudMixin.java
diff --git a/src/main/kotlin/dev/lyzev/hp/HorsePower.kt b/src/main/kotlin/dev/lyzev/hp/HorsePower.kt
@@ -20,14 +20,17 @@ package dev.lyzev.hp
 import com.mojang.brigadier.arguments.IntegerArgumentType
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.context.CommandContext
+import dev.lyzev.hp.modmenu.HorsePowerConfig
 import dev.lyzev.hp.modmenu.HorsePowerConfigManager
+import dev.lyzev.hp.util.HorseStatsRenderer.render
 import dev.lyzev.hp.util.round
 import dev.lyzev.hp.util.toBPS
 import dev.lyzev.hp.util.toJump
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback
 import net.minecraft.client.MinecraftClient
 import net.minecraft.entity.Entity
 import net.minecraft.entity.attribute.EntityAttributes
@@ -92,6 +95,22 @@ object HorsePower : ClientModInitializer {
                     }
                 })
         })
+
+        HudRenderCallback.EVENT.register(HudRenderCallback { drawContext, _ ->
+            if (HorsePowerConfig.SHOW_HUD.value) {
+                val entity = mc.targetedEntity
+                if (entity is AbstractHorseEntity) {
+                    render(
+                        drawContext,
+                        entity,
+                        mc.window.scaledWidth / 2 + 10,
+                        mc.window.scaledHeight / 2 + 10,
+                        0,
+                        0
+                    )
+                }
+            }
+        })
     }
 
     private fun executeSearch(context: CommandContext<FabricClientCommandSource>, criteria: String, amount: Int): Int {

diff --git a/src/main/resources/horsepower.mixins.json b/src/main/resources/horsepower.mixins.json
@@ -7,7 +7,6 @@
   ],
   "client": [
     "HorseScreenMixin",
-    "InGameHudMixin",
     "MinecraftClientMixin"
   ],
   "injectors": {