From effb8c31bdc1188d7ecdc66e4b0398ba24ed402e Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 6 Feb 2024 15:00:20 +0000 Subject: initial implimentation basic implantation of features. --- .../hysky/skyblocker/config/SkyblockerConfig.java | 13 +++++++++++ .../config/categories/GeneralCategory.java | 26 ++++++++++++++++++++++ 2 files changed, 39 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 4acb8064..714229dc 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -237,6 +237,9 @@ public class SkyblockerConfig { @SerialEntry public FlameOverlay flameOverlay = new FlameOverlay(); + @SerialEntry + public SearchOverlay searchOverlay = new SearchOverlay(); + @SerialEntry public List lockedSlots = new ArrayList<>(); @@ -411,6 +414,16 @@ public class SkyblockerConfig { @SerialEntry public Alignment alignment = Alignment.MIDDLE; } + public static class SearchOverlay { + @SerialEntry + public boolean enableBazaar = true; + + @SerialEntry + public boolean enableAuctionHouse = true; + + @SerialEntry + public int maxSuggestions = 3; + } public static class TeleportOverlay { @SerialEntry 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 808b3c2c..a9b965cf 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -642,6 +642,32 @@ public class GeneralCategory { .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.8f).step(0.1f)) .build()) .build()) + //Search overlay + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay")) //todo description + .collapsed(true) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar")) + .binding(defaults.general.searchOverlay.enableBazaar, + () -> config.general.searchOverlay.enableBazaar, + newValue -> config.general.searchOverlay.enableBazaar = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableAuctionHouse")) + .binding(defaults.general.searchOverlay.enableAuctionHouse, + () -> config.general.searchOverlay.enableAuctionHouse, + newValue -> config.general.searchOverlay.enableAuctionHouse = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions")) + .binding(defaults.general.searchOverlay.maxSuggestions, + () -> config.general.searchOverlay.maxSuggestions, + newValue -> config.general.searchOverlay.maxSuggestions = newValue) + .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5 ).step(1)) + .build()) + .build()) .build(); } } -- cgit From 3e07ab5081136959990e3a019368ea43e481ca28 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 6 Feb 2024 17:27:38 +0000 Subject: add History add history options to the search overlay --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 9 +++++++++ .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) (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 714229dc..7f945035 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -423,6 +423,15 @@ public class SkyblockerConfig { @SerialEntry public int maxSuggestions = 3; + + @SerialEntry + public int historyLength = 3; + + @SerialEntry + public List bazaarHistory = new ArrayList<>(); + + @SerialEntry + public List auctionHistory = new ArrayList<>(); } public static class TeleportOverlay { 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 a9b965cf..f4674c2e 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -665,7 +665,14 @@ public class GeneralCategory { .binding(defaults.general.searchOverlay.maxSuggestions, () -> config.general.searchOverlay.maxSuggestions, newValue -> config.general.searchOverlay.maxSuggestions = newValue) - .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5 ).step(1)) + .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1)) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.historyLength")) + .binding(defaults.general.searchOverlay.historyLength, + () -> config.general.searchOverlay.historyLength, + newValue -> config.general.searchOverlay.historyLength = newValue) + .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1)) .build()) .build()) .build(); -- cgit From 6be6e2ee6b97d9807536d2205401dbfa963dce82 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 6 Feb 2024 19:39:16 +0000 Subject: Added keep previous search added option to keep the previous search --- 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 7f945035..7a9cb721 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -421,6 +421,9 @@ public class SkyblockerConfig { @SerialEntry public boolean enableAuctionHouse = true; + @SerialEntry + public boolean keepPreviousSearches = false; + @SerialEntry public int maxSuggestions = 3; 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 f4674c2e..3618f112 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -660,6 +660,13 @@ public class GeneralCategory { newValue -> config.general.searchOverlay.enableAuctionHouse = newValue) .controller(ConfigUtils::createBooleanController) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.keepPreviousSearches")) + .binding(defaults.general.searchOverlay.keepPreviousSearches, + () -> config.general.searchOverlay.keepPreviousSearches, + newValue -> config.general.searchOverlay.keepPreviousSearches = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions")) .binding(defaults.general.searchOverlay.maxSuggestions, -- cgit From c6915a199f151f05936cc6cb745f242e87a12c46 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 7 Feb 2024 18:07:40 +0000 Subject: add descriptions to the options add tool tip options for the settings --- .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 3618f112..4abf7836 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -644,10 +644,11 @@ public class GeneralCategory { .build()) //Search overlay .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay")) //todo description + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay")) .collapsed(true) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableBazaar.@Tooltip"))) .binding(defaults.general.searchOverlay.enableBazaar, () -> config.general.searchOverlay.enableBazaar, newValue -> config.general.searchOverlay.enableBazaar = newValue) @@ -655,6 +656,7 @@ public class GeneralCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableAuctionHouse")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableAuctionHouse.@Tooltip"))) .binding(defaults.general.searchOverlay.enableAuctionHouse, () -> config.general.searchOverlay.enableAuctionHouse, newValue -> config.general.searchOverlay.enableAuctionHouse = newValue) @@ -662,6 +664,7 @@ public class GeneralCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.keepPreviousSearches")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.keepPreviousSearches.@Tooltip"))) .binding(defaults.general.searchOverlay.keepPreviousSearches, () -> config.general.searchOverlay.keepPreviousSearches, newValue -> config.general.searchOverlay.keepPreviousSearches = newValue) @@ -669,6 +672,7 @@ public class GeneralCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.maxSuggestions.@Tooltip"))) .binding(defaults.general.searchOverlay.maxSuggestions, () -> config.general.searchOverlay.maxSuggestions, newValue -> config.general.searchOverlay.maxSuggestions = newValue) @@ -676,6 +680,7 @@ public class GeneralCategory { .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.historyLength")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.historyLength.@Tooltip"))) .binding(defaults.general.searchOverlay.historyLength, () -> config.general.searchOverlay.historyLength, newValue -> config.general.searchOverlay.historyLength = newValue) -- cgit From 91ce7cff49db6df844900dd4a9c405747ff4935a Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 8 Feb 2024 16:35:29 +0000 Subject: add commands to open seach add /bzs to search bazaar and /ahs to search ah --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 3 +++ .../de/hysky/skyblocker/config/categories/GeneralCategory.java | 8 ++++++++ 2 files changed, 11 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 7a9cb721..fd548d6a 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -430,6 +430,9 @@ public class SkyblockerConfig { @SerialEntry public int historyLength = 3; + @SerialEntry + public boolean enableCommands = false; + @SerialEntry public List bazaarHistory = new ArrayList<>(); 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 4abf7836..3d7f63ce 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -686,6 +686,14 @@ public class GeneralCategory { newValue -> config.general.searchOverlay.historyLength = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1)) .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableCommands")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay.enableCommands.@Tooltip"))) + .binding(defaults.general.searchOverlay.enableCommands, + () -> config.general.searchOverlay.enableCommands, + newValue -> config.general.searchOverlay.enableCommands = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) .build()) .build(); } -- cgit From cffa68314fc74fbedd97708df5ccb7c098eb638f Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 12 Feb 2024 15:55:53 -0500 Subject: Fix bazaar and auction house items loading, item matching, and tooltips --- .../hysky/skyblocker/config/SkyblockerConfig.java | 81 +++++++++++----------- .../config/categories/GeneralCategory.java | 1 + 2 files changed, 42 insertions(+), 40 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 fd548d6a..1bfd1b3c 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -414,30 +414,30 @@ public class SkyblockerConfig { @SerialEntry public Alignment alignment = Alignment.MIDDLE; } - public static class SearchOverlay { - @SerialEntry - public boolean enableBazaar = true; - - @SerialEntry - public boolean enableAuctionHouse = true; - @SerialEntry - public boolean keepPreviousSearches = false; - - @SerialEntry - public int maxSuggestions = 3; - - @SerialEntry - public int historyLength = 3; + public enum Direction { + HORIZONTAL, VERTICAL; - @SerialEntry - public boolean enableCommands = false; + @Override + public String toString() { + return switch (this) { + case HORIZONTAL -> "Horizontal"; + case VERTICAL -> "Vertical"; + }; + } + } - @SerialEntry - public List bazaarHistory = new ArrayList<>(); + public enum Alignment { + LEFT, RIGHT, MIDDLE; - @SerialEntry - public List auctionHistory = new ArrayList<>(); + @Override + public String toString() { + return switch (this) { + case LEFT -> "Left"; + case RIGHT -> "Right"; + case MIDDLE -> "Middle"; + }; + } } public static class TeleportOverlay { @@ -468,29 +468,30 @@ public class SkyblockerConfig { public float flameOpacity = 0f; } - public enum Direction { - HORIZONTAL, VERTICAL; + public static class SearchOverlay { + @SerialEntry + public boolean enableBazaar = true; - @Override - public String toString() { - return switch (this) { - case HORIZONTAL -> "Horizontal"; - case VERTICAL -> "Vertical"; - }; - } - } + @SerialEntry + public boolean enableAuctionHouse = true; - public enum Alignment { - LEFT, RIGHT, MIDDLE; + @SerialEntry + public boolean keepPreviousSearches = false; - @Override - public String toString() { - return switch (this) { - case LEFT -> "Left"; - case RIGHT -> "Right"; - case MIDDLE -> "Middle"; - }; - } + @SerialEntry + public int maxSuggestions = 3; + + @SerialEntry + public int historyLength = 3; + + @SerialEntry + public boolean enableCommands = false; + + @SerialEntry + public List bazaarHistory = new ArrayList<>(); + + @SerialEntry + public List auctionHistory = new ArrayList<>(); } public static class RichPresence { 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 3d7f63ce..9c3b672f 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -642,6 +642,7 @@ public class GeneralCategory { .controller(opt -> FloatSliderControllerBuilder.create(opt).range(0.0f, 0.8f).step(0.1f)) .build()) .build()) + //Search overlay .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.searchOverlay")) -- cgit