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

Fix skill data breaking collections

Browse Source
This commit is contained in:
nea
2023-07-30 14:40:53 +02:00
parent d4b254ea11
commit 2f700453a4
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/moe/nea/firmament/apis/Profiles.kt
View File

@@ -27,7 +27,7 @@ data class CollectionSkillData(
@Serializable @Serializable
data class CollectionResponse( data class CollectionResponse(
val success: Boolean, val success: Boolean,
val collections: Map<Skill, CollectionSkillData> val collections: Map<String, CollectionSkillData>
) )
@Serializable @Serializable

16
src/main/kotlin/moe/nea/firmament/gui/profileviewer/SkillPage.kt
View File

@@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack
import net.minecraft.item.Items import net.minecraft.item.Items
import net.minecraft.text.Style import net.minecraft.text.Style
import net.minecraft.text.Text import net.minecraft.text.Text
import net.minecraft.util.DyeColor
import net.minecraft.util.Formatting import net.minecraft.util.Formatting
import moe.nea.firmament.apis.CollectionInfo import moe.nea.firmament.apis.CollectionInfo
import moe.nea.firmament.apis.CollectionType import moe.nea.firmament.apis.CollectionType
@@ -56,7 +57,7 @@ object SkillPage : ProfilePage {
} }
} }
private fun collectionItem(type: CollectionType, info: CollectionInfo, skill: Skill, member: Member): WWidget { private fun collectionItem(type: CollectionType, info: CollectionInfo, color: DyeColor, member: Member): WWidget {
val collectionCount = member.collection[type] ?: 0 val collectionCount = member.collection[type] ?: 0
val unlockedTiers = info.tiers.count { it.amountRequired <= collectionCount } val unlockedTiers = info.tiers.count { it.amountRequired <= collectionCount }
return WTitledItem( return WTitledItem(
@@ -65,7 +66,7 @@ object SkillPage : ProfilePage {
it.setCustomName( it.setCustomName(
Text.literal(info.name).fillStyle( Text.literal(info.name).fillStyle(
Style.EMPTY.withItalic(false).withBold(true) Style.EMPTY.withItalic(false).withBold(true)
.withColor(skill.color.toTextColor()) .withColor(color.toTextColor())
) )
) )
it.modifyLore { old -> it.modifyLore { old ->
@@ -91,6 +92,9 @@ object SkillPage : ProfilePage {
val data = HypixelStaticData.collectionData val data = HypixelStaticData.collectionData
val panels = mutableListOf<WPanel>() val panels = mutableListOf<WPanel>()
for ((skill, collections) in data.entries) { for ((skill, collections) in data.entries) {
val skillT = Skill.values().find { it.name == skill }
val color = skillT?.color ?: DyeColor.BLACK
val icon = skillT?.icon?.let { RepoManager.getNEUItem(it).asItemStack() } ?: ItemStack(Items.ITEM_FRAME)
val panel = WBox(Axis.HORIZONTAL).also { val panel = WBox(Axis.HORIZONTAL).also {
it.horizontalAlignment = HorizontalAlignment.CENTER it.horizontalAlignment = HorizontalAlignment.CENTER
it.add(WFixedPanel(WGridPanel().also { it.add(WFixedPanel(WGridPanel().also {
@@ -99,7 +103,7 @@ object SkillPage : ProfilePage {
var x = 0 var x = 0
var y = 0 var y = 0
for (item in collections.items) { for (item in collections.items) {
it.add(collectionItem(item.key, item.value, skill, profileViewer.member), x, y, 1, 1) it.add(collectionItem(item.key, item.value, color, profileViewer.member), x, y, 1, 1)
x++ x++
if (x == 5) { if (x == 5) {
x = 0 x = 0
@@ -111,9 +115,9 @@ object SkillPage : ProfilePage {
panels.add(panel) panels.add(panel)
it.add(panel) { it.add(panel) {
it.tooltip( it.tooltip(
Text.translatable("firmament.pv.skills.${skill.name.lowercase()}") Text.translatable("firmament.pv.skills.${skill.lowercase()}")
.styled { it.withColor(skill.color.toTextColor()) }) .styled { it.withColor(color.toTextColor()) })
it.icon(ItemIcon(RepoManager.getNEUItem(skill.icon).asItemStack())) it.icon(ItemIcon(icon))
} }
} }
it.layout() it.layout()

7
src/main/kotlin/moe/nea/firmament/repo/HypixelStaticData.kt
View File

@@ -27,7 +27,7 @@ object HypixelStaticData {
private set private set
var bazaarData: Map<SkyblockId, BazaarData> = mapOf() var bazaarData: Map<SkyblockId, BazaarData> = mapOf()
private set private set
var collectionData: Map<Skill, CollectionSkillData> = mapOf() var collectionData: Map<String, CollectionSkillData> = mapOf()
private set private set
@Serializable @Serializable
@@ -60,7 +60,10 @@ object HypixelStaticData {
fun spawnDataCollectionLoop() { fun spawnDataCollectionLoop() {
Firmament.coroutineScope.launch { updateCollectionData() } Firmament.coroutineScope.launch {
logger.info("Updating collection data")
updateCollectionData()
}
Firmament.coroutineScope.launch { Firmament.coroutineScope.launch {
while (true) { while (true) {
logger.info("Updating NEU prices") logger.info("Updating NEU prices")