some cooldown displays

5 files changed, 143 insertions, 10 deletions

diff --git a/src/main/java/dulkirmod/mixins/MixinItem.java b/src/main/java/dulkirmod/mixins/MixinItem.java
index d3cb421..62ae99d 100644
--- a/src/main/java/dulkirmod/mixins/MixinItem.java
+++ b/src/main/java/dulkirmod/mixins/MixinItem.java
@@ -1,6 +1,9 @@
 package dulkirmod.mixins;
 
 import dulkirmod.DulkirMod;
+import dulkirmod.config.DulkirConfig;
+import dulkirmod.features.ImpactDisplay;
+import dulkirmod.features.ReaperDisplay;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,4 +19,21 @@ public class MixinItem {
         if (DulkirMod.Companion.getConfig().getCancelReequip())
             ci.setReturnValue(false);
     }
+
+    @Inject(method = "showDurabilityBar(Lnet/minecraft/item/ItemStack;)Z", at = @At("HEAD"),
+            cancellable = true, remap = false)
+    public void shouldShowDur(ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
+        if (DulkirConfig.INSTANCE.getDisplayReaperCD())
+            ReaperDisplay.INSTANCE.shouldDisplay(stack, cir);
+        if (DulkirConfig.INSTANCE.getDisplayImpactCD())
+            ImpactDisplay.INSTANCE.shouldDisplay(stack, cir);
+    }
+    @Inject(method = "getDurabilityForDisplay(Lnet/minecraft/item/ItemStack;)D", at = @At("HEAD"),
+            cancellable = true, remap = false)
+    public void getItemHealthDisplayVal(ItemStack stack, CallbackInfoReturnable<Double> cir) {
+        if (DulkirConfig.INSTANCE.getDisplayReaperCD())
+            ReaperDisplay.INSTANCE.calcDurability(stack, cir);
+        if (DulkirConfig.INSTANCE.getDisplayImpactCD())
+            ImpactDisplay.INSTANCE.calcDurability(stack, cir);
+    }
 }
diff --git a/src/main/kotlin/dulkirmod/DulkirMod.kt b/src/main/kotlin/dulkirmod/DulkirMod.kt
index 88b032a..de89d9e 100644
--- a/src/main/kotlin/dulkirmod/DulkirMod.kt
+++ b/src/main/kotlin/dulkirmod/DulkirMod.kt
@@ -10,8 +10,6 @@ import dulkirmod.features.rift.IchorHighlight
 import dulkirmod.features.rift.SteakDisplay
 import dulkirmod.utils.*
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.settings.KeyBinding
@@ -20,7 +18,6 @@ import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.client.registry.ClientRegistry
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
-import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent
@@ -28,7 +25,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
 import org.lwjgl.input.Keyboard
 import java.io.File
-import java.lang.management.ManagementFactory
 import kotlin.coroutines.EmptyCoroutineContext
 
 @Mod(
@@ -89,15 +85,12 @@ class DulkirMod {
         mcBus.register(IchorHighlight)
         mcBus.register(SteakDisplay)
         mcBus.register(ArcherHighlight)
+        mcBus.register(ReaperDisplay)
+        mcBus.register(ImpactDisplay)
 
         keyBinds.forEach(ClientRegistry::registerKeyBinding)
     }
 
-    @Mod.EventHandler
-    fun postInit(event: FMLLoadCompleteEvent) = scope.launch(Dispatchers.IO) {
-
-    }
-
     @SubscribeEvent
     fun onTick(event: ClientTickEvent) {
         if (DulkirConfig.noReverse3rdPerson && mc.gameSettings.thirdPersonView == 2)
diff --git a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
index 858d11f..d8ac14c 100644
--- a/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
+++ b/src/main/kotlin/dulkirmod/config/DulkirConfig.kt
@@ -79,6 +79,22 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
     var hideEnchantRune = false
 
     @Switch(
+        name = "Reaper Armor Cooldown Display",
+        description = "Will show as item durability",
+        category = "General",
+        subcategory = "General"
+    )
+    var displayReaperCD = false
+
+    @Switch(
+        name = "Wither Impact Cooldown Display",
+        description = "Will show as item durability",
+        category = "General",
+        subcategory = "General"
+    )
+    var displayImpactCD = false
+
+    @Switch(
         name = "Abiphone Do-Not-Disturb",
         description = "Detects incoming calls and mutes ring audio for like 5 seconds. \nWorks as long as u don't lag particularly hard at the same time you're being called.",
         category = "General",
@@ -834,6 +850,6 @@ object DulkirConfig : Config(Mod("DulkirMod", ModType.SKYBLOCK), "dulkirmod-conf
         addDependency("persistentAlert", "notifyMaxVisitors")
         addDependency("secretSoundVolume", "secretClickSounds")
         addDependency("demoSecretVolume", "secretClickSounds")
-        addDependency("boxArcherEverywhere", "boxArcher")
+        addDependency("archerBoxEverywhere", "archerBox")
     }
 }
diff --git a/src/main/kotlin/dulkirmod/features/ImpactDisplay.kt b/src/main/kotlin/dulkirmod/features/ImpactDisplay.kt
new file mode 100644
index 0000000..e1d3f07
--- /dev/null
+++ b/src/main/kotlin/dulkirmod/features/ImpactDisplay.kt
@@ -0,0 +1,52 @@
+package dulkirmod.features
+
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.client.event.sound.PlaySoundEvent
+import net.minecraftforge.event.world.WorldEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
+import kotlin.math.min
+
+object ImpactDisplay {
+
+    var lastImpact = 0L
+
+    fun shouldDisplay(stack: ItemStack, cir: CallbackInfoReturnable<Boolean>) {
+        if (!isBlade(stack)) return
+        cir.returnValue = System.currentTimeMillis() - lastImpact < 5000
+    }
+
+    fun calcDurability(stack: ItemStack, cir: CallbackInfoReturnable<Double>) {
+        if (!isBlade(stack)) return
+        val time = (System.currentTimeMillis() - lastImpact) / 5000.0
+        cir.returnValue = min(1.0, 1.0 - time)
+    }
+
+    @SubscribeEvent
+    fun onSound(event: PlaySoundEvent) {
+        if (event.name != "mob.zombie.remedy") return
+        if (event.sound.pitch != 0.6984127f) return
+        if (event.sound.volume != 1.0f) return
+        lastImpact = System.currentTimeMillis()
+    }
+
+    @SubscribeEvent
+    fun onWorldLoad(event: WorldEvent.Load) {
+        lastImpact = 0L
+    }
+
+    private fun isBlade(stack: ItemStack): Boolean {
+        if (stack.hasTagCompound()) {
+            val tag: NBTTagCompound = stack.tagCompound
+            if (tag.hasKey("ExtraAttributes", 10) && tag.hasKey("display", 10)) {
+                val ea: NBTTagCompound = tag.getCompoundTag("ExtraAttributes")
+                if (ea.hasKey("id", 8)) {
+                    val id = ea.getString("id")
+                    return id matches "(HYPERION|ASTRAEA|SCYLLA|VALKYRIE)".toRegex()
+                }
+            }
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/dulkirmod/features/ReaperDisplay.kt b/src/main/kotlin/dulkirmod/features/ReaperDisplay.kt
new file mode 100644
index 0000000..3fd743d
--- /dev/null
+++ b/src/main/kotlin/dulkirmod/features/ReaperDisplay.kt
@@ -0,0 +1,52 @@
+package dulkirmod.features
+
+import net.minecraft.item.ItemStack
+import net.minecraft.nbt.NBTTagCompound
+import net.minecraftforge.client.event.sound.PlaySoundEvent
+import net.minecraftforge.event.world.WorldEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
+import kotlin.math.min
+
+object ReaperDisplay {
+
+    var lastReaperUsage = 0L
+
+    fun shouldDisplay(stack: ItemStack, cir: CallbackInfoReturnable<Boolean>) {
+        if (!isReaper(stack)) return
+        cir.returnValue = System.currentTimeMillis() - lastReaperUsage < 25000
+    }
+
+    fun calcDurability(stack: ItemStack, cir: CallbackInfoReturnable<Double>) {
+        if (!isReaper(stack)) return
+        val time = (System.currentTimeMillis() - lastReaperUsage) / 25000.0
+        cir.returnValue = min(1.0, 1.0 - time)
+    }
+
+    @SubscribeEvent
+    fun onSound(event: PlaySoundEvent) {
+        if (event.name != "mob.zombie.remedy") return
+        if (event.sound.pitch != 1.0f) return
+        if (event.sound.volume != .5f) return
+        lastReaperUsage = System.currentTimeMillis()
+    }
+
+    @SubscribeEvent
+    fun onWorldLoad(event: WorldEvent) {
+        lastReaperUsage = 0L
+    }
+
+    private fun isReaper(stack: ItemStack): Boolean {
+        if (stack.hasTagCompound()) {
+            val tag: NBTTagCompound = stack.tagCompound
+            if (tag.hasKey("ExtraAttributes", 10) && tag.hasKey("display", 10)) {
+                val ea: NBTTagCompound = tag.getCompoundTag("ExtraAttributes")
+                if (ea.hasKey("id", 8)) {
+                    val id = ea.getString("id")
+                    return id matches "(REAPER_CHESTPLATE)|(REAPER_LEGGINGS)|(REAPER_BOOTS)".toRegex()
+                }
+            }
+        }
+        return false
+    }
+}
\ No newline at end of file