aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/config
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-02-12 15:55:53 -0500
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-02-12 16:07:46 -0500
commitcffa68314fc74fbedd97708df5ccb7c098eb638f (patch)
treed1d386cfa1197eb5b7458bc100da8385a0846880 /src/main/java/de/hysky/skyblocker/config
parent753fa369f40e5ec9521e5ff833892362696fa58e (diff)
downloadSkyblocker-cffa68314fc74fbedd97708df5ccb7c098eb638f.tar.gz
Skyblocker-cffa68314fc74fbedd97708df5ccb7c098eb638f.tar.bz2
Skyblocker-cffa68314fc74fbedd97708df5ccb7c098eb638f.zip
Fix bazaar and auction house items loading, item matching, and tooltips
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java81
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java1
2 files changed, 42 insertions, 40 deletions
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<String> bazaarHistory = new ArrayList<>();
+ public enum Alignment {
+ LEFT, RIGHT, MIDDLE;
- @SerialEntry
- public List<String> 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<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 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"))