Merge remote-tracking branch 'upstream/master' into metal-detector-helper

2 files changed, 44 insertions, 0 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 7653dc0c..4a1f7502 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -356,6 +356,18 @@ public class SkyblockerConfig {
 	public static class Fishing {
 		@SerialEntry
 		public boolean enableFishingHelper = true;
+
+		@SerialEntry
+		public boolean enableFishingTimer = false;
+
+		@SerialEntry
+		public boolean changeTimerColor = true;
+
+		@SerialEntry
+		public float fishingTimerScale = 1f;
+
+		@SerialEntry
+		public boolean hideOtherPlayersRods = false;
 	}
 
 	public static class FairySouls {
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index a74b9483..dbfbbb10 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -226,6 +226,38 @@ public class GeneralCategory {
 										newValue -> config.general.fishing.enableFishingHelper = newValue)
 								.controller(ConfigUtils::createBooleanController)
 								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.enableFishingTimer"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.enableFishingTimer.@Tooltip")))
+								.binding(defaults.general.fishing.enableFishingTimer,
+										() -> config.general.fishing.enableFishingTimer,
+										newValue -> config.general.fishing.enableFishingTimer = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.changeTimerColor"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.changeTimerColor.@Tooltip")))
+								.binding(defaults.general.fishing.changeTimerColor,
+										() -> config.general.fishing.changeTimerColor,
+										newValue -> config.general.fishing.changeTimerColor = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Float>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale.@Tooltip")))
+								.binding(defaults.general.fishing.fishingTimerScale,
+										() -> config.general.fishing.fishingTimerScale,
+										newValue -> config.general.fishing.fishingTimerScale = newValue)
+								.controller(FloatFieldControllerBuilder::create)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.hideOtherPlayers"))
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.hideOtherPlayers.@Tooltip")))
+								.binding(defaults.general.fishing.hideOtherPlayersRods,
+										() -> config.general.fishing.hideOtherPlayersRods,
+										newValue -> config.general.fishing.hideOtherPlayersRods = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
 						.build())
 
 				//Fairy Souls Helper