From bc21cce34cc8a52d1ce1c01c91e907fa989297fc Mon Sep 17 00:00:00 2001
From: Erymanthus | RayDeeUx <51521765+RayDeeUx@users.noreply.github.com>
Date: Sat, 20 Jan 2024 05:06:34 -0500
Subject: Option to show visitor shopping list in Farming Islands (#923)

Visitor Shopping List in Farming Areas. #923
---
 .../config/features/garden/visitor/ShoppingListConfig.java    |  6 ++++++
 .../skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2')

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
index cbfa9e451..86e64d3f9 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java
@@ -29,6 +29,12 @@ public class ShoppingListConfig {
     @ConfigEditorBoolean
     public boolean inBazaarAlley = true;
 
+    @Expose
+    @ConfigOption(name = "Farming Areas", desc = "Show the Visitor Items List while on the Farming Islands or inside the Farm in the Hub. " +
+        "This helps farming the correct amount, especially when in the early game.")
+    @ConfigEditorBoolean
+    public boolean inFarmingAreas = false;
+
     @Expose
     @ConfigOption(name = "Show Price", desc = "Show the coin price in the shopping list.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
index de9e9bd8a..dc375174f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
@@ -581,10 +581,15 @@ class GardenVisitorFeatures {
     }
 
     private fun showGui(): Boolean {
-        if (config.shoppingList.inBazaarAlley && IslandType.HUB.isInIsland() && LorenzUtils.skyBlockArea == "Bazaar Alley") {
-            return true
+        if (IslandType.HUB.isInIsland()) {
+            if (config.shoppingList.inBazaarAlley && LorenzUtils.skyBlockArea == "Bazaar Alley") {
+                return true
+            }
+            if (config.shoppingList.inFarmingAreas && LorenzUtils.skyBlockArea == "Farm") {
+                return true
+            }
         }
-
+        if (config.shoppingList.inFarmingAreas && IslandType.THE_FARMING_ISLANDS.isInIsland()) return true
         if (hideExtraGuis()) return false
         if (GardenAPI.inGarden()) {
             if (GardenAPI.onBarnPlot) return true
-- 
cgit