Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pet numbers not showing in item list

Browse Source
This commit is contained in:
Linnea Gräf
2024-08-08 02:38:12 +02:00
parent 325ea56989
commit 71d0db2526
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/moe/nea/firmament/rei/SBItemEntryDefinition.kt
View File

@@ -54,7 +54,7 @@ data class PetData(
val levelData by lazy { ExpLadders.getExpLadder(petId, rarity).getPetLevel(exp) } val levelData by lazy { ExpLadders.getExpLadder(petId, rarity).getPetLevel(exp) }
} }
data class SBItemStack( data class SBItemStack constructor(
val skyblockId: SkyblockId, val skyblockId: SkyblockId,
val neuItem: NEUItem?, val neuItem: NEUItem?,
private var stackSize: Int, private var stackSize: Int,
@@ -133,7 +133,8 @@ data class SBItemStack(
return@run ItemCache.coinItem(stackSize).also { it.appendLore(extraLore) } return@run ItemCache.coinItem(stackSize).also { it.appendLore(extraLore) }
val replacementData = mutableMapOf<String, String>() val replacementData = mutableMapOf<String, String>()
injectReplacementDataForPets(replacementData) injectReplacementDataForPets(replacementData)
return@run neuItem.asItemStack(idHint = skyblockId, replacementData).copyWithCount(stackSize) return@run neuItem.asItemStack(idHint = skyblockId, replacementData)
.copyWithCount(stackSize)
.also { it.appendLore(extraLore) } .also { it.appendLore(extraLore) }
.also { enhanceStatsByStars(it, stars) } .also { enhanceStatsByStars(it, stars) }
} }
@@ -212,7 +213,8 @@ object SBItemEntryDefinition : EntryDefinition<SBItemStack> {
} }
override fun wildcard(entry: EntryStack<SBItemStack>?, value: SBItemStack): SBItemStack { override fun wildcard(entry: EntryStack<SBItemStack>?, value: SBItemStack): SBItemStack {
return value.copy(stackSize = 1, petData = null, stars = 0, extraLore = listOf()) return value.copy(stackSize = 1, petData = RepoManager.getPotentialStubPetData(value.skyblockId),
stars = 0, extraLore = listOf())
} }
override fun normalize(entry: EntryStack<SBItemStack>?, value: SBItemStack): SBItemStack { override fun normalize(entry: EntryStack<SBItemStack>?, value: SBItemStack): SBItemStack {

2
src/main/kotlin/moe/nea/firmament/repo/RepoManager.kt
View File

@@ -1,5 +1,3 @@
package moe.nea.firmament.repo package moe.nea.firmament.repo
import io.github.moulberry.repo.NEURepository import io.github.moulberry.repo.NEURepository