diff options
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 11 |
2 files changed, 14 insertions, 3 deletions
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 @@ -30,6 +30,12 @@ public class ShoppingListConfig { 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 public boolean showPrice = true; 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 |