aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorolim <bobq4582@gmail.com>2024-02-06 18:42:44 +0000
committerolim <bobq4582@gmail.com>2024-02-06 18:42:44 +0000
commitb13dd8dd03d9fc25e44d5c249dc330606ef220ba (patch)
tree78e35179bf8164cef90c9435b45bc1cbdbcc7ae1
parent3639059855336f7755d56a71b8757781fb3e7271 (diff)
downloadSkyblocker-b13dd8dd03d9fc25e44d5c249dc330606ef220ba.tar.gz
Skyblocker-b13dd8dd03d9fc25e44d5c249dc330606ef220ba.tar.bz2
Skyblocker-b13dd8dd03d9fc25e44d5c249dc330606ef220ba.zip
fixed some names
removed colour codes from names so they do not interfere with search
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java16
2 files changed, 13 insertions, 6 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 8e8fdc2a..cf9a57f3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/OverlayScreen.java
@@ -93,7 +93,6 @@ public class OverlayScreen extends Screen {
addDrawableChild(finishedButton);
this.setInitialFocus(searchField);
-
}
@Override
@@ -103,8 +102,6 @@ public class OverlayScreen extends Screen {
if(historyButtons.length > 0 && historyButtons[0] != null){
context.drawText(textRenderer, "History:", historyButtons[0].getX()+2, historyButtons[0].getY() - 10, 0xFFFFFFFF, true); //todo load form en_us and rowHeight
}
-
-
}
@Override
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 e8f78229..87f4a27f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/searchOverlay/SearchOverManager.java
@@ -58,6 +58,7 @@ public class SearchOverManager {
JsonObject product = entry.getValue().getAsJsonObject();
String name = itemNameLookup.get(product.get("product_id").getAsString()); //todo work with enchants
if (name != null){
+ name = trimItemColor(name);
bazaarItems.add(name);
}
@@ -72,12 +73,22 @@ public class SearchOverManager {
//get auction items
//items not in bazaar? todo work out how to get this (e.g. there are no pets) (there is a can auction flag)
for (String itemName : itemNameLookup.values()){
- if (!bazaarItems.contains(itemName)){
- auctionItems.add(itemName);
+ String cleanName = trimItemColor(itemName);
+ if (!bazaarItems.contains(cleanName)){
+ auctionItems.add(cleanName);
}
}
}
+ private static String trimItemColor(String string){
+ if (string.isEmpty()) return string;
+ if (string.startsWith("ยง") ){
+ return string.substring(2);
+ }else {
+ return string;
+ }
+ }
+
public static void updateSign(SignBlockEntity sign, boolean front, boolean isAuction) {
visible= true;
@@ -119,7 +130,6 @@ public class SearchOverManager {
}
}
return null;
-
}
private static void saveHistory(){
//save to history