From e76fc4f40e5edf01527472f6cecdd59fd008c647 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 21 Feb 2023 13:58:20 +0100 Subject: Show new visitors and fixed bugs. --- src/main/java/at/hannibal2/skyhanni/config/features/Garden.java | 6 ++++++ .../hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index 967c2487b..78ddb5e37 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -71,6 +71,12 @@ public class Garden { @ConfigAccordionId(id = 3) public boolean visitorNeedsOnlyWhenClose = false; + @Expose + @ConfigOption(name = "Notification", desc = "Show as title and in chat when a new visitor is visiting your island.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean visitorNotification = true; + @Expose @ConfigOption(name = "Highlight Ready", desc = "Highlight the visitor when the required items are in the inventory.") @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt index 3d58a9714..c3d26c90f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.features.garden import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.SendTitleHelper import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper import at.hannibal2.skyhanni.utils.* @@ -190,14 +191,15 @@ class GardenVisitorFeatures { } } if (visitors.keys.removeIf { it !in visitorsInTab }) { - println("removed an npc") update() } for (name in visitorsInTab) { if (!visitors.containsKey(name)) { visitors[name] = Visitor(-1) - // todo notification? (check world age first) - println("found an npc: '$name'") + if (SkyHanniMod.feature.garden.visitorNotification) { + SendTitleHelper.sendTitle("§eNew Visitor", 5_000) + LorenzUtils.chat("§e[SkyHanni] $name §eis visiting your garden!") + } update() } } -- cgit