aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-15 13:27:55 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-08-15 13:27:55 +0200
commit092373eac695c883207bfe04d72f209481d0ade9 (patch)
treeec7d4e6391b3c10c30dd6912d9164d93d0cbcdfb
parent90e445a956f3e149d1197cc514738602857e0a91 (diff)
downloadskyhanni-092373eac695c883207bfe04d72f209481d0ade9.tar.gz
skyhanni-092373eac695c883207bfe04d72f209481d0ade9.tar.bz2
skyhanni-092373eac695c883207bfe04d72f209481d0ade9.zip
Removed Broken Wither Impact detection
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt57
3 files changed, 0 insertions, 66 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 03032cc7c..6007339fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -336,7 +336,6 @@ class SkyHanniMod {
loadModule(PlayerTabComplete)
loadModule(SlayerItemProfitTracker)
loadModule(SlayerItemsOnGround())
- loadModule(DetectBrokenHyperion())
loadModule(RestorePieceOfWizardPortalLore())
loadModule(QuickModMenuSwitch)
loadModule(ArachneChatMessageHider())
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
index 9b48f0779..7814b954e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/SlayerConfig.java
@@ -424,14 +424,6 @@ public class SlayerConfig {
}
@Expose
- @ConfigOption(name = "Broken Wither Impact",
- desc = "Warns when right-clicking with a Wither Impact weapon (e.g. Hyperion) no longer gains combat exp. " +
- "Kill a mob with melee-hits to fix this hypixel bug. §cOnly works while doing slayers!"
- )
- @ConfigEditorBoolean
- public boolean brokenHyperion = true;
-
- @Expose
@ConfigOption(name = "Miniboss Highlight", desc = "Highlight slayer miniboss in blue color.")
@ConfigEditorBoolean
public boolean slayerMinibossHighlight = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt
deleted file mode 100644
index 33fd2ac92..000000000
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/DetectBrokenHyperion.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package at.hannibal2.skyhanni.features.slayer
-
-import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.data.TitleUtils
-import at.hannibal2.skyhanni.events.PurseChangeCause
-import at.hannibal2.skyhanni.events.PurseChangeEvent
-import at.hannibal2.skyhanni.utils.InventoryUtils
-import at.hannibal2.skyhanni.utils.LorenzLogger
-import at.hannibal2.skyhanni.utils.LorenzUtils
-import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
-import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getAbilityScrolls
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-
-class DetectBrokenHyperion {
- private val config get() = SkyHanniMod.feature.slayer
- private var brokenInRow = 0
- private val logger = LorenzLogger("slayer/detect_broken_hyperion")
-
- @SubscribeEvent
- fun onPurseChange(event: PurseChangeEvent) {
- if (!isEnabled()) return
- if (event.reason != PurseChangeCause.GAIN_MOB_KILL) return
- if (!SlayerAPI.hasActiveSlayerQuest()) return
- if (!SlayerAPI.isInSlayerArea) return
- if (SlayerAPI.latestWrongAreaWarning + 5_000 > System.currentTimeMillis()) return
-
- val abilityScrolls = InventoryUtils.getItemInHand()?.getAbilityScrolls() ?: return
- if (!abilityScrolls.contains("IMPLOSION_SCROLL".asInternalName())) return
-
- val diff = System.currentTimeMillis() - SlayerAPI.getLatestProgressChangeTime()
- logger.log("diff: $diff")
-
- if (diff < 2_500) {
- if (brokenInRow != 0) {
-
- brokenInRow = 0
- logger.log(" reset to 0")
- }
- return
- }
-
- brokenInRow++
- logger.log(" add: $brokenInRow")
-
- if (brokenInRow > 5) {
- logger.log(" send warning!")
- TitleUtils.sendTitle("§eBroken Hyperion!", 3_000)
- LorenzUtils.chat(
- "§e[SkyHanni] Your Hyperion is broken! It no longer collects combat exp. " +
- "Kill a mob with melee-hits to fix this hypixel bug"
- )
- }
- }
-
- fun isEnabled() = LorenzUtils.inSkyBlock && config.brokenHyperion
-}