Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Highlight rabbits with requirement #1874

Merged
merged 5 commits into from
May 30, 2024
Merged

Feature: Highlight rabbits with requirement #1874

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0ee43c
highlight rabbit with requirement
superhize May 24, 2024
c85d798
changes
superhize May 28, 2024
4f251a6
update
superhize May 28, 2024
ac1fdb9
Merge branch 'refs/heads/beta' into fork/unlocked_rabbits
hannibal002 May 30, 2024
915021b
added regex test and toto
hannibal002 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...hannibal2/skyhanni/config/features/inventory/chocolatefactory/ChocolateFactoryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ public class ChocolateFactoryConfig {
@FeatureToggle
public boolean hoppityMenuShortcut = true;

@Expose
@ConfigOption(name = "Highlight Collection",
desc = "Highlight rabbits with a requirement in the collection menu. " +
"Green if you meet the requirement, red if you don't.")
@ConfigEditorBoolean
@FeatureToggle
public boolean collectionHighlight = true;

@Expose
@ConfigOption(name = "Chocolate Shop Price", desc = "")
@Accordion
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
View file
Open in desktop
superhize marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
package at.hannibal2.skyhanni.features.event.hoppity

import at.hannibal2.skyhanni.events.GuiContainerEvent
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.events.InventoryCloseEvent
import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
import at.hannibal2.skyhanni.events.ProfileJoinEvent
import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI
import at.hannibal2.skyhanni.utils.DisplayTableEntry
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.round
import at.hannibal2.skyhanni.utils.NEUInternalName
import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
import at.hannibal2.skyhanni.utils.RenderUtils.highlight
import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
import at.hannibal2.skyhanni.utils.StringUtils.matches
Expand Down Expand Up @@ -83,6 +87,20 @@ object HoppityCollectionStats {
)
}

@SubscribeEvent
fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
if (!config.collectionHighlight) return
if (!inInventory) return

for (slot in InventoryUtils.getItemsInOpenChest()) {
val lore = slot.stack.getLore()
if (lore.any { it.contains("§a✔ §7Requirement") })
slot highlight LorenzColor.GREEN
if (lore.any { it.contains("§c✖ §7Requirement") })
slot highlight LorenzColor.RED
}
}

private fun buildDisplay(event: InventoryFullyOpenedEvent): MutableList<Renderable> {
val totalAmount = logRabbits(event)

Expand Down
Loading