From d5f869d12546f82d76e184871763941e3142a91c Mon Sep 17 00:00:00 2001 From: chatt Date: Thu, 4 Jul 2024 15:37:42 -0700 Subject: [PATCH] Core material is now a materialmatcher --- .../network/warzone/mars/match/tracker/MatchTracker.kt | 7 ++++++- .../network/warzone/mars/player/tablist/TabListFeatures.kt | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/network/warzone/mars/match/tracker/MatchTracker.kt b/src/main/kotlin/network/warzone/mars/match/tracker/MatchTracker.kt index 964422a..0c0c561 100644 --- a/src/main/kotlin/network/warzone/mars/match/tracker/MatchTracker.kt +++ b/src/main/kotlin/network/warzone/mars/match/tracker/MatchTracker.kt @@ -136,7 +136,12 @@ class MatchTracker : Listener { return match.getModule(GoalMatchModule::class.java) ?.getGoals(Core::class.java) ?.values() - ?.map { CorePartial(it.id, it.name, it.owner.nameLegacy, it.material.itemType) }?.distinctBy { it.id } + ?.mapNotNull { + val definition = it.definition + val materialMatcher = definition.material + if (materialMatcher.materials.isEmpty()) return@mapNotNull null + CorePartial(it.id, it.name, it.owner.nameLegacy, materialMatcher.materials.iterator().next()) + }?.distinctBy { it.id } ?: listOf() } diff --git a/src/main/kotlin/network/warzone/mars/player/tablist/TabListFeatures.kt b/src/main/kotlin/network/warzone/mars/player/tablist/TabListFeatures.kt index 92c4919..871f420 100644 --- a/src/main/kotlin/network/warzone/mars/player/tablist/TabListFeatures.kt +++ b/src/main/kotlin/network/warzone/mars/player/tablist/TabListFeatures.kt @@ -14,6 +14,7 @@ import tc.oc.pgm.teams.Team import tc.oc.pgm.util.named.NameDecorationProvider import tc.oc.pgm.util.named.NameStyle import tc.oc.pgm.util.player.PlayerComponent +import tc.oc.pgm.util.player.PlayerRenderer import tc.oc.pgm.util.tablist.PlayerTabEntry import tc.oc.pgm.util.tablist.TabView @@ -54,7 +55,7 @@ class LeveledPlayerTabEntry(player: Player) : PlayerTabEntry(player) { if (!isOffline && style.contains(NameStyle.Flag.DEATH) && isDead()) { name.color(NamedTextColor.DARK_GRAY) } else if (style.contains(NameStyle.Flag.COLOR)) { - name.color(if (isOffline) PlayerComponent.OFFLINE_COLOR else provider.getColor(uuid)) + name.color(if (isOffline) PlayerRenderer.OFFLINE_COLOR else provider.getColor(uuid)) } if (!isOffline && style.contains(NameStyle.Flag.SELF) && player === viewer) { name.decoration(TextDecoration.BOLD, true)