From e26a9585f061e89b475ebd688ed45003db0c1838 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 28 Mar 2023 18:36:12 +0200 Subject: Added debug messages for visitor status --- .../features/garden/GardenVisitorFeatures.kt | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') 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 6483f44cc..ef4d06e27 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenVisitorFeatures.kt @@ -82,7 +82,9 @@ class GardenVisitorFeatures { visitor.items[internalName] = amount } if (visitor.status == VisitorStatus.NEW) { + oldStatus(visitor) visitor.status = VisitorStatus.WAITING + statusChange(visitor) } update() @@ -178,7 +180,9 @@ class GardenVisitorFeatures { if (event.slotId != 33) return getVisitor(lastClickedNpc)?.let { + oldStatus(it) it.status = VisitorStatus.REFUSED + statusChange(it) update() } } @@ -348,7 +352,8 @@ class GardenVisitorFeatures { } for (name in visitorsInTab) { if (!visitors.containsKey(name)) { - visitors[name] = Visitor(status = VisitorStatus.NEW) + visitors[name] = Visitor(name, status = VisitorStatus.NEW) + println("new visitor '$name'") if (config.visitorNotificationTitle) { SendTitleHelper.sendTitle("§eNew Visitor", 5_000) } @@ -369,7 +374,9 @@ class GardenVisitorFeatures { val visitorName = matcher.group(1) for (visitor in visitors) { if (visitor.key == visitorName) { + oldStatus(visitor.value) visitor.value.status = VisitorStatus.ACCEPTED + statusChange(visitor.value) update() } } @@ -391,7 +398,9 @@ class GardenVisitorFeatures { val status = visitor.status if (status == VisitorStatus.WAITING || status == VisitorStatus.READY) { + oldStatus(visitor) visitor.status = if (isReady(visitor)) VisitorStatus.READY else VisitorStatus.WAITING + statusChange(visitor) } if (config.visitorHighlightStatus == 0 || config.visitorHighlightStatus == 2) { @@ -410,6 +419,20 @@ class GardenVisitorFeatures { } } + val oldValue = mutableMapOf() + + private fun oldStatus(visitor: Visitor) { + oldValue[visitor] = visitor.status + } + + private fun statusChange(visitor: Visitor) { + val old = oldValue[visitor] + val new = visitor.status + if (old == new) return + val name = visitor.visitorName + LorenzUtils.debug("Visitor status change for $name: $old -> $new") + } + private fun Visitor.getEntity() = Minecraft.getMinecraft().theWorld.getEntityByID(entityId) private fun findEntity(nameTag: EntityArmorStand, visitor: Visitor) { @@ -502,6 +525,7 @@ class GardenVisitorFeatures { } class Visitor( + val visitorName: String, var entityId: Int = -1, var nameTagEntityId: Int = -1, var status: VisitorStatus, -- cgit