aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock/item
diff options
context:
space:
mode:
authorFix3dll <serhanduzce@gmail.com>2022-03-13 20:08:29 +0300
committerFix3dll <serhanduzce@gmail.com>2022-03-13 20:08:29 +0300
commitfd3ef912dec486091ef04da028e748b72e1de101 (patch)
treeeb0c2f2b5593c34c6bacbd25345491cd89ffe939 /src/main/java/me/xmrvizzy/skyblocker/skyblock/item
parentba65b74f0ba917f7911999a88b5239e9614090a8 (diff)
downloadSkyblocker-fd3ef912dec486091ef04da028e748b72e1de101.tar.gz
Skyblocker-fd3ef912dec486091ef04da028e748b72e1de101.tar.bz2
Skyblocker-fd3ef912dec486091ef04da028e748b72e1de101.zip
change: remove unnecessary noneMatch and add translation to enum
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index 0ea21bf5..cb760d7d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -51,8 +51,7 @@ public class PriceInfoTooltip {
String timestamp = getTimestamp(stack);
List<String> listString = lines.stream().map(Text::getString).toList();
- if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice
- && listString.stream().noneMatch(each -> each.contains("NPC Price:"))) {
+ if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice) {
if (npcPricesJson == null) {
if (!nullMsgSend) {
client.player.sendMessage(new TranslatableText("skyblocker.itemTooltip.nullMessage"), false);
@@ -160,7 +159,7 @@ public class PriceInfoTooltip {
client.player.sendMessage(new TranslatableText("skyblocker.itemTooltip.nullMessage"), false);
nullMsgSend = true;
}
- } else if (isMuseumJson.has(name) && listString.stream().noneMatch(each -> each.contains("Museum:"))) {
+ } else if (isMuseumJson.has(name)) {
String itemCategory = isMuseumJson.get(name).toString().replaceAll("\"", "");
String format = switch (itemCategory) {
case "Weapons" -> "%-18s";
@@ -170,7 +169,7 @@ public class PriceInfoTooltip {
lines.add(new LiteralText(String.format(format, "Museum: (" + itemCategory + ")"))
.formatted(Formatting.LIGHT_PURPLE)
.append(new LiteralText(timestamp != null ? timestamp : "").formatted(Formatting.RED)));
- } else if (timestamp != null && listString.stream().noneMatch(each -> each.contains("Obtained:"))) {
+ } else if (timestamp != null) {
lines.add(new LiteralText(String.format("%-21s", "Obtained: "))
.formatted(Formatting.LIGHT_PURPLE)
.append(new LiteralText(timestamp).formatted(Formatting.RED)));