Skip to content
This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit 5d65fac

Browse files
committed
improve performance
1 parent a51db1a commit 5d65fac

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/kotlin/dev/nyon/skylper/skyblock/data/api/CrystalHollowsPowderGrindingApi.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@ object CrystalHollowsPowderGrindingApi {
3939
if (startTime == null) startTime = now
4040
val amount = regex.singleGroup(rawText)?.doubleOrNull()?.toInt() ?: return@associateWith 0
4141
amount
42-
}
42+
}.toMutableMap().filter { it.value != 0 }
4343

4444
EventHandler.invokeEvent(TreasureChestRewardsEvent(rewards))
4545

46-
4746
rewards.forEach { (reward, amount) ->
4847
if (!chestRewardToPowderType.containsKey(reward)) return@forEach
4948
val type = chestRewardToPowderType[reward] ?: return@forEach

src/main/kotlin/dev/nyon/skylper/skyblock/data/api/PetApi.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object PetApi {
3636
}
3737

3838
private fun petFound(name: String, level: Int?) {
39-
val storedPet = pets.find { it.type == name } ?: return
39+
val storedPet = pets.find { it.type == name.uppercase() } ?: return
4040
pets.forEach { it.active = false }
4141
level?.let { storedPet.level = it }
4242
storedPet.active = true
@@ -56,8 +56,8 @@ object PetApi {
5656
if (!petTitleRegex.matches(rawScreenTitle)) return@listenInfoEvent
5757
val itemName = itemStack.nameAsString
5858
val level = petNameRegex.singleGroup(itemName)?.toIntOrNull() ?: return@listenInfoEvent
59-
val petInfo = itemStack.compoundTag?.getCompound("petInfo") ?: return@listenInfoEvent
60-
val pet = json.decodeFromString<Pet>(petInfo.toString())
59+
val petInfo = itemStack.compoundTag?.getString("petInfo") ?: return@listenInfoEvent
60+
val pet = kotlin.runCatching { json.decodeFromString<Pet>(petInfo) }.getOrNull() ?: return@listenInfoEvent
6161
if (pet.active) currentPet = pet
6262
pet.level = level
6363
pets.add(pet)

src/main/kotlin/dev/nyon/skylper/skyblock/data/api/PowderApi.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ object PowderApi {
1515
val currentGemstonePowder get() = HeartOfTheMountainApi.data.currentGemstonePowder
1616
val currentGlacitePowder get() = HeartOfTheMountainApi.data.currentGlacitePowder
1717

18-
// This function does not consider glacite powder yet. Atm only used for Powder Grinding calculation.
18+
// Only used for Powder Grinding calculation.
1919
fun getPowderMultiplier(type: PowderType): Double {
2020
var multiplier = if (CrystalHollowsPowderGrindingApi.doublePowderActive) 2.0 else 1.0
2121
multiplier += HeartOfTheMountainApi.data.powderBuffLevel.toFloat() / 100.0

0 commit comments

Comments
 (0)