From c5f1c28ad24b462dc181d97e85ffc775f5857bdb Mon Sep 17 00:00:00 2001 From: btwonion Date: Fri, 31 May 2024 18:21:20 +0200 Subject: [PATCH] fix collection hihglighting im dumb --- beta-changelog.md | 2 +- build.gradle.kts | 2 +- .../skyblock/menu/collections/CompletionHighlighter.kt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/beta-changelog.md b/beta-changelog.md index 0785040..8818058 100644 --- a/beta-changelog.md +++ b/beta-changelog.md @@ -2,7 +2,7 @@ none ## Bug Fixes -none +- fix collection highlighting ## Technical changes none \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index bf01a4d..75f66aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { signing } -val beta: Int = 19 +val beta: Int = 20 // Pattern is '1.0.0-beta1-1.20.6-pre.2' val featureVersion = "1.0.0${if (beta != null) "-beta$beta" else ""}" val mcVersion = property("mcVersion")!!.toString() diff --git a/src/main/kotlin/dev/nyon/skylper/skyblock/menu/collections/CompletionHighlighter.kt b/src/main/kotlin/dev/nyon/skylper/skyblock/menu/collections/CompletionHighlighter.kt index 8b92c75..1aa7613 100644 --- a/src/main/kotlin/dev/nyon/skylper/skyblock/menu/collections/CompletionHighlighter.kt +++ b/src/main/kotlin/dev/nyon/skylper/skyblock/menu/collections/CompletionHighlighter.kt @@ -4,7 +4,6 @@ import dev.nyon.skylper.config.config import dev.nyon.skylper.extensions.EventHandler.listenEvent import dev.nyon.skylper.extensions.RenderItemBackgroundEvent import dev.nyon.skylper.extensions.lore -import net.minecraft.world.item.Items object CompletionHighlighter { @Suppress("unused") @@ -13,8 +12,8 @@ object CompletionHighlighter { val screenName = title.string if (screenName.contains("Collections")) { val lore = slot.item.lore.map { it.string } - if (lore.none { it.contains("Click to view!") } || slot.item.`is`(Items.PLAYER_HEAD)) return@listenEvent null - if (lore.any { it.contains("Collections Maxed Out: 100%") }) return@listenEvent null + if (lore.none { it.contains("Click to view!") } || slot.item.displayName.string.contains("Crafted Minions")) return@listenEvent null + if (lore.any { it.contains("Collections Maxed Out") }) return@listenEvent null return@listenEvent config.menu.collections.nonCompletedCollectionHighlightColor.rgb }