diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-03 00:53:18 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-02-03 00:53:18 +0100 |
| commit | aeca29914fd8995c575d847c97376a49b0481e10 (patch) | |
| tree | 4f9c26e44bcac9c77c9c0ff57e1eca654f44d997 /src/main/java/at/hannibal2/skyhanni/data | |
| parent | 859f837fa0573c335c5249da5c08eac13968a6df (diff) | |
| download | skyhanni-aeca29914fd8995c575d847c97376a49b0481e10.tar.gz skyhanni-aeca29914fd8995c575d847c97376a49b0481e10.tar.bz2 skyhanni-aeca29914fd8995c575d847c97376a49b0481e10.zip | |
Highlight stuff that is missing in the skyblock level guide inventory.
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt index bea039212..17cb04d35 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt @@ -52,7 +52,7 @@ class ApiDataLoader { } @SubscribeEvent - fun onStatusBar(event: ProfileJoinEvent) { + fun onProfileJoin(event: ProfileJoinEvent) { currentProfileName = event.name updateApiData() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt index 7b5df45df..0312342da 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.LorenzActionBarEvent import at.hannibal2.skyhanni.events.ProfileApiDataLoadedEvent +import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.ItemUtils.name @@ -16,6 +17,7 @@ import java.util.regex.Pattern class SkillExperience { private val actionBarPattern = Pattern.compile("(?:.*)§3\\+(?:.*) (.*) \\((.*)\\/(.*)\\)(?:.*)") + private val inventoryPattern = Pattern.compile("(?:.*) §e(.*)§6\\/(?:.*)") @SubscribeEvent fun onProfileDataLoad(event: ProfileApiDataLoadedEvent) { @@ -30,6 +32,11 @@ class SkillExperience { } @SubscribeEvent + fun onProfileJoin(event: ProfileJoinEvent) { + skillExp.clear() + } + + @SubscribeEvent fun onActionBar(event: LorenzActionBarEvent) { if (!LorenzUtils.inSkyBlock) return @@ -76,8 +83,7 @@ class SkillExperience { val skillName = split[0].lowercase() val level = split[1].romanToDecimal() val baseExp = getExpForLevel(level) - val pattern = Pattern.compile("(?:.*) §e(.*)§6\\/(?:.*)") - val matcher = pattern.matcher(line) + val matcher = inventoryPattern.matcher(line) if (matcher.matches()) { val rawNumber = matcher.group(1) val overflow = rawNumber.formatNumber() |
