From ec74273562ccecd6a759ae8ea1b31ea636fd4ff1 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 22 Jul 2024 04:11:25 -0400
Subject: Respect tooltip setting
---
.../hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java | 5 +++--
.../skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
(limited to 'src/main/java')
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java
index 126c55ec..93f669a0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java
@@ -24,7 +24,8 @@ import java.util.List;
public class Inventory implements ProfileViewerPage {
private static final Identifier TEXTURE = Identifier.of("textures/gui/container/generic_54.png");
- private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+ private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+ private static final TextRenderer textRenderer = CLIENT.textRenderer;
private final IntIntPair dimensions;
private final int itemsPerPage;
private final List<ItemStack> containerList;
@@ -86,7 +87,7 @@ public class Inventory implements ProfileViewerPage {
context.drawItemInSlot(textRenderer, containerList.get(startIndex + i), x, y);
if (mouseX > x -1 && mouseX < x + 16 && mouseY > y - 1 && mouseY < y + 16) {
- tooltip = containerList.get(startIndex + i).getTooltip(Item.TooltipContext.DEFAULT, MinecraftClient.getInstance().player, TooltipType.BASIC);
+ tooltip = containerList.get(startIndex + i).getTooltip(Item.TooltipContext.DEFAULT, CLIENT.player, CLIENT.options.advancedItemTooltips ? TooltipType.ADVANCED : TooltipType.BASIC);
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java
index e210ca9a..715a2b36 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java
@@ -22,7 +22,8 @@ import java.util.List;
public class PlayerInventory implements ProfileViewerPage {
private static final Identifier TEXTURE = Identifier.of("textures/gui/container/generic_54.png");
- private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
+ private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+ private static final TextRenderer textRenderer = CLIENT.textRenderer;
private final List<ItemStack> containerList;
private List<Text> tooltip = Collections.emptyList();
@@ -75,7 +76,7 @@ public class PlayerInventory implements ProfileViewerPage {
context.drawItemInSlot(textRenderer, containerList.get(startIndex + i), x, y);
if (mouseX > x -1 && mouseX < x + 16 && mouseY > y - 1 && mouseY < y + 16) {
- tooltip = containerList.get(startIndex + i).getTooltip(Item.TooltipContext.DEFAULT, MinecraftClient.getInstance().player, TooltipType.BASIC);
+ tooltip = containerList.get(startIndex + i).getTooltip(Item.TooltipContext.DEFAULT, CLIENT.player, CLIENT.options.advancedItemTooltips ? TooltipType.ADVANCED : TooltipType.BASIC);
}
}
}
--
cgit