diff --git a/README.md b/README.md index 161bd5c..1664315 100644 --- a/README.md +++ b/README.md @@ -16,5 +16,6 @@ Features: - Bestiary Notifications for Ghasts/Zombie Villagers - Notification when hype breaks and stops giving combat xp - Hide arachne loot nametags +- Arachne Boss Kill timer This is epic. diff --git a/build.gradle.kts b/build.gradle.kts index 860bf54..ab3d83c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } group = "com.example.archloomtemplate" -version = "1.0.6" +version = "1.0.7" // Toolchains: java { diff --git a/src/main/kotlin/dulkirmod/DulkirMod.kt b/src/main/kotlin/dulkirmod/DulkirMod.kt index 85d89aa..350c4ae 100644 --- a/src/main/kotlin/dulkirmod/DulkirMod.kt +++ b/src/main/kotlin/dulkirmod/DulkirMod.kt @@ -3,6 +3,7 @@ package dulkirmod import dulkirmod.command.* import dulkirmod.config.Config import dulkirmod.events.ChatEvent +import dulkirmod.features.ArachneTimer import dulkirmod.features.NametagCleaner import dulkirmod.features.alarmClock import dulkirmod.features.brokenHypeNotif @@ -60,6 +61,7 @@ class DulkirMod { MinecraftForge.EVENT_BUS.register(ChatEvent()) MinecraftForge.EVENT_BUS.register(NametagCleaner) MinecraftForge.EVENT_BUS.register(DulkirMod.titleUtils) + MinecraftForge.EVENT_BUS.register(ArachneTimer()) keyBinds.forEach(ClientRegistry::registerKeyBinding) } @@ -102,8 +104,8 @@ class DulkirMod { companion object { const val MOD_ID = "dulkirmod" const val MOD_NAME = "Dulkir Mod" - const val MOD_VERSION = "1.0.6" - const val CHAT_PREFIX = "" + const val MOD_VERSION = "1.0.7" + const val CHAT_PREFIX = "§f<§3DulkirMod§f>" val mc: Minecraft = Minecraft.getMinecraft() var config = Config diff --git a/src/main/kotlin/dulkirmod/config/Config.kt b/src/main/kotlin/dulkirmod/config/Config.kt index f38257c..1a88d1a 100644 --- a/src/main/kotlin/dulkirmod/config/Config.kt +++ b/src/main/kotlin/dulkirmod/config/Config.kt @@ -388,6 +388,14 @@ object Config : Vigilant(File("./config/dulkirmod/config.toml"), "DulkirMod", so category = "Bestiary" ) var hideArachneTags = false + + @Property( + type = PropertyType.SWITCH, + name = "Arachne kill timer", + description = "Shows in chat.", + category = "Bestiary" + ) + var arachneKillTimer = false fun init() { initialize() addDependency("customMessage", "throttleNotifier") diff --git a/src/main/kotlin/dulkirmod/features/ArachneTimer.kt b/src/main/kotlin/dulkirmod/features/ArachneTimer.kt new file mode 100644 index 0000000..7e0f144 --- /dev/null +++ b/src/main/kotlin/dulkirmod/features/ArachneTimer.kt @@ -0,0 +1,42 @@ +package dulkirmod.features + +import dulkirmod.DulkirMod +import dulkirmod.DulkirMod.Companion.mc +import dulkirmod.config.Config +import dulkirmod.utils.Utils +import net.minecraft.util.ChatComponentText +import net.minecraftforge.client.event.ClientChatReceivedEvent +import net.minecraftforge.fml.common.eventhandler.EventPriority +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +class ArachneTimer { + private var startmillis : Long = -1; + private var endmillis : Long = -1; + + @SubscribeEvent(receiveCanceled = true, priority = EventPriority.LOW) + fun onChat(event: ClientChatReceivedEvent) { + if (!Config.arachneKillTimer) return + + var killtime : Float = -1f; + + if (event.type == 2.toByte()) { + return + } + + val unformatted = Utils.stripColorCodes(event.message.unformattedText) + if (unformatted == "[BOSS] Arachne: You dare to call me, the queen of the dark, to you. I'll accept no excuses, you shall die!") { + startmillis = System.currentTimeMillis() + } + + if (unformatted == "[BOSS] Arachne: You are lucky this time that you only called out a portion of my power. If you dared to face me at my peak, you would not survive!") { + endmillis = System.currentTimeMillis() + if (startmillis > -1) { + killtime = (endmillis - startmillis).toFloat() / 1000 + + mc.thePlayer.addChatMessage( + ChatComponentText("${DulkirMod.CHAT_PREFIX} §6Arachne took §7$killtime §6seconds to kill.") + ) + } + } + } +} \ No newline at end of file