From 76cf923aec2b96b389acb6efd6f8e77efa8c9bca Mon Sep 17 00:00:00 2001
From: moonleay <contact@moonleay.net>
Date: Tue, 26 Dec 2023 13:43:45 +0100
Subject: [PATCH] feat!: converted Durability modules to HandItemInfos

---
 .../etaorion/client/modules/component/ModuleManager.kt       | 4 ++--
 .../modules/hud/{DurabilityMainHand.kt => MainHandItem.kt}   | 5 ++---
 .../modules/hud/{DurabilityOffHand.kt => OffHandItem.kt}     | 4 ++--
 .../net/moonleay/etaorion/client/screen/AutoTextScreen.kt    | 5 -----
 4 files changed, 6 insertions(+), 12 deletions(-)
 rename src/main/java/net/moonleay/etaorion/client/modules/hud/{DurabilityMainHand.kt => MainHandItem.kt} (79%)
 rename src/main/java/net/moonleay/etaorion/client/modules/hud/{DurabilityOffHand.kt => OffHandItem.kt} (81%)

diff --git a/src/main/java/net/moonleay/etaorion/client/modules/component/ModuleManager.kt b/src/main/java/net/moonleay/etaorion/client/modules/component/ModuleManager.kt
index d0b7e45..416cc62 100644
--- a/src/main/java/net/moonleay/etaorion/client/modules/component/ModuleManager.kt
+++ b/src/main/java/net/moonleay/etaorion/client/modules/component/ModuleManager.kt
@@ -19,8 +19,8 @@ object ModuleManager {
             XYZ(),
             Direction(),
             AntiFatFinger(),
-            DurabilityMainHand(),
-            DurabilityOffHand(),
+            MainHandItem(),
+            OffHandItem(),
         )
         lgr.info("Registered ${modules.size} Modules!")
 
diff --git a/src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityMainHand.kt b/src/main/java/net/moonleay/etaorion/client/modules/hud/MainHandItem.kt
similarity index 79%
rename from src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityMainHand.kt
rename to src/main/java/net/moonleay/etaorion/client/modules/hud/MainHandItem.kt
index 85c6eef..18e3a55 100644
--- a/src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityMainHand.kt
+++ b/src/main/java/net/moonleay/etaorion/client/modules/hud/MainHandItem.kt
@@ -1,17 +1,16 @@
 package net.moonleay.etaorion.client.modules.hud
 
 import net.minecraft.client.MinecraftClient
-import net.minecraft.text.Text
 import net.minecraft.util.Hand
 import net.moonleay.etaorion.client.modules.component.Category
 import net.moonleay.etaorion.client.modules.component.MovableModule
 
-class DurabilityMainHand: MovableModule("Durability (Main Hand)", Category.HUD) {
+class MainHandItem: MovableModule("Main Hand item", Category.HUD) {
     override fun getText4Render(): String {
         val playerEntity = MinecraftClient.getInstance().player!!
         val stack = playerEntity.getStackInHand(Hand.MAIN_HAND)
         val itemName = if (stack.item.name.string == "Air") "Empty" else stack.item.name.string
-        if(stack.maxDamage == 0) return itemName
+        if(stack.maxDamage == 0) return " x" + stack.count + itemName
         return "${itemName} ${stack.maxDamage - stack.damage}/${stack.maxDamage}"
     }
 }
diff --git a/src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityOffHand.kt b/src/main/java/net/moonleay/etaorion/client/modules/hud/OffHandItem.kt
similarity index 81%
rename from src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityOffHand.kt
rename to src/main/java/net/moonleay/etaorion/client/modules/hud/OffHandItem.kt
index 1b9c15b..aa2ee6c 100644
--- a/src/main/java/net/moonleay/etaorion/client/modules/hud/DurabilityOffHand.kt
+++ b/src/main/java/net/moonleay/etaorion/client/modules/hud/OffHandItem.kt
@@ -5,12 +5,12 @@ import net.minecraft.util.Hand
 import net.moonleay.etaorion.client.modules.component.Category
 import net.moonleay.etaorion.client.modules.component.MovableModule
 
-class DurabilityOffHand: MovableModule("Durability (Off Hand)", Category.HUD) {
+class OffHandItem: MovableModule("Off Hand item", Category.HUD) {
     override fun getText4Render(): String {
         val playerEntity = MinecraftClient.getInstance().player!!
         val stack = playerEntity.getStackInHand(Hand.OFF_HAND)
         val itemName = if (stack.item.name.string == "Air") "Empty" else stack.item.name.string
-        if(stack.maxDamage == 0) return itemName
+        if(stack.maxDamage == 0) return " x" + stack.count + itemName
         return "${itemName} ${stack.maxDamage - stack.damage}/${stack.maxDamage}"
     }
 }
diff --git a/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt b/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt
index 944cefc..29772a6 100644
--- a/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt
+++ b/src/main/java/net/moonleay/etaorion/client/screen/AutoTextScreen.kt
@@ -66,11 +66,6 @@ class AutoTextScreen(val parent: Screen) : Screen(Text.of("AutoText Manager")) {
         MinecraftClient.getInstance().setScreen(parent)
     }
 
-
-    override fun tick() {
-//        addressField!!.tick()
-    }
-
     override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
         if (this.addressField!!.active && focused === addressField && (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER)) {
             return true