diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2024-04-27 18:09:47 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 10:09:47 +0200 |
| commit | 18ea34b92d6106afda3b662256a2dc36dd4d8ec0 (patch) | |
| tree | 019eeeaeefabf5e6c02b2617096fe1280d3b6cc0 /src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java | |
| parent | 9a96a10de435e0959f20f44d452e6bb89f664ced (diff) | |
| download | notenoughupdates-18ea34b92d6106afda3b662256a2dc36dd4d8ec0.tar.gz notenoughupdates-18ea34b92d6106afda3b662256a2dc36dd4d8ec0.tar.bz2 notenoughupdates-18ea34b92d6106afda3b662256a2dc36dd4d8ec0.zip | |
Fix Hex overriding bz and added icons to new gemstones in /hex (#1119)
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java index f2b7b1c8..2e368f79 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java @@ -296,8 +296,12 @@ public class GuiCustomHex extends Gui { GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen); ContainerChest cc = (ContainerChest) chest.inventorySlots; ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50); + ItemStack bookStack = cc.getLowerChestInventory().getStackInSlot(32); CalendarOverlay.ableToClickCalendar = !(shouldOverrideET || shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp); + if (bookStack != null && bookStack.getItem() == Items.book) { + shouldOverrideGemstones = false; + } if (hexStack != null && hexStack.getItem() == Items.experience_bottle) return (shouldOverrideET || shouldOverrideFast); if (!shouldOverrideFast && !shouldOverrideET && !shouldOverrideGemstones && !shouldOverrideXp) { @@ -3076,6 +3080,14 @@ public class GuiCustomHex extends Gui { } else if (item.itemType == ItemType.OPAL_GEMSTONE) { levelStr = "❂"; + } else if (item.itemType == ItemType.ONYX_GEMSTONE) { + levelStr = "☠"; + } else if (item.itemType == ItemType.AQUAMARINE_GEMSTONE) { + levelStr = "α"; + } else if (item.itemType == ItemType.CITRINE_GEMSTONE) { + levelStr = "☘"; + } else if (item.itemType == ItemType.PERIDOT_GEMSTONE) { + levelStr = "☘"; } } else { levelStr = "?"; |