diff options
| author | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-06-10 12:09:05 +0800 |
|---|---|---|
| committer | Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> | 2024-06-10 12:09:05 +0800 |
| commit | 48430e36a87c09e033c0bd43e65b70bbac0e2664 (patch) | |
| tree | 9b9e336cd456def6ddc41bec1dcaf6980ea68022 /src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java | |
| parent | 2ce943b4278b7d89898acdde6046fb347e2447b1 (diff) | |
| download | Skyblocker-48430e36a87c09e033c0bd43e65b70bbac0e2664.tar.gz Skyblocker-48430e36a87c09e033c0bd43e65b70bbac0e2664.tar.bz2 Skyblocker-48430e36a87c09e033c0bd43e65b70bbac0e2664.zip | |
Fix merge conflicts
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index 0b5e623a..bee7b8ff 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -6,6 +6,7 @@ import de.hysky.skyblocker.config.configs.DungeonsConfig; import de.hysky.skyblocker.config.configs.UIAndVisualsConfig; import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor; import de.hysky.skyblocker.mixins.accessors.ScreenAccessor; +import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip; import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType; import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.Utils; @@ -79,11 +80,11 @@ public class ChestValue { } String name = stack.getName().getString(); - String internalName = stack.getSkyblockApiId(); + String id = stack.getSkyblockApiId(); //Regular item price - if (internalName != null) { - LongBooleanPair priceData = getItemPrice(internalName); + if (id != null) { + LongBooleanPair priceData = getItemPrice(id); if (!priceData.rightBoolean()) hasIncompleteData = true; @@ -158,10 +159,10 @@ public class ChestValue { continue; } - String internalName = stack.getSkyblockApiId(); + String id = stack.getSkyblockApiId(); - if (internalName != null) { - LongBooleanPair priceData = getItemPrice(internalName); + if (id != null) { + LongBooleanPair priceData = getItemPrice(id); if (!priceData.rightBoolean()) hasIncompleteData = true; |