Skip to content

Commit 377fbf5

Browse files
authored
chore: remove block zapper fatigue timer (#480)
Block Zapper fatigue was removed by Hypixel shortly after the SkyBlock 0.19.9 update. https://hypixel.net/threads/skyblock-patch-notes-0-19-9-pet-training-and-bestiary-changes.5555803/
1 parent ef5ff25 commit 377fbf5

File tree

6 files changed

+0
-43
lines changed

6 files changed

+0
-43
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ If you have a GitHub account, <b>PLEASE CONSIDER STARRING</b> and forking the re
184184
- Jerry-chine Gun Sound Hider
185185
- Show Enchanted Book Abbreviation
186186
- Show Radioactive Bonus
187-
- Block Zapper Fatigue Timer
188187
- Etherwarp Teleport Display
189188

190189
</details>

src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,16 +2068,6 @@ object Config : Vigilant(
20682068
)
20692069
var pricePaid = false
20702070

2071-
@Property(
2072-
type = PropertyType.SWITCH, name = "Block Zapper Fatigue Timer",
2073-
description = "Displays how long your block zapper is fatigued for.",
2074-
category = "Miscellaneous", subcategory = "Items",
2075-
i18nName = "skytils.config.miscellaneous.items.block_zapper_fatigue_timer",
2076-
i18nCategory = "skytils.config.miscellaneous",
2077-
i18nSubcategory = "skytils.config.miscellaneous.items"
2078-
)
2079-
var blockZapperFatigueTimer = false
2080-
20812071
@Property(
20822072
type = PropertyType.SWITCH, name = "Disable Block Animation",
20832073
description = "Removes the block animation on swords.",

src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/MiscFeatures.kt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ object MiscFeatures {
9393
var placedEyes = 0
9494
private var lastGLeaveCommand = 0L
9595
private var lastCoopAddCommand = 0L
96-
private var blockZapperCooldownExpiration = 0L
97-
private var blockZapperUses = 0
9896
private val cheapCoins = setOf(
9997
"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTM4MDcxNzIxY2M1YjRjZDQwNmNlNDMxYTEzZjg2MDgzYTg5NzNlMTA2NGQyZjg4OTc4Njk5MzBlZTZlNTIzNyJ9fX0=",
10098
"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGZhMDg3ZWI3NmU3Njg3YTgxZTRlZjgxYTdlNjc3MjY0OTk5MGY2MTY3Y2ViMGY3NTBhNGM1ZGViNmM0ZmJhZCJ9fX0=",
@@ -157,33 +155,6 @@ object MiscFeatures {
157155
golemSpawnTime = System.currentTimeMillis() + 20000
158156
}
159157

160-
if (Skytils.config.blockZapperFatigueTimer) {
161-
if (formatted.startsWith("§eZapped §a") && formatted.endsWith("§a§lUNDO§r")) {
162-
blockZapperCooldownExpiration = 0L
163-
blockZapperUses++
164-
printDevMessage("$blockZapperUses", "zapper")
165-
166-
if (blockZapperUses >= 20) {
167-
blockZapperUses = 0
168-
blockZapperCooldownExpiration = System.currentTimeMillis() + 420_000
169-
printDevMessage("$blockZapperCooldownExpiration", "zapper")
170-
}
171-
}
172-
if (unformatted == "Your zapper is temporarily fatigued!") {
173-
val duration = (blockZapperCooldownExpiration - System.currentTimeMillis()).milliseconds
174-
printDevMessage("$blockZapperUses ${duration.inWholeSeconds}", "zapper")
175-
if (duration.isPositive()) {
176-
UChat.chat("$prefix §eThis will expire in${
177-
duration
178-
.toComponents { minutes, seconds, _ -> "${if (minutes > 0) " ${minutes}m " else " "}${seconds}s!" }
179-
}")
180-
} else {
181-
blockZapperCooldownExpiration = System.currentTimeMillis() + 420_000
182-
blockZapperUses = 0
183-
printDevMessage("fallback: $blockZapperCooldownExpiration", "zapper")
184-
}
185-
}
186-
}
187158
if (!Utils.inDungeons) {
188159
if (Skytils.config.copyDeathToClipboard) {
189160
if (formatted.startsWith("§r§c ☠ ")) {

src/main/resources/assets/skytils/lang/en_US.lang

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ skytils.config.miscellaneous.fixes.fix_world_time=Fix World Time
195195
skytils.config.miscellaneous.fixes.prevent_log_spam=Prevent Log Spam
196196
skytils.config.miscellaneous.fixes.twitch_fix=Twitch Fix
197197
skytils.config.miscellaneous.items.price_paid=Price Paid
198-
skytils.config.miscellaneous.items.block_zapper_fatigue_timer=Block Zapper Fatigue Timer
199198
skytils.config.miscellaneous.items.disable_block_animation=Disable Block Animation
200199
skytils.config.miscellaneous.items.dropped_item_size=Dropped Item Size
201200
skytils.config.miscellaneous.items.hide_implosion_particles=Hide Implosion Particles

src/main/resources/assets/skytils/lang/zh_CN.lang

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ skytils.config.miscellaneous.fixes.fix_world_time=修复世界时间
195195
skytils.config.miscellaneous.fixes.prevent_log_spam=防止垃圾日志
196196
skytils.config.miscellaneous.fixes.twitch_fix=Twitch修复
197197
skytils.config.miscellaneous.items.price_paid=记录支付的价格
198-
skytils.config.miscellaneous.items.block_zapper_fatigue_timer=Block Zapper损坏恢复倒计时
199198
skytils.config.miscellaneous.items.disable_block_animation=禁用格挡动画
200199
skytils.config.miscellaneous.items.dropped_item_size=掉落物品大小
201200
skytils.config.miscellaneous.items.hide_implosion_particles=隐藏爆炸粒子

src/main/resources/assets/skytils/lang/zh_TW.lang

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ skytils.config.miscellaneous.fixes.fix_world_time=修復世界時間
195195
skytils.config.miscellaneous.fixes.prevent_log_spam=防止垃圾日誌
196196
skytils.config.miscellaneous.fixes.twitch_fix=Twitch修復
197197
skytils.config.miscellaneous.items.price_paid=記錄支付的價格
198-
skytils.config.miscellaneous.items.block_zapper_fatigue_timer=Block Zapper損壞恢復倒計時
199198
skytils.config.miscellaneous.items.disable_block_animation=禁用格擋動畫
200199
skytils.config.miscellaneous.items.dropped_item_size=掉落物品大小
201200
skytils.config.miscellaneous.items.hide_implosion_particles=隱藏爆炸粒子

0 commit comments

Comments
 (0)