aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt8
2 files changed, 13 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
index d62d066e5..d06cee6d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/BarnTimerConfig.java
@@ -23,6 +23,14 @@ public class BarnTimerConfig {
@Expose
@ConfigOption(
+ name = "Show Anywhere",
+ desc = "Show the Barn Fishing Timer whenever you fish up a sea creature, regardless of location."
+ )
+ @ConfigEditorBoolean
+ public boolean showAnywhere = false;
+
+ @Expose
+ @ConfigOption(
name = "Worm Fishing",
desc = "Show the Barn Fishing Timer in the Crystal Hollows."
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
index 5be021fbb..c699191a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt
@@ -65,7 +65,7 @@ object FishingTimer {
@SubscribeEvent
fun onSecondPassed(event: SecondPassedEvent) {
if (!isEnabled()) return
- updateLocation()
+ rightLocation = updateLocation()
if (startTime.passedSince().inWholeSeconds - config.alertTime in 0..3) {
playSound()
}
@@ -170,8 +170,10 @@ object FishingTimer {
display = createDisplay()
}
- private fun updateLocation() {
- rightLocation = when (LorenzUtils.skyBlockIsland) {
+ private fun updateLocation(): Boolean {
+ if (config.showAnywhere) return true
+
+ return when (LorenzUtils.skyBlockIsland) {
IslandType.CRYSTAL_HOLLOWS -> config.crystalHollows.get()
IslandType.CRIMSON_ISLE -> config.crimsonIsle.get()
IslandType.WINTER -> config.winterIsland.get()