Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backend: Active Custom Scoreboard Patterns #2927

Merged
merged 27 commits into from
Jan 13, 2025

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented Nov 14, 2024

What

This Pull Request improves the Custom Scoreboard to only do important regex checks. Each Element now contains their respective patterns and using the showIslands() we now filter out not for the current island important patterns. This should reduce the amount of regex checks by like 60% I assume, so yay more fps (maybe)

/shdebug custom scoreboard
= Debug Information for SkyHanni 0.28.Beta.12 =

search 'custom scoreboard':

== Custom Scoreboard ==
 Custom Scoreboard Lines:
    Title - island: true - show: true - [§ZSKAI-BAI-BAI~ ≧◡≦]
    Profile - island: true - show: true - [§7♲ Ironman]
    Purse - island: true - show: true - [Purse: §61.5M]
    Motes - island: false - show: true - []
    Bank - island: true - show: true - [Bank: §6250.3M]
    Bits - island: true - show: true - [Bits: §b231k§7/§b106k]
    Copper - island: false - show: true - []
    Gems - island: true - show: true - [Gems: §a160]
    Heat - island: false - show: true - []
    Cold - island: false - show: true - []
    North_stars - island: false - show: true - []
    Chunked_stats - island: true - show: true - [§61.5M §f| §6250.3M §f| §b231k§7/§b106k, §a160]
    Soulflow - island: true - show: true - [Soulflow: §3155,642]
    Island - island: true - show: true - [§7㋖ §aHub]
    Location - island: true - show: true - [§7⏣ §bVillage]
    Player_amount - island: true - show: true - [§7Players: §a21§7/§a26]
    Visiting - island: false - show: true - []
    Date - island: true - show: true - [§9Early Winter 4th]
    Time - island: true - show: true - [§73:02am §b☽]
    Lobby_code - island: true - show: true - [§711/14/2024 §8mini4AN]
    Power - island: true - show: true - [Power: §aBloody §7(§6683§7)]
    Tuning - island: true - show: true - [Tuning: §e⚔19]
    Cookie - island: true - show: false - []
    Objective - island: true - show: true - []
    Slayer - island: true - show: false - []
    Quiver - island: true - show: false - []
    Powder - island: false - show: true - [§9§lPowder,  §7- §fMithril: §2129k/7.9M,  §7- §fGemstone: §d573k/7.2M,  §7- §fGlacite: §b255k/687k]
    Events - island: true - show: true - []
    Mayor - island: true - show: true - [§bMarina§7 (§e2d 11h§7),  §7- §eLuck of the Sea 2.0,  §7- §eFishing Festival, §3Aatrox,  §7- §eSlayer XP Buff]
    Party - island: true - show: true - []
    Footer - island: true - show: true - [§laaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]
    Extra - island: true - show: true - []
    Empty_line - island: true - show: true - []
    Empty_line2 - island: true - show: true - []
    Empty_line3 - island: true - show: true - []
    Empty_line4 - island: true - show: true - []
    Empty_line5 - island: true - show: true - []
    Empty_line6 - island: true - show: true - []
    Empty_line7 - island: true - show: true - []
    Empty_line8 - island: true - show: true - []
    Empty_line9 - island: true - show: true - []
    Empty_line10 - island: true - show: true - []
 Active Patterns:
    \s*(?:§7♲ §7Ironman|§a☀ §aStranded|§.Ⓑ §.Bingo).*
    (?:§.)*(?:Piggy|Purse): §6(?<coins>[\d,.]+)(?: ?(?:§.)*\([+-](?<earned>[\d,.]+)\)?|.*)?$
    ^Bits: §b(?<amount>[\d,.]+).*$
    (?:§.)*Motes: (?:§.)*(?<motes>[\d,]+).*
    (?:§.)*Copper: (?:§.)*(?<copper>[\d,]+).*
    Heat: (?<heat>.*)
    (?:§.)*Cold: §.(?<cold>-?\d+)❄
    North Stars: §d(?<northstars>[\w,]+).*
    \s*(?<location>(?:§7⏣|§5ф) .*)
    \s*(?:(?:Late|Early) )?(?:Spring|Summer|Autumn|Winter) \d+(?:st|nd|rd|th)?.*
    \s*§7\d+:\d+(?:am|pm)\s*(?<symbol>§b☽|§e☀|§.⚡|§.☔)?.*
    \s*§.(?:\d{2}/?){3} §8(?<code>.*)
    (?:§.)*(?:Objective|Quest).*
    Slayer Quest
    §cServer closing.*
    §eJacob's Contest
    §dNew Year Event!§f \d*?:?\d+
    §6Spooky Festival§f \d*?:?\d+
    \s*.*Essence: §.(?<essence>-?\d+(?::?,\d{3})*(?:\.\d+)?)
    Queued:.*
    Tier: §e.*
    Position: (?:§.)*#\d+ (?:§.)*Since: .*
    §d\d+(?:st|nd|rd|th) Anniversary§f (?:\d|:)+
    §aTraveling Zoo§f \d*:\d+
    §e(?:www|alpha).hypixel.net
 Recent Unknown Lines:
    §711/14/24 §8m4AN
     Early Winter 4th
     §72:40am §b☽
     §7⏣ §7None
     §7♲ §7Ironman
    Piggy: §61,520,079
    Bits: §b231,220
    §ewww.hypixel.net

Changelog Technical Details

  • Improved Custom Scoreboard to check only active patterns on the current island. - j10a1n15

@github-actions github-actions bot added the Backend A backend pull request that will be merged soon label Nov 14, 2024
Signed-off-by: J10a1n15 <[email protected]>
@github-actions github-actions bot added the Detekt Has detekt problem label Nov 14, 2024
Copy link

One or more Detekt Failures were detected:

Signed-off-by: J10a1n15 <[email protected]>
Signed-off-by: J10a1n15 <[email protected]>
@github-actions github-actions bot removed the Detekt Has detekt problem label Nov 14, 2024
@hannibal002 hannibal002 added this to the Version 0.29 milestone Nov 15, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 15, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Nov 15, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 8, 2024
Copy link

github-actions bot commented Dec 8, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 8, 2024
Copy link

github-actions bot commented Dec 8, 2024

Conflicts have been resolved! 🎉

@j10a1n15 j10a1n15 mentioned this pull request Dec 13, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 13, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 25, 2024
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 4, 2025
Copy link

github-actions bot commented Jan 4, 2025

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 4, 2025
Copy link

github-actions bot commented Jan 4, 2025

Conflicts have been resolved! 🎉

Signed-off-by: J10a1n15 <[email protected]>
@j10a1n15 j10a1n15 requested a review from CalMWolfs January 7, 2025 15:11
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good (havent tested)

Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 11, 2025
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt
Signed-off-by: J10a1n15 <[email protected]>
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 11, 2025
@CalMWolfs CalMWolfs added the Soon This Pull Request will be merged within the next couple of betas label Jan 11, 2025
@hannibal002 hannibal002 merged commit 6fbff31 into hannibal002:beta Jan 13, 2025
6 checks passed
@github-actions github-actions bot removed Soon This Pull Request will be merged within the next couple of betas Backend A backend pull request that will be merged soon labels Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants