Feat: Countdown #211
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package me.odinmain.commands.impl | ||
|
|
||
| import com.github.stivais.commodore.Commodore | ||
| import com.github.stivais.commodore.utils.GreedyString | ||
| import me.odinmain.config.Config | ||
| import me.odinmain.features.impl.skyblock.Countdowns.countdownTriggers | ||
| import me.odinmain.features.impl.skyblock.Countdowns.CountdownTrigger | ||
| import me.odinmain.utils.addOrNull | ||
| import me.odinmain.utils.skyblock.modMessage | ||
| import me.odinmain.utils.toFixed | ||
|
|
||
| val CountdownsCommand = Commodore("countdowns") { | ||
| literal("add").runs { prefix: String, time: Int, message: GreedyString -> | ||
| val prefix = prefix.replace("&", "§") | ||
| countdownTriggers.addOrNull(CountdownTrigger(prefix.replace("&", "§"), time, false, message.string)) | ||
| ?: return@runs modMessage("This thing already exists!") | ||
| modMessage("$prefix${time.toFixed(divisor = 20)}, Triggers by \"$message\"") | ||
| Config.save() | ||
| } | ||
|
|
||
| literal("addregex").runs { prefix: String, time: Int, message: GreedyString -> | ||
|
Owner
There was a problem hiding this comment. Don't use runCatching here and add a string to the list and not a regex class |
||
| val prefix = prefix.replace("&", "§") | ||
| runCatching { | ||
| Regex(message.string) | ||
| }.onSuccess { | ||
| countdownTriggers.addOrNull(CountdownTrigger(prefix, time, true, message.string)) | ||
| ?: return@runs modMessage("This thing already exists!") | ||
| modMessage("$prefix${time.toFixed(divisor = 20)}, Triggers by regex \"$message\"") | ||
| Config.save() | ||
| }.onFailure { | ||
| modMessage("Bad regex!") | ||
| } | ||
| } | ||
|
|
||
| literal("remove").runs { index: Int -> | ||
|
|
||
| runCatching { | ||
| countdownTriggers.removeAt(index) | ||
| }.onSuccess { | ||
| modMessage("Removed Countdown Trigger #$index") | ||
| Config.save() | ||
| }.onFailure { | ||
| modMessage("Theres no countdown trigger in position #$index") | ||
| } | ||
| } | ||
|
|
||
| literal("clear").runs { | ||
| countdownTriggers.clear() | ||
| modMessage("Cleared List") | ||
| Config.save() | ||
| } | ||
|
|
||
| literal("list").runs { | ||
| val output = countdownTriggers.withIndex().joinToString("\n") { (i, it) -> | ||
| "$i: ${it.prefix}${it.time.toFixed(divisor = 20)}&r, ${if (it.regex) "regex" else "normal"} \"${it.message}\"" | ||
| } | ||
| modMessage(if (countdownTriggers.isEmpty()) "The list is empty!" else "Countdown Trigger list:\n$output") | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package me.odinmain.features.impl.skyblock | ||
|
|
||
|
|
||
| import me.odinmain.clickgui.settings.Setting.Companion.withDependency | ||
| import me.odinmain.clickgui.settings.impl.ActionSetting | ||
| import me.odinmain.clickgui.settings.impl.DropdownSetting | ||
| import me.odinmain.clickgui.settings.impl.ListSetting | ||
| import me.odinmain.events.impl.ServerTickEvent | ||
| import me.odinmain.features.Module | ||
| import me.odinmain.utils.addOrNull | ||
| import me.odinmain.utils.render.Colors | ||
| import me.odinmain.utils.toFixed | ||
| import me.odinmain.utils.ui.drawStringWidth | ||
| import me.odinmain.utils.ui.getMCTextHeight | ||
| import net.minecraftforge.fml.common.eventhandler.SubscribeEvent | ||
| import java.util.concurrent.CopyOnWriteArrayList | ||
|
|
||
| object Countdowns : Module( | ||
| name = "Countdowns", | ||
| description = "Starts a countdown in HUD when you trigger certain chat message, or regex expressions." | ||
| ) { | ||
| private val hud by HUD("Hud", "Displays something i can't tell.", toggleable = false) { example -> | ||
| if (example) return@HUD drawStringWidth("Some Countdown: 3.50s", 1f, 1f, Colors.WHITE) to 10f | ||
| if (countdowns.isEmpty()) return@HUD 0f to 0f | ||
|
|
||
| var w = 1f | ||
| var h = 1f | ||
| val lineHeight = getMCTextHeight() | ||
|
|
||
| countdowns.forEach { | ||
| w = maxOf(w, drawStringWidth( | ||
| "§r${it.prefix}${it.time.toFixed(divisor = 20)}", | ||
| 1f, h, Colors.WHITE | ||
| )) | ||
| h += lineHeight | ||
| } | ||
|
|
||
| w to h | ||
| } | ||
|
|
||
| data class CountdownTrigger(val prefix: String, val time: Int, val regex: Boolean, val message: String) { | ||
|
Owner
There was a problem hiding this comment. Parse Regex seperatly and refrain from changing ListSetting stracture |
||
| @Transient | ||
| var realRegex: Regex? = if (regex) { | ||
| runCatching { Regex(message) }.getOrNull() | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
| val countdownTriggers by ListSetting("Countdowns", mutableListOf<CountdownTrigger>()) { it.copy() } | ||
|
|
||
|
Owner
There was a problem hiding this comment. Don't have presets inside the mod |
||
| private val presetsDropdown by DropdownSetting("Add Presets") | ||
| private val presetQuiz by ActionSetting("Quiz", desc = "Quiz puzzle in dungeons. (2)") { | ||
| countdownTriggers.addOrNull(CountdownTrigger("§eQuiz: §f", 220, false, "[STATUE] Oruo the Omniscient: I am Oruo the Omniscient. I have lived many lives. I have learned all there is to know.")) | ||
| countdownTriggers.addOrNull(CountdownTrigger("§eQuiz: §f", 140, true, "\\[STATUE\\] Oruo the Omniscient: \\w{1,16} answered Question #[12] correctly!")) | ||
| }.withDependency { presetsDropdown } | ||
| private val presetEndIsland by ActionSetting("End Island", desc = "Endstone & Dragon Protector spawn. (2)") { | ||
| countdownTriggers.addOrNull(CountdownTrigger("§eEndstone Protector: §f", 400, false, "The ground begins to shake as an Endstone Protector rises from below!")) | ||
| countdownTriggers.addOrNull(CountdownTrigger("§eDragon: §f", 174, true, "☬ \\w{1,16} placed a Summoning Eye! Brace yourselves! \\(8/8\\)")) | ||
| }.withDependency { presetsDropdown } | ||
| private val presetM3FireFreeze by ActionSetting("M3 Fire Freeze", desc = "The Professor. (1)") { | ||
| countdownTriggers.addOrNull(CountdownTrigger("§eFire Freeze: §f", 106, false, "[BOSS] The Professor: Oh? You found my Guardians' one weakness?")) | ||
| }.withDependency { presetsDropdown } | ||
|
|
||
| private data class Countdown(val prefix: String, var time: Int) | ||
| private val countdowns = CopyOnWriteArrayList<Countdown>() | ||
|
|
||
| init { | ||
| onMessage(Regex(".*")) { result -> | ||
FlyModeZ marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| countdownTriggers.firstOrNull { | ||
| if (it.regex) (it.realRegex?.let { regex -> result.value.matches(regex) } ?: false) else (it.message == result.value) | ||
| }?.let { | ||
| countdowns.add(Countdown(it.prefix, it.time)) | ||
| } | ||
| } | ||
|
|
||
| onWorldLoad { | ||
| countdowns.clear() | ||
| } | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| fun onServerTick(event: ServerTickEvent) { | ||
| countdowns.removeIf { | ||
| --it.time <= 0 | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(old) if you have a HUD, toggleable=false, it's also not enabled when first launch
i'm fixing this :<