Merge pull request #537 from olim88/Search-overlays

Search overlays for bz and ah

2 files changed, 103 insertions, 20 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 6411d6e4..175c3bdf 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -241,6 +241,9 @@ public class SkyblockerConfig {
 		public FlameOverlay flameOverlay = new FlameOverlay();
 
 		@SerialEntry
+		public SearchOverlay searchOverlay = new SearchOverlay();
+
+		@SerialEntry
 		public List<Integer> lockedSlots = new ArrayList<>();
 
 		@SerialEntry
@@ -415,6 +418,31 @@ public class SkyblockerConfig {
 		public Alignment alignment = Alignment.MIDDLE;
 	}
 
+	public enum Direction {
+		HORIZONTAL, VERTICAL;
+
+		@Override
+		public String toString() {
+			return switch (this) {
+				case HORIZONTAL -> "Horizontal";
+				case VERTICAL -> "Vertical";
+			};
+		}
+	}
+
+	public enum Alignment {
+		LEFT, RIGHT, MIDDLE;
+
+		@Override
+		public String toString() {
+			return switch (this) {
+				case LEFT -> "Left";
+				case RIGHT -> "Right";
+				case MIDDLE -> "Middle";
+			};
+		}
+	}
+
 	public static class TeleportOverlay {
 		@SerialEntry
 		public boolean enableTeleportOverlays = true;
@@ -443,29 +471,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<String> bazaarHistory = new ArrayList<>();
+
+		@SerialEntry
+		public List<String> 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 bb2fdee5..bb333f79 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -649,6 +649,60 @@ 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"))
+						.collapsed(true)
+						.option(Option.<Boolean>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)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>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)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>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)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Integer>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)
+								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1))
+								.build())
+						.option(Option.<Integer>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)
+								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1))
+								.build())
+						.option(Option.<Boolean>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();
 	}
 }