Internal Changes: Refactor VisitorAPI to event based interaction (#561)

Split up GardenVisitorFeatures into multiple useful events #561

9 files changed, 48 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/events/VisitorAcceptEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/VisitorAcceptEvent.kt
index 620694a22..af6fa275a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/VisitorAcceptEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/VisitorAcceptEvent.kt
@@ -1,5 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
 
-class VisitorAcceptEvent(val visitor: GardenVisitorFeatures.Visitor) : LorenzEvent()
\ No newline at end of file
+class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/VisitorArrivalEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/VisitorArrivalEvent.kt
deleted file mode 100644
index 91be1bbe5..000000000
--- a/src/main/java/at/hannibal2/skyhanni/events/VisitorArrivalEvent.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package at.hannibal2.skyhanni.events
-
-import at.hannibal2.skyhanni.features.garden.visitor.GardenVisitorFeatures.Visitor
-
-class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt
new file mode 100644
index 000000000..e3bffed8b
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+
+class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt
new file mode 100644
index 000000000..673f45e20
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.Visitor
+
+class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt
new file mode 100644
index 000000000..f906364ce
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+
+class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt
new file mode 100644
index 000000000..6abec9865
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+
+class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt
new file mode 100644
index 000000000..fea24fba9
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+
+class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt
new file mode 100644
index 000000000..f050d53a5
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt
@@ -0,0 +1,9 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+import at.hannibal2.skyhanni.utils.LorenzVec
+import net.minecraftforge.client.event.RenderWorldLastEvent
+
+class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) : LorenzEvent()
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorToolTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorToolTipEvent.kt
new file mode 100644
index 000000000..daf1439f3
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorToolTipEvent.kt
@@ -0,0 +1,7 @@
+package at.hannibal2.skyhanni.events.garden.visitor
+
+import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI
+import net.minecraft.item.ItemStack
+
+class VisitorToolTipEvent(val visitor: VisitorAPI.Visitor, val itemStack: ItemStack, val toolTip: MutableList<String>) : LorenzEvent()
\ No newline at end of file