From a4c42054306a5c5ec6e3daeb2ff98e9c816b0b9a Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Mon, 8 Jan 2024 10:57:56 -0500 Subject: option to hide pet candy count on max + fix pet lvl regex (#857) Added option to hide pet candy count on maxed out pets. #857 --- .../skyhanni/config/features/misc/MiscConfig.java | 11 +++++------ .../config/features/misc/PetCandyDisplayConfig.java | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/misc/PetCandyDisplayConfig.java (limited to 'src/main/java/at/hannibal2/skyhanni/config/features') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index 53a70019b..350f321f2 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -93,6 +93,11 @@ public class MiscConfig { @Accordion public TrackerConfig tracker = new TrackerConfig(); + @Expose + @ConfigOption(name = "Pet Candy Display", desc = "") + @Accordion + public PetCandyDisplayConfig petCandy = new PetCandyDisplayConfig(); + @Expose @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.") @ConfigEditorBoolean @@ -153,12 +158,6 @@ public class MiscConfig { @Expose public Position playerMovementSpeedPos = new Position(394, 124, false, true); - @Expose - @ConfigOption(name = "Pet Candy Used", desc = "Show the number of Pet Candy used on a pet.") - @ConfigEditorBoolean - @FeatureToggle - public boolean petCandyUsed = true; - @Expose @ConfigOption(name = "Server Restart Title", desc = "Show a title with seconds remaining until the server restarts after a Game Update or Scheduled Restart.") @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/PetCandyDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/PetCandyDisplayConfig.java new file mode 100644 index 000000000..57d97459b --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/PetCandyDisplayConfig.java @@ -0,0 +1,20 @@ +package at.hannibal2.skyhanni.config.features.misc; + +import at.hannibal2.skyhanni.config.FeatureToggle; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; +import io.github.moulberry.moulconfig.annotations.ConfigOption; + +public class PetCandyDisplayConfig { + @Expose + @ConfigOption(name = "Pet Candy Used", desc = "Show the number of Pet Candy used on a pet.") + @ConfigEditorBoolean + @FeatureToggle + public boolean showCandy = true; + + @Expose + @ConfigOption(name = "Hide On Maxed", desc = "Hides the candy count on pets that are max level.") + @ConfigEditorBoolean + @FeatureToggle + public boolean hideOnMaxed = false; +} -- cgit