diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-09-26 18:43:04 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-09-26 18:43:04 -0400 |
| commit | 0a26a5c74daedc2f3ff2090f55e38aae863fbe5a (patch) | |
| tree | 72275b807edb9e5169194ec5dda7f7ed13cadbb4 /src/main/java | |
| parent | df30c1d2fb38ef8e1300e5cb36cfc1c52fa6b825 (diff) | |
| download | Skyblocker-0a26a5c74daedc2f3ff2090f55e38aae863fbe5a.tar.gz Skyblocker-0a26a5c74daedc2f3ff2090f55e38aae863fbe5a.tar.bz2 Skyblocker-0a26a5c74daedc2f3ff2090f55e38aae863fbe5a.zip | |
Fix LBin Average Tooltip not working
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java | 10 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/info/DataTooltipInfoType.java | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java index 7fe67c7c..827fee74 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/adders/AvgBinTooltip.java @@ -1,6 +1,6 @@ package de.hysky.skyblocker.skyblock.item.tooltip.adders; -import de.hysky.skyblocker.config.configs.GeneralConfig; +import de.hysky.skyblocker.config.configs.GeneralConfig.Average; import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.skyblock.item.tooltip.SimpleTooltipAdder; import de.hysky.skyblocker.skyblock.item.tooltip.info.TooltipInfoType; @@ -21,8 +21,9 @@ public class AvgBinTooltip extends SimpleTooltipAdder { public void addToTooltip(@Nullable Slot focusedSlot, ItemStack stack, List<Text> lines) { String skyblockApiId = stack.getSkyblockApiId(); String neuName = stack.getNeuName(); + Average type = ItemTooltip.config.avg; - if (TooltipInfoType.ONE_DAY_AVERAGE.getData() == null || TooltipInfoType.THREE_DAY_AVERAGE.getData() == null) { + if ((TooltipInfoType.ONE_DAY_AVERAGE.getData() == null && type != Average.THREE_DAY) || (TooltipInfoType.THREE_DAY_AVERAGE.getData() == null && type != Average.ONE_DAY)) { ItemTooltip.nullWarning(); } else { /* @@ -30,10 +31,9 @@ public class AvgBinTooltip extends SimpleTooltipAdder { and enchanted books because there is no data for their in API. */ if (!neuName.isEmpty() && TooltipInfoType.LOWEST_BINS.hasOrNullWarning(skyblockApiId)) { - GeneralConfig.Average type = ItemTooltip.config.avg; // "No data" line because of API not keeping old data, it causes NullPointerException - if (type == GeneralConfig.Average.ONE_DAY || type == GeneralConfig.Average.BOTH) { + if (type == Average.ONE_DAY || type == Average.BOTH) { lines.add( Text.literal(String.format("%-19s", "1 Day Avg. Price:")) .formatted(Formatting.GOLD) @@ -43,7 +43,7 @@ public class AvgBinTooltip extends SimpleTooltipAdder { ) ); } - if (type == GeneralConfig.Average.THREE_DAY || type == GeneralConfig.Average.BOTH) { + if (type == Average.THREE_DAY || type == Average.BOTH) { lines.add( Text.literal(String.format("%-19s", "3 Day Avg. Price:")) .formatted(Formatting.GOLD) diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/info/DataTooltipInfoType.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/info/DataTooltipInfoType.java index 2edacb25..f396e4d3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/info/DataTooltipInfoType.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/info/DataTooltipInfoType.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock.item.tooltip.info; -import java.util.List; import java.util.concurrent.CompletableFuture; import org.jetbrains.annotations.Nullable; |