aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay
diff options
context:
space:
mode:
authorolim <bobq4582@gmail.com>2024-02-08 18:02:59 +0000
committerolim <bobq4582@gmail.com>2024-02-08 18:02:59 +0000
commit753fa369f40e5ec9521e5ff833892362696fa58e (patch)
treefd2c35dd1e04453c6524324d573136437475dcea /src/main/java/de/hysky/skyblocker/skyblock/searchOverlay
parent4739afedd23b85eee08e90b281f48b77af5528a1 (diff)
downloadSkyblocker-753fa369f40e5ec9521e5ff833892362696fa58e.tar.gz
Skyblocker-753fa369f40e5ec9521e5ff833892362696fa58e.tar.bz2
Skyblocker-753fa369f40e5ec9521e5ff833892362696fa58e.zip
correct tool tip and name for books in bazaar
corrected the tool tip for books in the bazaar. and fixed bug with suggestions not rendering.
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/searchOverlay')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java7
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
index 9155a894..b10510ed 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
@@ -73,7 +73,7 @@ public class OverlayScreen extends Screen {
}
// history item buttons
rowOffset += (int) (rowHeight * 0.75);
- int historyLength = SkyblockerConfigManager.get().general.searchOverlay.historyLength; //todo look different
+ int historyLength = SkyblockerConfigManager.get().general.searchOverlay.historyLength;
this.historyButtons = new ButtonWidget[historyLength];
for (int i = 0; i < historyLength; i++) {
String text = SearchOverManager.getHistory(i);
@@ -170,10 +170,11 @@ public class OverlayScreen extends Screen {
for (int i = 0; i < SkyblockerConfigManager.get().general.searchOverlay.maxSuggestions; i++) {
String text = SearchOverManager.getSuggestion(i);
if (!text.isEmpty()){
- String text2 = suggestionButtons[i].getMessage().getString();
+ suggestionButtons[i].visible = true;
+
boolean isNewText = !text.equals(suggestionButtons[i].getMessage().getString());
if (!isNewText) continue;
- suggestionButtons[i].visible = true;
+
suggestionButtons[i].setMessage(Text.literal(text).setStyle(Style.EMPTY));
//update the tool tip
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
index fbb3b5c9..1b019a7f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
@@ -124,7 +124,10 @@ public class SearchOverManager {
Matcher matcher = BAZAAR_ENCHANTMENT_PATTERN.matcher(id);
if (matcher.matches()) {//format enchantments
//remove ultimate if in name
- String name = matcher.group(1).replace("ULTIMATE_", "");
+ String name = matcher.group(1);
+ if (!name.contains("WISE")) { //only way found to remove ultimate from everything but ultimate wise
+ name = name.replace("ULTIMATE_", "");
+ }
name = name.replace("_", " ");
name = capitalizeFully(name);
int enchantLevel = Integer.parseInt(matcher.group(2));
@@ -133,7 +136,7 @@ public class SearchOverManager {
level = ROMAN_NUMERALS[enchantLevel - 1];
}
bazaarItems.add(name + " " + level);
- namesToId.put(name + " " + level, "ENCHANTED_BOOK");
+ namesToId.put(name + " " + level, matcher.group(1) + ";" + matcher.group(2));
continue;
}
//look up id for name