-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Allow dropping protected items in dungeons
- Loading branch information
Showing
9 changed files
with
158 additions
and
86 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 |
|---|---|---|
| @@ -1,45 +1,55 @@ | ||
|
|
||
|
|
||
| package moe.nea.firmament.util | ||
|
|
||
| import java.util.* | ||
| import java.util.Optional | ||
| import net.minecraft.client.gui.hud.InGameHud | ||
| import net.minecraft.scoreboard.ScoreboardDisplaySlot | ||
| import net.minecraft.scoreboard.Team | ||
| import net.minecraft.text.StringVisitable | ||
| import net.minecraft.text.Style | ||
| import net.minecraft.text.Text | ||
| import net.minecraft.util.Formatting | ||
| import moe.nea.firmament.annotations.Subscribe | ||
| import moe.nea.firmament.events.TickEvent | ||
|
|
||
| fun getScoreboardLines(): List<Text> { | ||
| val scoreboard = MC.player?.scoreboard ?: return listOf() | ||
| val activeObjective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR) ?: return listOf() | ||
| return scoreboard.getScoreboardEntries(activeObjective) | ||
| .filter { !it.hidden() } | ||
| .sortedWith(InGameHud.SCOREBOARD_ENTRY_COMPARATOR) | ||
| .take(15).map { | ||
| val team = scoreboard.getScoreHolderTeam(it.owner) | ||
| val text = it.name() | ||
| Team.decorateName(team, text) | ||
| } | ||
| } | ||
| object ScoreboardUtil { | ||
| var scoreboardLines: List<Text> = listOf() | ||
| var simplifiedScoreboardLines: List<String> = listOf() | ||
|
|
||
| @Subscribe | ||
| fun onTick(event: TickEvent) { | ||
| scoreboardLines = getScoreboardLinesUncached() | ||
| simplifiedScoreboardLines = scoreboardLines.map { it.unformattedString } | ||
| } | ||
|
|
||
| private fun getScoreboardLinesUncached(): List<Text> { | ||
| val scoreboard = MC.player?.scoreboard ?: return listOf() | ||
| val activeObjective = scoreboard.getObjectiveForSlot(ScoreboardDisplaySlot.SIDEBAR) ?: return listOf() | ||
| return scoreboard.getScoreboardEntries(activeObjective) | ||
| .filter { !it.hidden() } | ||
| .sortedWith(InGameHud.SCOREBOARD_ENTRY_COMPARATOR) | ||
| .take(15).map { | ||
| val team = scoreboard.getScoreHolderTeam(it.owner) | ||
| val text = it.name() | ||
| Team.decorateName(team, text) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun Text.formattedString(): String { | ||
| val sb = StringBuilder() | ||
| visit(StringVisitable.StyledVisitor<Unit> { style, string -> | ||
| val c = Formatting.byName(style.color?.name) | ||
| if (c != null) { | ||
| sb.append("§${c.code}") | ||
| } | ||
| if (style.isUnderlined) { | ||
| sb.append("§n") | ||
| } | ||
| if (style.isBold) { | ||
| sb.append("§l") | ||
| } | ||
| sb.append(string) | ||
| Optional.empty() | ||
| }, Style.EMPTY) | ||
| return sb.toString().replace("§[^a-f0-9]".toRegex(), "") | ||
| val sb = StringBuilder() | ||
| visit(StringVisitable.StyledVisitor<Unit> { style, string -> | ||
| val c = Formatting.byName(style.color?.name) | ||
| if (c != null) { | ||
| sb.append("§${c.code}") | ||
| } | ||
| if (style.isUnderlined) { | ||
| sb.append("§n") | ||
| } | ||
| if (style.isBold) { | ||
| sb.append("§l") | ||
| } | ||
| sb.append(string) | ||
| Optional.empty() | ||
| }, Style.EMPTY) | ||
| return sb.toString().replace("§[^a-f0-9]".toRegex(), "") | ||
| } |
This file contains 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 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,33 @@ | ||
| package moe.nea.firmament.util.skyblock | ||
|
|
||
| import moe.nea.firmament.util.SBData | ||
| import moe.nea.firmament.util.ScoreboardUtil | ||
| import moe.nea.firmament.util.SkyBlockIsland | ||
| import moe.nea.firmament.util.TIME_PATTERN | ||
|
|
||
| object DungeonUtil { | ||
| val isInDungeonIsland get() = SBData.skyblockLocation == SkyBlockIsland.DUNGEON | ||
| private val timeElapsedRegex = "Time Elapsed: $TIME_PATTERN".toRegex() | ||
| val isInActiveDungeon get() = isInDungeonIsland && ScoreboardUtil.simplifiedScoreboardLines.any { it.matches( | ||
| timeElapsedRegex) } | ||
|
|
||
| /*Title: | ||
| §f§lSKYBLOCK§B§L CO-OP | ||
| ' Late Spring 7th' | ||
| ' §75:20am' | ||
| ' §7⏣ §cThe Catacombs §7(M3)' | ||
| ' §7♲ §7Ironman' | ||
| ' ' | ||
| 'Keys: §c■ §c✗ §8■ §a1x' | ||
| 'Time Elapsed: §a46s' | ||
| 'Cleared: §660% §8(105)' | ||
| ' ' | ||
| '§e[B] §b151_Dragon §e2,062§c❤' | ||
| '§e[A] §6Lennart0312 §a17,165§c' | ||
| '§e[T] §b187i §a14,581§c❤' | ||
| '§e[H] §bFlameeke §a8,998§c❤' | ||
| ' ' | ||
| '§ewww.hypixel.net'*/ | ||
| } |
This file contains 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