From cec065a79d10319aaf0b6c3e96b4d76001f3e93b Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 8 Apr 2024 22:07:29 +0100 Subject: add option for timer above rod when fishing give option to show how long a rod has been out for --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 6 ++++++ .../skyblocker/config/categories/GeneralCategory.java | 14 ++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 06ac748a..3e292ba4 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -349,6 +349,12 @@ public class SkyblockerConfig { public static class Fishing { @SerialEntry public boolean enableFishingHelper = true; + + @SerialEntry + public boolean enableFishingTimer = true; + + @SerialEntry + public float fishingTimerScale = 1f; } 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 e310cb85..b1e02ee3 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,20 @@ public class GeneralCategory { newValue -> config.general.fishing.enableFishingHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.enableFishingTimer")) + .binding(defaults.general.fishing.enableFishingTimer, + () -> config.general.fishing.enableFishingTimer, + newValue -> config.general.fishing.enableFishingTimer = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale")) + .binding(defaults.general.fishing.fishingTimerScale, + () -> config.general.fishing.fishingTimerScale, + newValue -> config.general.fishing.fishingTimerScale = newValue) + .controller(FloatFieldControllerBuilder::create) + .build()) .build()) //Fairy Souls Helper -- cgit From cdf2b3f8a1cdb665df7b3da1ecf6c328630faf5d Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 8 Apr 2024 22:39:34 +0100 Subject: add option to change text color after 20 seconds add option to change the text to green after 20 seconds (use full for some larva fishing) --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 3e292ba4..ed74ea4f 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -353,6 +353,9 @@ public class SkyblockerConfig { @SerialEntry public boolean enableFishingTimer = true; + @SerialEntry + public boolean changeTimerColor = true; + @SerialEntry public float fishingTimerScale = 1f; } 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 b1e02ee3..52a9cd15 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -233,6 +233,13 @@ public class GeneralCategory { newValue -> config.general.fishing.enableFishingTimer = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.changeTimerColor")) + .binding(defaults.general.fishing.changeTimerColor, + () -> config.general.fishing.changeTimerColor, + newValue -> config.general.fishing.changeTimerColor = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale")) .binding(defaults.general.fishing.fishingTimerScale, -- cgit From f4b7cccafe1c84e3d7c2cd2da5633a4689b3c6e6 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 9 Apr 2024 13:26:12 +0100 Subject: add ability to hide others rods add option to toggle rendering of other players rods --- .../java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../hysky/skyblocker/config/categories/GeneralCategory.java | 11 +++++++++++ 2 files changed, 14 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index ed74ea4f..01df542e 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -358,6 +358,9 @@ public class SkyblockerConfig { @SerialEntry public float fishingTimerScale = 1f; + + @SerialEntry + public boolean hideOtherPlayers = true; } 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 52a9cd15..830c67fd 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -228,6 +228,7 @@ public class GeneralCategory { .build()) .option(Option.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) @@ -235,6 +236,7 @@ public class GeneralCategory { .build()) .option(Option.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) @@ -242,11 +244,20 @@ public class GeneralCategory { .build()) .option(Option.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.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.hideOtherPlayers, + () -> config.general.fishing.hideOtherPlayers, + newValue -> config.general.fishing.hideOtherPlayers = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .build()) //Fairy Souls Helper -- cgit From 0bd00eb842fe3f5f3ebe5c55bc06eef339f014f4 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 11 Apr 2024 10:59:00 +0100 Subject: fix formatting hopefully make sure that the code in the pull request is formatted properly --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 4 ++-- .../java/de/hysky/skyblocker/config/categories/GeneralCategory.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 9ee1dabe..dc3fea10 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -355,7 +355,7 @@ public class SkyblockerConfig { public boolean enableFishingHelper = true; @SerialEntry - public boolean enableFishingTimer = true; + public boolean enableFishingTimer = false; @SerialEntry public boolean changeTimerColor = true; @@ -364,7 +364,7 @@ public class SkyblockerConfig { public float fishingTimerScale = 1f; @SerialEntry - public boolean hideOtherPlayers = true; + 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 830c67fd..2a171a14 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -253,9 +253,9 @@ public class GeneralCategory { .option(Option.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.hideOtherPlayers, - () -> config.general.fishing.hideOtherPlayers, - newValue -> config.general.fishing.hideOtherPlayers = newValue) + .binding(defaults.general.fishing.hideOtherPlayersRods, + () -> config.general.fishing.hideOtherPlayersRods, + newValue -> config.general.fishing.hideOtherPlayersRods = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) -- cgit