From 765b569dd667d6a7e86b26d5ef1e7c5a5bade8f7 Mon Sep 17 00:00:00 2001
From: Ascynx <78341107+Ascynx@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:41:12 +0200
Subject: Bug fixes (aka #249 but less of a mess) (#251)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* made equipment overlay own class

lmk if there's any bugs

* fix infer (i think)

* fuck infer

* First refactoringering

* Fix more stuff

* itemlisting

* NEU 3.0 release notes

* The changes of #249 (https://github.com/NotEnoughUpdates/NotEnoughUpdates/pull/249)

* fixed nea bug

https://imgur.com/a/Sg3iw74

* whitespace

* fixed equipment overlay

not working ? and caching

* nopoing

idk what im doing

* FHJNX GHD

trwsmokürtsew tze jiozterdgjjiüzetr jipztr

* reverted "janky pet expended bugfix"

* Revert "FHJNX GHD"

This reverts commit 24eceba3db5e500be296f5a96412bd8b95647a22.

* Revert "nopoing"

This reverts commit bee07cb98f8b9672c2e1bc192c6c3e5ae8b02b95.

* Revert "fixed equipment overlay"

This reverts commit b15376f934a738900e2dd98efdb0d4a7ec131dfa.

* idk i think this works

maybe

* ???

?????????

* Update to the catacombs base floor exp.

Based on the hypixel wiki's calculator (see: https://canary.discord.com/channels/516977525906341928/1016050994557222912)

* no more black lines

* equipment cache

* Fix lag with optifine and removal of unused field.

Removed onMouseClick as it was triggered more than once per tick when optifine is installed.
Removed tooltipsToDisplay field (as it was replaced by a local variable).

* this should be true by default to keep old behaviour

* itemList now doesn't close when clicking the searchbar

itemList will now only close when searchMode is triggered.

* Infer moment

hoping this doesn't trigger it.

* I forgot to push that change when I created the pr.

* Fixed json resetting if an item has no nbt

Co-authored-by: efefury <69400149+efefury@users.noreply.github.com>
Co-authored-by: nea <romangraef@gmail.com>
Co-authored-by: Lulonaut <lulonaut@tutanota.de>
Co-authored-by: nopo <noahogno@gmail.com>
Co-authored-by: Roman / Linnea Gräf <roman.graef@gmail.com>
Co-authored-by: Lorenz <lo.scherf@gmail.com>
---
 .../moulberry/notenoughupdates/NEUManager.java     | 16 +++---
 .../miscfeatures/StorageManager.java               | 63 +++++++++++++++++++++-
 .../notenoughupdates/miscgui/GuiEnchantColour.java |  8 ++-
 .../miscgui/GuiInvButtonEditor.java                | 56 ++++++++++++++++---
 .../notenoughupdates/mixins/MixinRenderItem.java   |  7 +--
 .../overlays/EquipmentOverlay.java                 | 30 +++++++++++
 .../profileviewer/DungeonPage.java                 | 33 ++++++++++--
 7 files changed, 187 insertions(+), 26 deletions(-)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index 35385f38..5d65d07e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -399,17 +399,19 @@ public class NEUManager {
 	 * function. This method is used for the chest-item-search feature.
 	 */
 	public boolean searchString(String toSearch, String query) {
-		int lastMatch = -1;
+		int lastQueryMatched = -1;
 
 		toSearch = clean(toSearch).toLowerCase();
 		query = clean(query).toLowerCase();
-		String[] splitToSeach = toSearch.split(" ");
+		String[] splitToSearch = toSearch.split(" ");
+		String[] queryArray = query.split(" ");
+
 		out:
-		for (String s : query.split(" ")) {
-			for (int i = 0; i < splitToSeach.length; i++) {
-				if (!(lastMatch == -1 || lastMatch == i - 1)) continue;
-				if (splitToSeach[i].startsWith(s)) {
-					lastMatch = i;
+		for (int j = 0; j < queryArray.length; j++) {
+			for (int i = 0; i < splitToSearch.length; i++) {
+				if ((queryArray.length - (lastQueryMatched != -1 ? lastQueryMatched : 0)) > (splitToSearch.length - i)) continue;
+				if (splitToSearch[i].startsWith(queryArray[j])) {
+					lastQueryMatched = j;
 					continue out;
 				}
 			}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
index cc463308..93e9f516 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
@@ -45,6 +45,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.JsonToNBT;
 import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTException;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.nbt.NBTTagByteArray;
 import net.minecraft.nbt.NBTTagCompound;
@@ -83,11 +84,12 @@ public class StorageManager {
 	private static final StorageManager INSTANCE = new StorageManager();
 	private static final Gson GSON = new GsonBuilder()
 		.registerTypeAdapter(ItemStack.class, new ItemStackSerializer())
-		.registerTypeAdapter(ItemStack.class, new ItemStackDeserilizer()).create();
+		.registerTypeAdapter(ItemStack.class, new ItemStackDeserializer()).create();
 
 	public static class ItemStackSerializer implements JsonSerializer<ItemStack> {
 		@Override
 		public JsonElement serialize(ItemStack src, Type typeOfSrc, JsonSerializationContext context) {
+			fixPetInfo(src);
 			NBTTagCompound tag = src.serializeNBT();
 			return nbtToJson(tag);
 		}
@@ -95,7 +97,7 @@ public class StorageManager {
 
 	private static final Pattern JSON_FIX_REGEX = Pattern.compile("\"([^,:]+)\":");
 
-	public static class ItemStackDeserilizer implements JsonDeserializer<ItemStack> {
+	public static class ItemStackDeserializer implements JsonDeserializer<ItemStack> {
 		@Override
 		public ItemStack deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
 			throws JsonParseException {
@@ -135,6 +137,63 @@ public class StorageManager {
 		return (JsonObject) loadJson(NBTTagCompound);
 	}
 
+	private static class PetInfo {
+		String type;
+		Boolean active;
+		Double exp;
+		String tier;
+		Boolean hideInfo;
+		Integer candyUsed;
+		String uuid;
+		Boolean hideRightClick;
+		String heldItem;
+		String skin;
+
+		private <T> void appendIfNotNull(StringBuilder builder, String key, T value) {
+			if (value != null) {
+				if (builder.indexOf("{") != builder.length()-1) {
+					builder.append(",");
+				}
+				builder.append(key).append(":");
+				if (value instanceof String) {
+					builder.append("\"").append(value).append("\"");
+				} else {
+					builder.append(value);
+				}
+			}
+		}
+
+		@Override
+		public String toString() {
+			StringBuilder object = new StringBuilder();
+			object.append("{");
+			appendIfNotNull(object, "type", type);
+			appendIfNotNull(object, "active", active);
+			appendIfNotNull(object, "exp", exp);
+			appendIfNotNull(object, "tier", tier);
+			appendIfNotNull(object, "hideInfo", hideInfo);
+			appendIfNotNull(object, "candyUsed", candyUsed);
+			appendIfNotNull(object, "uuid", uuid);
+			appendIfNotNull(object, "hideRightClick", hideRightClick);
+			appendIfNotNull(object, "heldItem", heldItem);
+			appendIfNotNull(object, "skin", skin);
+			object.append("}");
+			return object.toString();
+		}
+	}
+
+	private static void fixPetInfo(ItemStack src) {
+		if (src.getTagCompound() == null || !src.getTagCompound().hasKey("ExtraAttributes") || !src.getTagCompound().getCompoundTag("ExtraAttributes").hasKey("petInfo")) return;
+		PetInfo oldPetInfo = GSON.fromJson(src.getTagCompound().getCompoundTag("ExtraAttributes").getString("petInfo"), PetInfo.class);
+		src.getTagCompound().getCompoundTag("ExtraAttributes").removeTag("petInfo");
+		try {
+			src.getTagCompound().getCompoundTag("ExtraAttributes").setTag(
+				"petInfo",
+				JsonToNBT.getTagFromJson(oldPetInfo.toString())
+			);
+		} catch (NBTException | NullPointerException ignored) {}
+	}
+
 	private static JsonElement loadJson(NBTBase tag) {
 		if (tag instanceof NBTTagCompound) {
 			NBTTagCompound compoundTag = (NBTTagCompound) tag;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
index 31713189..b90b1356 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiEnchantColour.java
@@ -271,17 +271,21 @@ public class GuiEnchantColour extends GuiScreen {
 		}
 
 		if (mouseX >= guiLeft + xSize + 3 && mouseX < guiLeft + xSize + 39) {
+			boolean renderingTooltip = false;
+
 			if (mouseY >= guiTopSidebar - 34 && mouseY <= guiTopSidebar - 18 && maxedBookFound == 1) {
 				tooltipToDisplay = maxedBook.getTooltip(Minecraft.getMinecraft().thePlayer, false);
 				Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
 				tooltipToDisplay = null;
+				renderingTooltip = true;
 			}
-			if (mouseY >= guiTopSidebar - 52 && mouseY <= guiTopSidebar - 34 && maxedAttBookFound == 1) {
+			if (mouseY >= guiTopSidebar - 52 && mouseY <= guiTopSidebar - 34 && maxedAttBookFound == 1 && !renderingTooltip) {
 				tooltipToDisplay = maxedAttBook.getTooltip(Minecraft.getMinecraft().thePlayer, false);
 				Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
 				tooltipToDisplay = null;
+				renderingTooltip = true;
 			}
-			if (mouseY >= guiTopSidebar - 18 && mouseY <= guiTopSidebar - 2) {
+			if (mouseY >= guiTopSidebar - 18 && mouseY <= guiTopSidebar - 2 && !renderingTooltip) {
 				tooltipToDisplay = Lists.newArrayList(
 					EnumChatFormatting.AQUA + "NEUEC Colouring Guide",
 					EnumChatFormatting.GREEN + "",
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
index 40e12e35..4d18ea18 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiInvButtonEditor.java
@@ -25,11 +25,13 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
+import io.github.moulberry.notenoughupdates.NEUOverlay;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.GlScissorStack;
 import io.github.moulberry.notenoughupdates.core.GuiElementTextField;
 import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger;
 import io.github.moulberry.notenoughupdates.options.NEUConfig;
+import io.github.moulberry.notenoughupdates.overlays.EquipmentOverlay;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -316,6 +318,13 @@ public class GuiInvButtonEditor extends GuiScreen {
 		GlStateManager.color(1, 1, 1, 1);
 		Utils.drawTexturedRect(guiLeft, guiTop, xSize, ySize, 0, xSize / 256f, 0, ySize / 256f, GL11.GL_NEAREST);
 
+		if (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) {
+			EquipmentOverlay.INSTANCE.renderPreviewArmorHud();
+		}
+		if (NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay) {
+			EquipmentOverlay.INSTANCE.renderPreviewPetInvHud();
+		}
+
 		for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
 			int x = guiLeft + button.x;
 			int y = guiTop + button.y;
@@ -326,6 +335,17 @@ public class GuiInvButtonEditor extends GuiScreen {
 				y += ySize;
 			}
 
+			if (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+					x -= 25;
+				}
+			}
+			if (NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+					x -= 25;
+				}
+			}
+
 			if (button.isActive()) {
 				GlStateManager.color(1, 1, 1, 1f);
 			} else {
@@ -358,7 +378,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(custom_ench_colour);
 		GlStateManager.color(1, 1, 1, 1);
 		Utils.drawTexturedRect(
-			guiLeft - 88 - 2 - 22,
+			guiLeft - 88 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 2,
 			88,
 			20,
@@ -369,7 +389,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 			GL11.GL_NEAREST
 		);
 		Utils.drawTexturedRect(
-			guiLeft - 88 - 2 - 22,
+			guiLeft - 88 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 2 + 24,
 			88,
 			20,
@@ -382,7 +402,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		Utils.drawStringCenteredScaledMaxWidth(
 			"Load preset",
 			fontRendererObj,
-			guiLeft - 44 - 2 - 22,
+			guiLeft - 44 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 8,
 			false,
 			86,
@@ -391,7 +411,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		Utils.drawStringCenteredScaledMaxWidth(
 			"from Clipboard",
 			fontRendererObj,
-			guiLeft - 44 - 2 - 22,
+			guiLeft - 44 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 16,
 			false,
 			86,
@@ -400,7 +420,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		Utils.drawStringCenteredScaledMaxWidth(
 			"Save preset",
 			fontRendererObj,
-			guiLeft - 44 - 2 - 22,
+			guiLeft - 44 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 8 + 24,
 			false,
 			86,
@@ -409,7 +429,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		Utils.drawStringCenteredScaledMaxWidth(
 			"to Clipboard",
 			fontRendererObj,
-			guiLeft - 44 - 2 - 22,
+			guiLeft - 44 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0),
 			guiTop + 16 + 24,
 			false,
 			86,
@@ -417,7 +437,7 @@ public class GuiInvButtonEditor extends GuiScreen {
 		);
 
 		if (!validShareContents()) {
-			Gui.drawRect(guiLeft - 88 - 2 - 22, guiTop + 2, guiLeft - 2 - 22, guiTop + 2 + 20, 0x80000000);
+			Gui.drawRect(guiLeft - 88 - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0), guiTop + 2, guiLeft - 2 - 22 - (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud ? 25 : 0), guiTop + 2 + 20, 0x80000000);
 		}
 
 		GlStateManager.color(1, 1, 1, 1);
@@ -461,6 +481,17 @@ public class GuiInvButtonEditor extends GuiScreen {
 				y += ySize;
 			}
 
+			if (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+					x -= 25;
+				}
+			}
+			if (NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+					x -= 25;
+				}
+			}
+
 			GlStateManager.translate(0, 0, 300);
 			editorLeft = x + 8 - editorXSize / 2;
 			editorTop = y + 18 + 2;
@@ -741,6 +772,17 @@ public class GuiInvButtonEditor extends GuiScreen {
 				y += ySize;
 			}
 
+			if (NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+					x -= 25;
+				}
+			}
+			if (NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay) {
+				if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+					x -= 25;
+				}
+			}
+
 			if (mouseX >= x && mouseY >= y &&
 				mouseX <= x + 18 && mouseY <= y + 18) {
 				if (editingButton == button) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java
index dc59c0bb..7c2cfcbf 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinRenderItem.java
@@ -25,6 +25,7 @@ import io.github.moulberry.notenoughupdates.core.ChromaColour;
 import io.github.moulberry.notenoughupdates.listener.RenderListener;
 import io.github.moulberry.notenoughupdates.miscfeatures.ItemCooldowns;
 import io.github.moulberry.notenoughupdates.miscfeatures.ItemCustomizeManager;
+import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
@@ -195,7 +196,7 @@ public abstract class MixinRenderItem {
 
 	@Inject(method = "renderItemIntoGUI", at = @At("HEAD"))
 	public void renderItemHead(ItemStack stack, int x, int y, CallbackInfo ci) {
-		if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock()) {
+		if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock() && !(Minecraft.getMinecraft().currentScreen instanceof GuiProfileViewer)) {
 			boolean matches = false;
 
 			GuiTextField textField = NotEnoughUpdates.INSTANCE.overlay.getTextField();
@@ -221,7 +222,7 @@ public abstract class MixinRenderItem {
 	@Inject(method = "renderItemIntoGUI", at = @At("RETURN"))
 	public void renderItemReturn(ItemStack stack, int x, int y, CallbackInfo ci) {
 		if (stack != null && stack.stackSize != 1) return;
-		if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock()) {
+		if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock() && !(Minecraft.getMinecraft().currentScreen instanceof GuiProfileViewer)) {
 			boolean matches = false;
 
 			GuiTextField textField = NotEnoughUpdates.INSTANCE.overlay.getTextField();
@@ -252,7 +253,7 @@ public abstract class MixinRenderItem {
 		CallbackInfo ci
 	) {
 		if (stack != null && stack.stackSize != 1) {
-			if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock()) {
+			if (NotEnoughUpdates.INSTANCE.overlay.searchMode && RenderListener.drawingGuiScreen && NotEnoughUpdates.INSTANCE.isOnSkyblock() && !(Minecraft.getMinecraft().currentScreen instanceof GuiProfileViewer)) {
 				boolean matches = false;
 
 				GuiTextField textField = NotEnoughUpdates.INSTANCE.overlay.getTextField();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/EquipmentOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/EquipmentOverlay.java
index 1bf61ad8..ea440396 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/EquipmentOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/EquipmentOverlay.java
@@ -422,6 +422,36 @@ public class EquipmentOverlay {
 		return offset + 20;
 	}
 
+	public void renderPreviewArmorHud() {
+		if (!NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud) return;
+
+		int width = Utils.peekGuiScale().getScaledWidth();
+		int height = Utils.peekGuiScale().getScaledHeight();
+
+		Minecraft.getMinecraft().getTextureManager().bindTexture(getCustomEquipmentTexture(NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay));
+
+		GlStateManager.color(1, 1, 1, 1);
+		GL11.glTranslatef(0, 0, 401);
+		float yNumber = (float) (height - 167) / 2f;
+		Utils.drawTexturedRect((float) ((width - 224.1) / 2f), yNumber, 31, 86, GL11.GL_NEAREST);
+		GlStateManager.bindTexture(0);
+	}
+
+	public void renderPreviewPetInvHud() {
+		if (!NotEnoughUpdates.INSTANCE.config.petOverlay.petInvDisplay) return;
+
+		int width = Utils.peekGuiScale().getScaledWidth();
+		int height = Utils.peekGuiScale().getScaledHeight();
+
+		Minecraft.getMinecraft().getTextureManager().bindTexture(getCustomPetTexture(NotEnoughUpdates.INSTANCE.config.customArmour.enableArmourHud));
+
+		GlStateManager.color(1, 1, 1, 1);
+		GL11.glTranslatef(0, 0, 401);
+		float yNumber = (float) (height - 23) / 2f;
+		Utils.drawTexturedRect((float) ((width - 224.1) / 2f), yNumber, 31, 32, GL11.GL_NEAREST);
+		GlStateManager.bindTexture(0);
+	}
+
 	public ItemStack slot1 = null;
 	public ItemStack slot2 = null;
 	public ItemStack slot3 = null;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/DungeonPage.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/DungeonPage.java
index c707f7fc..15a70ded 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/DungeonPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/DungeonPage.java
@@ -196,9 +196,9 @@ public class DungeonPage extends GuiProfileViewerPage {
 				if (F7 > 50) {
 					F7 = 50;
 				}
-				float xpF5 = 2000 * (F5 / 100 + 1);
-				float xpF6 = 4000 * (F6 / 100 + 1);
-				float xpF7 = 20000 * (F7 / 100 + 1);
+				float xpF5 = 2400 * (F5 / 100 + 1);
+				float xpF6 = 4880 * (F6 / 100 + 1);
+				float xpF7 = 28000 * (F7 / 100 + 1);
 				if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
 					xpF5 *= 1.1;
 					xpF6 *= 1.1;
@@ -306,6 +306,13 @@ public class DungeonPage extends GuiProfileViewerPage {
 							0
 						)
 					);
+				float M7 =
+					(
+						Utils.getElementAsFloat(
+							Utils.getElement(profileInfo, "dungeons.dungeon_types.master_catacombs.tier_completions." + 7),
+							0
+						)
+					);
 				if (M3 > 50) {
 					M3 = 50;
 				}
@@ -318,22 +325,28 @@ public class DungeonPage extends GuiProfileViewerPage {
 				if (M6 > 50) {
 					M6 = 50;
 				}
-				float xpM3 = 36500 * (M3 / 100 + 1);
-				float xpM4 = 48500 * (M4 / 100 + 1);
+				if (M7 > 50) {
+					M7 = 50;
+				}
+				float xpM3 = 35000 * (M3 / 100 + 1);
+				float xpM4 = 55000 * (M4 / 100 + 1);
 				float xpM5 = 70000 * (M5 / 100 + 1);
 				float xpM6 = 100000 * (M6 / 100 + 1);
+				float xpM7 = 300000 * (M7 / 100 + 1);
 				//No clue if M3 or M4 xp values are right
 				if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
 					xpM3 *= 1.1;
 					xpM4 *= 1.1;
 					xpM5 *= 1.1;
 					xpM6 *= 1.1;
+					xpM7 *= 1.1;
 				}
 
 				long runsM3 = (int) Math.ceil(floorLevelToXP / xpM3);
 				long runsM4 = (int) Math.ceil(floorLevelToXP / xpM4);
 				long runsM5 = (int) Math.ceil(floorLevelToXP / xpM5);
 				long runsM6 = (int) Math.ceil(floorLevelToXP / xpM6);
+				long runsM7 = (int) Math.ceil(floorLevelToXP / xpM7);
 
 				float timeM3 = Utils.getElementAsFloat(
 					Utils.getElement(profileInfo, "dungeons.dungeon_types.master_catacombs.fastest_time_s_plus.3"),
@@ -351,6 +364,10 @@ public class DungeonPage extends GuiProfileViewerPage {
 					Utils.getElement(profileInfo, "dungeons.dungeon_types.master_catacombs.fastest_time_s_plus.6"),
 					0
 				);
+				float timeM7 = Utils.getElementAsFloat(
+					Utils.getElement(profileInfo, "dungeons.dungeon_types.master_catacombs.fastest_time_s_plus.7"),
+					0
+				);
 
 				getInstance().tooltipToDisplay =
 					Lists.newArrayList(
@@ -358,6 +375,7 @@ public class DungeonPage extends GuiProfileViewerPage {
 						String.format("# M4 Runs (%s xp) : %d", StringUtils.shortNumberFormat(xpM4), runsM4),
 						String.format("# M5 Runs (%s xp) : %d", StringUtils.shortNumberFormat(xpM5), runsM5),
 						String.format("# M6 Runs (%s xp) : %d", StringUtils.shortNumberFormat(xpM6), runsM6),
+            String.format("# M7 Runs (%s xp) : %d", StringUtils.shortNumberFormat(xpM7), runsM7),
 						""
 					);
 				boolean hasTime = false;
@@ -381,6 +399,11 @@ public class DungeonPage extends GuiProfileViewerPage {
 						.tooltipToDisplay.add(String.format("Expected Time (M6) : %s", Utils.prettyTime(runsM6 * (long) (timeM6 * 1.2))));
 					hasTime = true;
 				}
+				if (timeM7 > 1000) {
+					getInstance()
+						.tooltipToDisplay.add(String.format("Expected Time (M7) : %s", Utils.prettyTime(runsM7 * (long) (timeM7 * 1.2))));
+					hasTime = true;
+				}
 				if (hasTime) {
 					getInstance().tooltipToDisplay.add("");
 				}
-- 
cgit 


From 1fec0d019215df8c57d410c18bd06445d8c2ded7 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:23:14 +1000
Subject: Fix crash related to profile viewer button (#272)

---
 .../io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
index 7c3414fa..be36d0b4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
@@ -96,7 +96,7 @@ public abstract class MixinGuiContainer extends GuiScreen {
 					if (tag.hasKey("SkullOwner") && tag.getCompoundTag("SkullOwner").hasKey("Name")) {
 						String tagName = tag.getCompoundTag("SkullOwner").getString("Name");
 						String displayName = Utils.cleanColour(cc.inventorySlots.get(22).getStack().getDisplayName());
-						if (tagName.equals(displayName.substring(displayName.length() - tagName.length()))) {
+						if (displayName.length() - tagName.length() > 0 && tagName.equals(displayName.substring(displayName.length() - tagName.length()))) {
 							ci.cancel();
 
 							this.zLevel = 100.0F;
-- 
cgit 


From 16fedc90309a898bc709eaadc944fd047300fd0d Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:24:07 +1000
Subject: Fixed pet overlay going to level 100 (#268)

---
 Update Notes/2.1.md                                                      | 1 +
 .../java/io/github/moulberry/notenoughupdates/util/XPInformation.java    | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/main/java/io')

diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index 9c73e649..fa49a1d0 100644
--- a/Update Notes/2.1.md	
+++ b/Update Notes/2.1.md	
@@ -10,6 +10,7 @@
 - [Donpireso replied to a sba dev's email about some of sba features, and it seems to imply that blocking clicks in guis aren't bannable](https://cdn.discordapp.com/attachments/823769568933576764/906101631861526559/unknown.png)
   - Made it if you hold shift in the enchant solvers it overrides prevent missclicks - nopo
 - Fixed pet overlay not updating when going into /pets - nopo
+- Fixed pet overlay randomly going to level 100 - nopo
 - [Added an armor overlay for the new armor slots](https://cdn.discordapp.com/attachments/832652653292027904/922399046528794634/unknown.png)
 - Added a pet overlay that shows your active pet in your inventory - nopo
 - [Price graph for items on /ah and /bz](https://cdn.discordapp.com/attachments/896407218151366687/926968296929107999/unknown.png) - DeDiamondPro
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
index 58794e07..81eea343 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/XPInformation.java
@@ -187,6 +187,7 @@ public class XPInformation {
 					skillInfo.currentXp += updateWithPercentage.get(skill) / 100f * cap;
 					skillInfo.totalXp += skillInfo.currentXp;
 					skillInfo.currentXpMax = cap;
+					break;
 				} else {
 					skillInfo.totalXp += cap;
 				}
-- 
cgit 


From 996b42013330944403684b4a127015e5b04c6295 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Mon, 12 Sep 2022 16:26:49 +0200
Subject: Fix bazaar item sack (#271)

---
 .../moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java    | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java
index 7007f39b..9ab85390 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BazaarSacksProfit.java
@@ -103,6 +103,10 @@ public class BazaarSacksProfit {
 						.getItemInformation()
 						.entrySet()) {
 						String internalName = entry.getKey();
+
+						// Ignoring builder melon, builder clay and builder cactus
+						if (NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(internalName) == null) continue;
+
 						JsonObject object = entry.getValue();
 						if (object.has("displayname")) {
 							String name = object.get("displayname").getAsString();
-- 
cgit 


From 7fb629f0fc0d6e2455418f85c36a11667f888d42 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:27:37 +1000
Subject: Fixed clicking outside of experimentation game causing it to go count
 that as a valid click (#269)

---
 Update Notes/2.1.md                                                | 1 +
 .../moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/io')

diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index fa49a1d0..6080e656 100644
--- a/Update Notes/2.1.md	
+++ b/Update Notes/2.1.md	
@@ -149,6 +149,7 @@
 - Fixed shortened damage - nopo
 - Fixed bazaar prices sorting order in neu item list - hannibal2
 - Fixed priceless items showing first in the missing tab of the accessory bag overlay - nopo
+- Fixed clicking outside of experimentation game causing it to go count that as a valid click - nopo
 - Fixed storage gui when having locked backpack slots - nopo
 
 ### **Other:**
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
index 558917fe..a1580d8e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
@@ -342,8 +342,9 @@ public class EnchantingSolvers {
 
 						if (chronomatronReplayIndex < chronomatronOrder.size()) {
 							String chronomatronCurrent = chronomatronOrder.get(chronomatronReplayIndex);
-							if (!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
-								chronomatronCurrent.equals(displayName) || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT) {
+							if ((!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
+								chronomatronCurrent.equals(displayName) || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT) &&
+								stack.getItem() != Item.getItemFromBlock(Blocks.stained_glass_pane) && slotId != 4 && slotId != 49) {
 								chronomatronReplayIndex++;
 								Minecraft.getMinecraft().playerController.windowClick(windowId, slotId,
 									2, mode, Minecraft.getMinecraft().thePlayer
@@ -374,7 +375,7 @@ public class EnchantingSolvers {
 						long currentTime = System.currentTimeMillis();
 						if (currentTime - millisLastClick > 150 &&
 							(!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
-								current.containerIndex == slotId || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT)) {
+								current.containerIndex == slotId || Keyboard.getEventKey() == Keyboard.KEY_LSHIFT) && (slotId < 45 && slotId > 8)) {
 							ultrasequencerReplayIndex++;
 							Minecraft.getMinecraft().playerController.windowClick(windowId, slotId,
 								2, mode, Minecraft.getMinecraft().thePlayer
-- 
cgit 


From d404b5c694e9873c1f2bcb48966785ad5c9640d0 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 00:28:25 +1000
Subject: Fixed dungeon profit not showing books when one sells for 0 (#274)

---
 .../github/moulberry/notenoughupdates/listener/RenderListener.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
index d4df7bfd..a8d69c87 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
@@ -787,8 +787,10 @@ public class RenderListener {
 							if (bazaarPrice < 5000000 && internal.equals("RECOMBOBULATOR_3000")) bazaarPrice = 5000000;
 
 							double worth = -1;
-							if (bazaarPrice > 0) {
+ 							boolean isOnBz = false;
+							if (bazaarPrice >= 0) {
 								worth = bazaarPrice;
+								isOnBz = true;
 							} else {
 								switch (NotEnoughUpdates.INSTANCE.config.dungeons.profitType) {
 									case 1:
@@ -826,7 +828,7 @@ public class RenderListener {
 								}
 							}
 
-							if (worth > 0 && totalValue >= 0) {
+							if ((worth >= 0 || isOnBz) && totalValue >= 0) {
 								totalValue += worth;
 								String display = item.getDisplayName();
 
-- 
cgit 


From 94054563ff1d595253a4e50cf48b22fc77a05515 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 02:31:56 +1000
Subject: Fix enchantment table overlay (#238)

Co-authored-by: nea <romangraef@gmail.com>
---
 Update Notes/2.1.md                                |    2 +
 .../listener/ItemTooltipListener.java              |    7 +-
 .../listener/NEUEventListener.java                 |    4 +
 .../notenoughupdates/listener/RenderListener.java  |   22 +
 .../notenoughupdates/miscgui/CalendarOverlay.java  |    5 +-
 .../notenoughupdates/miscgui/GuiCustomEnchant.java |  309 +-
 .../notenoughupdates/miscgui/hex/EnchantState.java |   37 +
 .../notenoughupdates/miscgui/hex/GuiCustomHex.java | 4794 ++++++++++++++++++++
 .../notenoughupdates/miscgui/hex/HexItem.java      |  264 ++
 .../notenoughupdates/miscgui/hex/ItemType.java     |   84 +
 .../miscgui/util/ExperienceOrb.java                |   32 +
 .../notenoughupdates/miscgui/util/OrbDisplay.java  |  142 +
 .../notenoughupdates/mixins/MixinGuiContainer.java |    2 +
 13 files changed, 5521 insertions(+), 183 deletions(-)
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/EnchantState.java
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/ItemType.java
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/ExperienceOrb.java
 create mode 100644 src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/OrbDisplay.java

(limited to 'src/main/java/io')

diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index 6080e656..50e2d0e4 100644
--- a/Update Notes/2.1.md	
+++ b/Update Notes/2.1.md	
@@ -18,6 +18,7 @@
 - Improved metal detector logic to solve using a single position in most cases using known locations based on Keeper coordinates - CraftyOldMiner
 - Added support for official Hypixel wiki, can be toggled in /neu misc - DeDiamondPro
 - Added a calculator (/neucalc help), that also works in the auction house / bazaar - nea89
+- Added an enchant table style gui for /hex - nopo
 - Added and fixed various things in the profile viewer:
   - [Added hotm tab](https://media.discordapp.net/attachments/659613194066722833/991115131507441724/unknown.png) - nopo
     - Big thanks to kwev1n for some math and jani for the texture
@@ -146,6 +147,7 @@
 - Fixed crash with spamming remove enchant in /neuec - nopo
 - Fixed missing enchants not working with shiny items - nopo
 - Fixed golden dragon not working in pet overlay - CrypticPlasma
+- Fixed enchant overlay - nopo
 - Fixed shortened damage - nopo
 - Fixed bazaar prices sorting order in neu item list - hannibal2
 - Fixed priceless items showing first in the missing tab of the accessory bag overlay - nopo
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
index 3936ad74..d4e0becd 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/ItemTooltipListener.java
@@ -906,11 +906,16 @@ public class ItemTooltipListener {
 			boolean m = Keyboard.isKeyDown(Keyboard.KEY_M);
 			boolean n = Keyboard.isKeyDown(Keyboard.KEY_N);
 			boolean f = Keyboard.isKeyDown(Keyboard.KEY_F);
+			boolean l = Keyboard.isKeyDown(Keyboard.KEY_L);
 
 			if (!copied && f && NotEnoughUpdates.INSTANCE.config.hidden.dev) {
 				MiscUtils.copyToClipboard(NotEnoughUpdates.INSTANCE.manager.getSkullValueForItem(event.itemStack));
 			}
 
+			if (!copied && l) {
+				NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI = !NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI;
+			}
+
 			event.toolTip.add(
 				EnumChatFormatting.AQUA + "Internal Name: " + EnumChatFormatting.GRAY + internal + EnumChatFormatting.GOLD +
 					" [K]");
@@ -948,7 +953,7 @@ public class ItemTooltipListener {
 				}
 			}
 
-			copied = k || m || n || f;
+			copied = k || m || n || f || l;
 		}
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
index 305135fc..e202b828 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/NEUEventListener.java
@@ -34,6 +34,7 @@ import io.github.moulberry.notenoughupdates.miscfeatures.ItemCustomizeManager;
 import io.github.moulberry.notenoughupdates.miscfeatures.NPCRetexturing;
 import io.github.moulberry.notenoughupdates.miscgui.AccessoryBagOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.GuiCustomEnchant;
+import io.github.moulberry.notenoughupdates.miscgui.hex.GuiCustomHex;
 import io.github.moulberry.notenoughupdates.miscgui.StorageOverlay;
 import io.github.moulberry.notenoughupdates.overlays.OverlayManager;
 import io.github.moulberry.notenoughupdates.overlays.TextOverlay;
@@ -144,6 +145,9 @@ public class NEUEventListener {
 			if (GuiCustomEnchant.getInstance().shouldOverride(containerName)) {
 				GuiCustomEnchant.getInstance().tick();
 			}
+			if (GuiCustomHex.getInstance().shouldOverride(containerName)) {
+				GuiCustomHex.getInstance().tick(containerName);
+			}
 		}
 
 		//MiningOverlay and TimersOverlay need real tick speed
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
index a8d69c87..c822a51d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
@@ -45,6 +45,7 @@ import io.github.moulberry.notenoughupdates.miscfeatures.StorageManager;
 import io.github.moulberry.notenoughupdates.miscgui.AccessoryBagOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.CalendarOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.GuiCustomEnchant;
+import io.github.moulberry.notenoughupdates.miscgui.hex.GuiCustomHex;
 import io.github.moulberry.notenoughupdates.miscgui.GuiInvButtonEditor;
 import io.github.moulberry.notenoughupdates.miscgui.GuiItemRecipe;
 import io.github.moulberry.notenoughupdates.miscgui.StorageOverlay;
@@ -445,12 +446,19 @@ public class RenderListener {
 			containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
 		}
 
+		if (GuiCustomHex.getInstance().shouldOverride(containerName)) {
+			GuiCustomHex.getInstance().render(event.renderPartialTicks, containerName);
+			event.setCanceled(true);
+			return;
+		}
+
 		if (GuiCustomEnchant.getInstance().shouldOverride(containerName)) {
 			GuiCustomEnchant.getInstance().render(event.renderPartialTicks);
 			event.setCanceled(true);
 			return;
 		}
 
+
 		boolean tradeWindowActive = TradeWindow.tradeWindowActive(containerName);
 		boolean storageOverlayActive = StorageManager.getInstance().shouldRenderStorageOverlay(containerName);
 		boolean customAhActive =
@@ -595,6 +603,7 @@ public class RenderListener {
 			ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
 			containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
 
+			if (GuiCustomHex.getInstance().shouldOverride(containerName)) return;
 			if (GuiCustomEnchant.getInstance().shouldOverride(containerName)) return;
 		}
 
@@ -1050,12 +1059,18 @@ public class RenderListener {
 			}
 		}
 
+		if (GuiCustomHex.getInstance().shouldOverride(containerName) &&
+			GuiCustomHex.getInstance().mouseInput(mouseX, mouseY)) {
+			event.setCanceled(true);
+			return;
+		}
 		if (GuiCustomEnchant.getInstance().shouldOverride(containerName) &&
 			GuiCustomEnchant.getInstance().mouseInput(mouseX, mouseY)) {
 			event.setCanceled(true);
 			return;
 		}
 
+
 		boolean tradeWindowActive = TradeWindow.tradeWindowActive(containerName);
 		boolean storageOverlayActive = StorageManager.getInstance().shouldRenderStorageOverlay(containerName);
 		boolean customAhActive =
@@ -1519,12 +1534,19 @@ public class RenderListener {
 				.getUnformattedText();
 		}
 
+		if (GuiCustomHex.getInstance().shouldOverride(containerName) &&
+			GuiCustomHex.getInstance().keyboardInput()) {
+			event.setCanceled(true);
+			return;
+		}
+
 		if (GuiCustomEnchant.getInstance().shouldOverride(containerName) &&
 			GuiCustomEnchant.getInstance().keyboardInput()) {
 			event.setCanceled(true);
 			return;
 		}
 
+
 		boolean tradeWindowActive = TradeWindow.tradeWindowActive(containerName);
 		boolean storageOverlayActive = StorageManager.getInstance().shouldRenderStorageOverlay(containerName);
 		boolean customAhActive =
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
index 2905a941..b1a3dca9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -75,6 +75,8 @@ public class CalendarOverlay {
 
 	private static boolean enabled = false;
 
+	public static boolean ableToClickCalendar = true;
+
 	public static void setEnabled(boolean enabled) {
 		CalendarOverlay.enabled = enabled;
 	}
@@ -479,8 +481,7 @@ public class CalendarOverlay {
 
 				guiLeft = (width - xSize) / 2;
 				guiTop = 5;
-
-				if (mouseX >= guiLeft && mouseX <= guiLeft + xSize) {
+				if (mouseX >= guiLeft && mouseX <= guiLeft + xSize && ableToClickCalendar) {
 					if (mouseY >= guiTop && mouseY <= guiTop + ySize) {
 						ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, "/neucalendar");
 					}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
index 8ba3a98a..cbf98290 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
@@ -28,6 +28,7 @@ import io.github.moulberry.notenoughupdates.core.GuiElementTextField;
 import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingFloat;
 import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger;
 import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking;
+import io.github.moulberry.notenoughupdates.miscgui.util.OrbDisplay;
 import io.github.moulberry.notenoughupdates.mixins.AccessorGuiContainer;
 import io.github.moulberry.notenoughupdates.options.NEUConfig;
 import io.github.moulberry.notenoughupdates.util.Constants;
@@ -74,9 +75,9 @@ public class GuiCustomEnchant extends Gui {
 		"textures/entity/enchanting_table_book.png");
 	private static final ModelBook MODEL_BOOK = new ModelBook();
 
-	private static final int EXPERIENCE_ORB_COUNT = 30;
-
 	private static final Pattern XP_COST_PATTERN = Pattern.compile("\\u00a73(\\d+) Exp Levels");
+	private static final Pattern ENCHANT_LEVEL_PATTERN = Pattern.compile("(.*)_(.*)");
+	private static final Pattern ENCHANT_NAME_PATTERN = Pattern.compile("([^IVX]*) ([IVX]*)");
 
 	private enum EnchantState {
 		NO_ITEM,
@@ -105,6 +106,10 @@ public class GuiCustomEnchant extends Gui {
 			this.enchId = enchId;
 			this.displayLore = displayLore;
 			this.level = level;
+			if (this.enchId.equals("prosecute")) {
+				this.enchId = "PROSECUTE";
+			}
+
 
 			if (Constants.ENCHANTS != null) {
 				if (checkConflicts && Constants.ENCHANTS.has("enchant_pools")) {
@@ -133,12 +138,18 @@ public class GuiCustomEnchant extends Gui {
 
 				if (level >= 1 && Constants.ENCHANTS.has("enchants_xp_cost")) {
 					JsonObject allCosts = Constants.ENCHANTS.getAsJsonObject("enchants_xp_cost");
+					JsonObject maxLevel = null;
+					if (Constants.ENCHANTS.has("max_xp_table_levels")) {
+						maxLevel = Constants.ENCHANTS.getAsJsonObject("max_xp_table_levels");
+					}
+
 					if (allCosts.has(enchId)) {
 						JsonArray costs = allCosts.getAsJsonArray(enchId);
 
 						if (costs.size() >= 1) {
 							if (useMaxLevelForCost) {
-								this.xpCost = costs.get(costs.size() - 1).getAsInt();
+								int cost = (maxLevel != null && maxLevel.has(enchId) ? maxLevel.get(enchId).getAsInt() : costs.size());
+								this.xpCost = costs.get(cost - 1).getAsInt();
 							} else if (level - 1 < costs.size()) {
 								this.xpCost = costs.get(level - 1).getAsInt();
 							} else {
@@ -152,21 +163,7 @@ public class GuiCustomEnchant extends Gui {
 		}
 	}
 
-	public static class ExperienceOrb {
-		public float x;
-		public float y;
-		public float xLast;
-		public float yLast;
-		public float xVel;
-		public float yVel;
-
-		public int type;
-		public int rotationDeg;
-	}
-
-	private final List<ExperienceOrb> orbs = new ArrayList<>();
-	private int orbTargetX = 0;
-	private int orbTargetY = 0;
+	public OrbDisplay orbDisplay = new OrbDisplay();
 
 	private int guiLeft;
 	private int guiTop;
@@ -226,8 +223,15 @@ public class GuiCustomEnchant extends Gui {
 	}
 
 	public boolean shouldOverride(String containerName) {
+		if (containerName == null) {
+			shouldOverrideFast = false;
+			return false;
+		}
 		shouldOverrideFast = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI &&
-			Objects.equals("Enchant Item", containerName) &&
+			(containerName.length() >= 12 && Objects.equals(
+				"Enchant Item",
+				containerName.substring(0, "Enchant Item".length())
+			)) &&
 			NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard();
 		if (!shouldOverrideFast) {
 			currentState = EnchantState.NO_ITEM;
@@ -235,6 +239,10 @@ public class GuiCustomEnchant extends Gui {
 			removable.clear();
 			expectedMaxPage = 1;
 		}
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+		ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50);
+		if (hexStack != null && hexStack.getItem() == Items.experience_bottle) return false;
 		return shouldOverrideFast;
 	}
 
@@ -245,13 +253,15 @@ public class GuiCustomEnchant extends Gui {
 		ContainerChest cc = (ContainerChest) chest.inventorySlots;
 
 		ItemStack stack = cc.getLowerChestInventory().getStackInSlot(23);
-		ItemStack enchantGuideStack = cc.getLowerChestInventory().getStackInSlot(50);
+		ItemStack arrowStack = cc.getLowerChestInventory().getStackInSlot(45);
 		ItemStack enchantingItemStack = cc.getLowerChestInventory().getStackInSlot(19);
+		ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50);
 
 		int lastPage = currentPage;
 
 		this.lastState = currentState;
-		if (enchantGuideStack != null && enchantGuideStack.getItem() != Items.book && enchantingItem != null) {
+		if (hexStack != null && hexStack.getItem() == Items.experience_bottle) return;
+		if (arrowStack != null && arrowStack.getItem() == Items.arrow && enchantingItem != null) {
 			currentState = EnchantState.ADDING_ENCHANT;
 		} else if (stack == null || enchantingItemStack == null) {
 			if (currentState == EnchantState.SWITCHING_DONT_UPDATE || currentState == EnchantState.NO_ITEM) {
@@ -305,30 +315,7 @@ public class GuiCustomEnchant extends Gui {
 			}
 		}
 
-		List<ExperienceOrb> toRemove = new ArrayList<>();
-		for (ExperienceOrb orb : orbs) {
-			float targetDeltaX = guiLeft + orbTargetX - orb.x;
-			float targetDeltaY = guiTop + orbTargetY - orb.y;
-
-			float length = (float) Math.sqrt(targetDeltaX * targetDeltaX + targetDeltaY * targetDeltaY);
-
-			if (length < 8 && orb.xVel * orb.xVel + orb.yVel * orb.yVel < 20) {
-				toRemove.add(orb);
-				continue;
-			}
-
-			orb.xVel += targetDeltaX * 2 / length;
-			orb.yVel += targetDeltaY * 2 / length;
-
-			orb.xVel *= 0.90;
-			orb.yVel *= 0.90;
-
-			orb.xLast = orb.x;
-			orb.yLast = orb.y;
-			orb.x += orb.xVel;
-			orb.y += orb.yVel;
-		}
-		orbs.removeAll(toRemove);
+		orbDisplay.physicsTickOrbs();
 
 		if (++tickCounter >= 20) {
 			tickCounter = 0;
@@ -389,40 +376,48 @@ public class GuiCustomEnchant extends Gui {
 							if (ea != null) {
 								NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
 								if (enchantments != null) {
-									for (String enchId : enchantments.getKeySet()) {
-										String name = Utils.cleanColour(book.getDisplayName());
-										if (name.equalsIgnoreCase("Bane of Arthropods")) {
-											name = "Bane of Arth.";
-										} else if (name.equalsIgnoreCase("Projectile Protection")) {
-											name = "Projectile Prot";
-										} else if (name.equalsIgnoreCase("Blast Protection")) {
-											name = "Blast Prot";
-										}
-										Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
-											Utils.getRawTooltip(book), enchantments.getInteger(enchId), false, true
-										);
-										enchantment.displayLore.remove(0);
+									String enchId = Utils.cleanColour(book.getDisplayName()).toLowerCase().replace(" ", "_").replace(
+										"-",
+										"_"
+									);
+									String name = Utils.cleanColour(book.getDisplayName());
+									int enchLevel = -1;
+									if (name.equalsIgnoreCase("Bane of Arthropods")) {
+										name = "Bane of Arth.";
+									} else if (name.equalsIgnoreCase("Projectile Protection")) {
+										name = "Projectile Prot";
+									} else if (name.equalsIgnoreCase("Blast Protection")) {
+										name = "Blast Prot";
+									}
+									Matcher levelMatcher = ENCHANT_LEVEL_PATTERN.matcher(enchId);
+									if (levelMatcher.matches()) {
+										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase());
+										enchId = levelMatcher.group(1);
+									}
+									Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+										Utils.getRawTooltip(book), enchLevel, false, true
+									);
+									enchantment.displayLore.remove(0);
 
-										if (removingEnchantPlayerLevel == -1 && playerEnchantIds.containsKey(enchId)) {
-											removingEnchantPlayerLevel = playerEnchantIds.get(enchId);
-										}
+									if (removingEnchantPlayerLevel == -1 && playerEnchantIds.containsKey(enchId)) {
+										removingEnchantPlayerLevel = playerEnchantIds.get(enchId);
+									}
 
-										if (removingEnchantPlayerLevel >= 0 && enchantment.level < removingEnchantPlayerLevel) {
-											continue;
-										}
+									if (removingEnchantPlayerLevel >= 0 && enchantment.level < removingEnchantPlayerLevel) {
+										continue;
+									}
 
-										if (enchanterCurrentEnch == null) {
+									if (enchanterCurrentEnch == null) {
+										enchanterCurrentEnch = enchantment;
+									} else if (updateLevel) {
+										if (removingEnchantPlayerLevel < 0 && enchantment.level > enchanterCurrentEnch.level) {
+											enchanterCurrentEnch = enchantment;
+										} else if (removingEnchantPlayerLevel >= 0 && enchantment.level < enchanterCurrentEnch.level) {
 											enchanterCurrentEnch = enchantment;
-										} else if (updateLevel) {
-											if (removingEnchantPlayerLevel < 0 && enchantment.level > enchanterCurrentEnch.level) {
-												enchanterCurrentEnch = enchantment;
-											} else if (removingEnchantPlayerLevel >= 0 && enchantment.level < enchanterCurrentEnch.level) {
-												enchanterCurrentEnch = enchantment;
-											}
 										}
-
-										enchanterEnchLevels.put(enchantment.level, enchantment);
 									}
+
+									enchanterEnchLevels.put(enchantment.level, enchantment);
 								}
 							}
 						}
@@ -455,43 +450,54 @@ public class GuiCustomEnchant extends Gui {
 								if (ea != null) {
 									NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
 									if (enchantments != null) {
-										for (String enchId : enchantments.getKeySet()) {
-											String name = Utils.cleanColour(book.getDisplayName());
-
-											if (searchField.getText().trim().isEmpty() ||
-												name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
-												if (name.equalsIgnoreCase("Bane of Arthropods")) {
-													name = "Bane of Arth.";
-												} else if (name.equalsIgnoreCase("Projectile Protection")) {
-													name = "Projectile Prot";
-												} else if (name.equalsIgnoreCase("Blast Protection")) {
-													name = "Blast Prot";
-												} else if (name.equalsIgnoreCase("Luck of the Sea")) {
-													name = "Luck of Sea";
-												}
+										String enchId = Utils
+											.cleanColour(book.getDisplayName())
+											.toLowerCase()
+											.replace(" ", "_")
+											.replace("-", "_");
+										if (enchId.equalsIgnoreCase("_")) continue;
+										if (enchId.equals("prosecute")) {
+											enchId = "PROSECUTE";
+										}
+										String name = Utils.cleanColour(book.getDisplayName());
+
+										if (searchField.getText().trim().isEmpty() ||
+											name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+											if (name.equalsIgnoreCase("Bane of Arthropods")) {
+												name = "Bane of Arth.";
+											} else if (name.equalsIgnoreCase("Projectile Protection")) {
+												name = "Projectile Prot";
+											} else if (name.equalsIgnoreCase("Blast Protection")) {
+												name = "Blast Prot";
+											} else if (name.equalsIgnoreCase("Luck of the Sea")) {
+												name = "Luck of Sea";
+											}
+											Matcher nameMatcher = ENCHANT_NAME_PATTERN.matcher(name);
+											if (nameMatcher.matches()) {
+												name = nameMatcher.group(1);
+											}
 
-												if (playerEnchantIds.containsKey(enchId)) {
-													Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
-														Utils.getRawTooltip(book), playerEnchantIds.get(enchId), false, false
-													);
-													if (!enchantment.overMaxLevel) {
-														removable.add(enchantment);
-													}
-												} else {
-													Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
-														Utils.getRawTooltip(book), enchantments.getInteger(enchId), true, true
-													);
-													applicable.add(enchantment);
+											if (playerEnchantIds.containsKey(enchId)) {
+												Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+													Utils.getRawTooltip(book), playerEnchantIds.get(enchId), false, false
+												);
+												if (!enchantment.overMaxLevel) {
+													removable.add(enchantment);
 												}
 											} else {
-												if (playerEnchantIds.containsKey(enchId)) {
-													searchRemovedFromRemovable = true;
-												} else {
-													searchRemovedFromApplicable = true;
-												}
+												Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+													Utils.getRawTooltip(book), 1, true, true
+												);
+												applicable.add(enchantment);
+											}
+										} else {
+											if (playerEnchantIds.containsKey(enchId)) {
+												searchRemovedFromRemovable = true;
+											} else {
+												searchRemovedFromApplicable = true;
 											}
-
 										}
+
 									}
 								}
 							}
@@ -1356,37 +1362,11 @@ public class GuiCustomEnchant extends Gui {
 
 		//Orb animation
 		Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
-		GlStateManager.color(1, 1, 1, 1);
 		GlStateManager.disableDepth();
-		for (ExperienceOrb orb : orbs) {
-			int orbX = Math.round(orb.xLast + (orb.x - orb.xLast) * partialTicks);
-			int orbY = Math.round(orb.yLast + (orb.y - orb.yLast) * partialTicks);
-			GlStateManager.pushMatrix();
-			GlStateManager.translate(orbX, orbY, 0);
-			GlStateManager.rotate(orb.rotationDeg, 0, 0, 1);
-
-			float targetDeltaX = guiLeft + orbTargetX - orb.x;
-			float targetDeltaY = guiTop + orbTargetY - orb.y;
-			float length = (float) Math.sqrt(targetDeltaX * targetDeltaX + targetDeltaY * targetDeltaY);
-			float velSq = orb.xVel * orb.xVel + orb.yVel * orb.yVel;
-			float opacity = Math.min(2, Math.max(0.5f, length / 16)) * Math.min(2, Math.max(0.5f, velSq / 40));
-			if (opacity > 1) opacity = 1;
-			opacity = (float) Math.sqrt(opacity);
-			GlStateManager.color(1, 1, 1, opacity);
-
-			Utils.drawTexturedRect(
-				-8,
-				-8,
-				16,
-				16,
-				((orb.type % 3) * 16) / 512f,
-				(16 + (orb.type % 3) * 16) / 512f,
-				(217 + orb.type / 3 * 16) / 512f,
-				(217 + 16 + orb.type / 3 * 16) / 512f,
-				GL11.GL_NEAREST
-			);
-			GlStateManager.popMatrix();
-		}
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(guiLeft, guiTop, 0);
+		orbDisplay.renderOrbs(partialTicks);
+		GlStateManager.popMatrix();
 		GlStateManager.enableDepth();
 
 		if (stackOnMouse != null) {
@@ -1403,37 +1383,6 @@ public class GuiCustomEnchant extends Gui {
 		GlStateManager.translate(0, 0, -300);
 	}
 
-	private void spawnExperienceOrbs(int startX, int startY, int targetX, int targetY, int baseType) {
-		orbs.clear();
-
-		this.orbTargetX = targetX;
-		this.orbTargetY = targetY;
-
-		Random rand = new Random();
-		for (int i = 0; i < EXPERIENCE_ORB_COUNT; i++) {
-			ExperienceOrb orb = new ExperienceOrb();
-			orb.x = startX;
-			orb.y = startY;
-			orb.xLast = startX;
-			orb.yLast = startY;
-			orb.xVel = rand.nextFloat() * 20 - 10;
-			orb.yVel = rand.nextFloat() * 20 - 10;
-			orb.type = baseType;
-
-			float typeRand = rand.nextFloat();
-			if (typeRand < 0.6) {
-				orb.type += 0;
-			} else if (typeRand < 0.9) {
-				orb.type += 1;
-			} else {
-				orb.type += 2;
-			}
-			orb.rotationDeg = rand.nextInt(4) * 90;
-
-			orbs.add(orb);
-		}
-	}
-
 	private void renderEnchantBook(ScaledResolution scaledresolution, float partialTicks) {
 		GlStateManager.enableDepth();
 
@@ -1540,9 +1489,9 @@ public class GuiCustomEnchant extends Gui {
 
 							EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 							short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-							ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+							ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 							Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-								chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+								chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 							cancelButtonAnimTime = System.currentTimeMillis();
 						}
@@ -1592,9 +1541,9 @@ public class GuiCustomEnchant extends Gui {
 
 					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-						chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 					cancelButtonAnimTime = System.currentTimeMillis();
 				} else if (!isChangingEnchLevel && enchanterCurrentEnch != null &&
@@ -1617,9 +1566,9 @@ public class GuiCustomEnchant extends Gui {
 					int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
 					if (playerXpLevel >= enchanterCurrentEnch.xpCost) {
 						if (removingEnchantPlayerLevel >= 0 && enchanterCurrentEnch.level == removingEnchantPlayerLevel) {
-							spawnExperienceOrbs(guiLeft + X_SIZE / 2, guiTop + 66, X_SIZE / 2, 36, 3);
+							orbDisplay.spawnExperienceOrbs(X_SIZE / 2, 66, X_SIZE / 2, 36, 3);
 						} else {
-							spawnExperienceOrbs(mouseX, mouseY, X_SIZE / 2, 66, 0);
+							orbDisplay.spawnExperienceOrbs(mouseX - guiLeft, mouseY - guiTop, X_SIZE / 2, 66, 0);
 						}
 					}
 
@@ -1790,9 +1739,9 @@ public class GuiCustomEnchant extends Gui {
 							} else if (currentState == EnchantState.ADDING_ENCHANT) {
 								EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 								short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-								ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+								ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 								Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-									chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+									chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 								cancelButtonAnimTime = System.currentTimeMillis();
 							}
@@ -1830,9 +1779,9 @@ public class GuiCustomEnchant extends Gui {
 							} else if (currentState == EnchantState.ADDING_ENCHANT) {
 								EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 								short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-								ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+								ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 								Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-									chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+									chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 								cancelButtonAnimTime = System.currentTimeMillis();
 							}
@@ -1877,9 +1826,9 @@ public class GuiCustomEnchant extends Gui {
 
 						EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 						short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 						Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-							chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+							chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 						cancelButtonAnimTime = System.currentTimeMillis();
 					}
@@ -1898,9 +1847,9 @@ public class GuiCustomEnchant extends Gui {
 
 					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
 					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
-					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(48);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
 					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
-						chest.inventorySlots.windowId, 48, 0, 0, stack, transactionID));
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
 
 					cancelButtonAnimTime = System.currentTimeMillis();
 				}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/EnchantState.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/EnchantState.java
new file mode 100644
index 00000000..08e720a2
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/EnchantState.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.hex;
+
+enum EnchantState {
+	NO_ITEM,
+	ADDING_ENCHANT,
+	SWITCHING_DONT_UPDATE,
+	INVALID_ITEM,
+	HAS_ITEM,
+	HAS_ITEM_IN_HEX,
+	HAS_ITEM_IN_BOOKS,
+	ADDING_BOOK,
+	NO_ITEM_IN_HEX,
+	INVALID_ITEM_HEX,
+	HAS_ITEM_IN_GEMSTONE,
+	ADDING_GEMSTONE,
+	APPLYING_GEMSTONE
+
+}
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
new file mode 100644
index 00000000..39374f9d
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/GuiCustomHex.java
@@ -0,0 +1,4794 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.hex;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.core.GlScissorStack;
+import io.github.moulberry.notenoughupdates.core.GuiElementTextField;
+import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingFloat;
+import io.github.moulberry.notenoughupdates.core.util.lerp.LerpingInteger;
+import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking;
+import io.github.moulberry.notenoughupdates.miscgui.CalendarOverlay;
+import io.github.moulberry.notenoughupdates.miscgui.util.OrbDisplay;
+import io.github.moulberry.notenoughupdates.mixins.AccessorGuiContainer;
+import io.github.moulberry.notenoughupdates.options.NEUConfig;
+import io.github.moulberry.notenoughupdates.util.Constants;
+import io.github.moulberry.notenoughupdates.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.model.ModelBook;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.play.client.C0EPacketClickWindow;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import org.apache.commons.lang3.text.WordUtils;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.glu.Project;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GuiCustomHex extends Gui {
+	private static final GuiCustomHex INSTANCE = new GuiCustomHex();
+	private static final ResourceLocation TEXTURE = new ResourceLocation("notenoughupdates:custom_enchant_gui.png");
+	private static final ResourceLocation ENCHANTMENT_TABLE_BOOK_TEXTURE = new ResourceLocation(
+		"textures/entity/enchanting_table_book.png");
+	private static final ModelBook MODEL_BOOK = new ModelBook();
+
+	private static final int EXPERIENCE_ORB_COUNT = 30;
+
+	private static final Pattern XP_COST_PATTERN = Pattern.compile("\\u00a73(\\d+) Exp Levels");
+	private static final Pattern ENCHANT_LEVEL_PATTERN = Pattern.compile("(.*)_(.*)");
+	private static final Pattern ENCHANT_NAME_PATTERN = Pattern.compile("([^IVX]*) ([IVX]*)");
+
+	public static final NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
+
+	public class Enchantment {
+		public int slotIndex;
+		public String enchantName;
+		public String enchId;
+		public List<String> displayLore;
+		public int level;
+		public int xpCost = -1;
+		public boolean overMaxLevel = false;
+		public boolean conflicts = false;
+		public int price = -1;
+
+		public Enchantment(
+			int slotIndex, String enchantName, String enchId, List<String> displayLore, int level,
+			boolean useMaxLevelForCost, boolean checkConflicts
+		) {
+			this.slotIndex = slotIndex;
+			this.enchantName = enchantName;
+			this.enchId = enchId;
+			this.displayLore = displayLore;
+			this.level = level;
+			boolean isUlt = false;
+			for (String lore : displayLore) {
+				if (lore.contains("§l")) isUlt = true;
+				break;
+			}
+			JsonObject bazaarInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(
+				(isUlt ? "ULTIMATE_" : "") + enchId.toUpperCase() + ";" + level);
+			if (bazaarInfo != null && bazaarInfo.get("curr_buy") != null) {
+				this.price = bazaarInfo.get("curr_buy").getAsInt();
+			}
+			if (this.enchId.equals("prosecute")) {
+				this.enchId = "PROSECUTE";
+			}
+
+			if (Constants.ENCHANTS != null) {
+				if (checkConflicts && Constants.ENCHANTS.has("enchant_pools")) {
+					JsonArray pools = Constants.ENCHANTS.getAsJsonArray("enchant_pools");
+					out:
+					for (int i = 0; i < pools.size(); i++) {
+						JsonArray pool = pools.get(i).getAsJsonArray();
+
+						boolean hasThis = false;
+						boolean hasApplied = false;
+
+						for (int j = 0; j < pool.size(); j++) {
+							String enchIdPoolElement = pool.get(j).getAsString();
+							if (enchId.equalsIgnoreCase(enchIdPoolElement)) {
+								hasThis = true;
+							} else if (playerEnchantIds.containsKey(enchIdPoolElement)) {
+								hasApplied = true;
+							}
+							if (hasThis && hasApplied) {
+								this.conflicts = true;
+								break out;
+							}
+						}
+					}
+				}
+
+				if (level >= 1 && Constants.ENCHANTS.has("enchants_xp_cost")) {
+					JsonObject allCosts = Constants.ENCHANTS.getAsJsonObject("enchants_xp_cost");
+					if (allCosts.has(enchId)) {
+						JsonArray costs = allCosts.getAsJsonArray(enchId);
+
+						if (costs.size() >= 1) {
+							if (useMaxLevelForCost) {
+								this.xpCost = costs.get(costs.size() - 1).getAsInt();
+							} else if (level - 1 < costs.size()) {
+								this.xpCost = costs.get(level - 1).getAsInt();
+							} else {
+								overMaxLevel = true;
+							}
+						}
+					}
+
+				}
+			}
+		}
+	}
+
+	public OrbDisplay orbDisplay = new OrbDisplay();
+
+	private int guiLeft;
+	private int guiTop;
+	private boolean shouldOverrideFast = false;
+	private boolean shouldOverrideET = false;
+	private boolean shouldOverrideGemstones = false;
+	private boolean shouldOverrideXp = false;
+	public float pageOpen;
+	public float pageOpenLast;
+	public float pageOpenRandom;
+	public float pageOpenVelocity;
+	public float bookOpen;
+	public float bookOpenLast;
+
+	private int currentPage;
+	private int expectedMaxPage;
+
+	private boolean isScrollingLeft = true;
+
+	private ItemStack enchantingItem = null;
+
+	private int removingEnchantPlayerLevel = -1;
+
+	private final GuiElementTextField searchField = new GuiElementTextField("", GuiElementTextField.SCISSOR_TEXT);
+
+	private final HashMap<String, Integer> playerEnchantIds = new HashMap<>();
+
+	private boolean searchRemovedFromApplicable = false;
+	private boolean searchRemovedFromRemovable = false;
+	private final List<Enchantment> applicable = new ArrayList<>();
+	private final List<Enchantment> removable = new ArrayList<>();
+
+	private final List<HexItem> applicableItem = new ArrayList<>();
+	private final List<HexItem> removableItem = new ArrayList<>();
+	private final HashMap<Integer, Enchantment> enchanterEnchLevels = new HashMap<>();
+	private final HashMap<Integer, HexItem> enchanterItemLevels = new HashMap<>();
+	private Enchantment enchanterCurrentEnch = null;
+	private HexItem enchanterCurrentItem = null;
+
+	public Random random = new Random();
+
+	private EnchantState currentState = EnchantState.NO_ITEM;
+	private EnchantState lastState = EnchantState.NO_ITEM;
+
+	private final LerpingInteger leftScroll = new LerpingInteger(0, 150);
+	private final LerpingInteger rightScroll = new LerpingInteger(0, 150);
+
+	private final LerpingFloat arrowAmount = new LerpingFloat(0, 100);
+
+	private static final int X_SIZE = 364;
+	private static final int Y_SIZE = 215;
+
+	private int clickedScrollOffset = -1;
+	private boolean isClickedScrollLeft = true;
+
+	private boolean isChangingEnchLevel = false;
+
+	private long cancelButtonAnimTime = 0;
+	private long confirmButtonAnimTime = 0;
+
+	public static GuiCustomHex getInstance() {
+		return INSTANCE;
+	}
+
+	public boolean shouldOverride(String containerName) {
+		CalendarOverlay.ableToClickCalendar = true;
+		if (containerName == null) {
+			shouldOverrideET = false;
+			shouldOverrideFast = false;
+			shouldOverrideGemstones = false;
+			shouldOverrideXp = false;
+			searchField.setText("");
+			return false;
+		}
+		boolean config = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI;
+		final List<String> gemList = new ArrayList<>(Arrays.asList(
+			"\u2764",
+			"\u2748",
+			"\u270e",
+			"\u2618",
+			"\u2e15",
+			"\u2727",
+			"\u2741",
+			"\u2742"
+		));
+		shouldOverrideFast = config &&
+			(containerName.length() >= 7 && Objects.equals("The Hex", containerName.substring(0, "The Hex".length()))) &&
+			NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard();
+
+		shouldOverrideET = config &&
+			(containerName.length() >= 12 && Objects.equals(
+				"Enchant Item",
+				containerName.substring(0, "Enchant Item".length())
+			)) && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard();
+
+		shouldOverrideGemstones = config &&
+			(containerName.length() >= 12 && Objects.equals(
+				"Gemstones ➜",
+				containerName.substring(0, "Gemstones ➜".length())
+			)) && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard();
+		if (shouldOverrideGemstones) {
+			for (String string : gemList) {
+				if (containerName.contains(string)) {
+					shouldOverrideGemstones = false;
+					break;
+				}
+			}
+		}
+
+		shouldOverrideXp = config &&
+			(containerName.length() >= 21 && Objects.equals("Bottles of Enchanting", containerName.substring(0, "Bottles of Enchanting".length()))) &&
+			NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard();
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+		ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(50);
+		CalendarOverlay.ableToClickCalendar = !(shouldOverrideET || shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp);
+		if (hexStack != null && hexStack.getItem() == Items.experience_bottle)
+			return (shouldOverrideET || shouldOverrideFast);
+		if (!shouldOverrideFast && !shouldOverrideET && !shouldOverrideGemstones && !shouldOverrideXp) {
+			currentState = EnchantState.NO_ITEM;
+			applicable.clear();
+			removable.clear();
+			applicableItem.clear();
+			removableItem.clear();
+			expectedMaxPage = 1;
+			enchanterCurrentItem = null;
+			searchField.setText("");
+		}
+		return (shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp);
+	}
+
+	private int tickCounter = 0;
+
+	public void tick(String containerName) {
+		if (containerName.equals("The Hex")) {
+			currentState = EnchantState.HAS_ITEM_IN_HEX;
+			tickHex();
+		} else if (containerName.contains("Enchant Item")) {
+			tickEnchants();
+		} else if (containerName.contains("Books") || containerName.contains("Modifiers") || containerName.contains(
+			"Reforges") || containerName.contains("Item Upgrades") || containerName.equals("Bottles of Enchanting")) {
+			tickBooks();
+		} else if (containerName.contains("Gemstones")) {
+			tickGemstones();
+		} else {
+			tickBooks();
+		}
+	}
+
+	private void tickEnchants() {
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		//ItemStack hexStack = cc.getLowerChestInventory().getStackInSlot(12);
+		ItemStack enchantingItemStack = cc.getLowerChestInventory().getStackInSlot(19);
+		//ItemStack stack = cc.getLowerChestInventory().getStackInSlot(23);
+		ItemStack hopperStack = cc.getLowerChestInventory().getStackInSlot(51);
+
+		int lastPage = currentPage;
+
+		this.lastState = currentState;
+
+		if (hopperStack != null && hopperStack.getItem() != Item.getItemFromBlock(Blocks.hopper) &&
+			enchantingItem != null) {
+			currentState = EnchantState.ADDING_ENCHANT;
+		} else if (enchantingItemStack == null) {
+			if (currentState == EnchantState.SWITCHING_DONT_UPDATE || currentState == EnchantState.NO_ITEM) {
+				currentState = EnchantState.NO_ITEM;
+			} else {
+				currentState = EnchantState.SWITCHING_DONT_UPDATE;
+			}
+		} else {
+			ItemStack sanityCheckStack = cc.getLowerChestInventory().getStackInSlot(12);
+			if (sanityCheckStack == null || sanityCheckStack.getItem() == Items.enchanted_book) {
+				currentState = EnchantState.HAS_ITEM;
+				enchantingItem = enchantingItemStack;
+			} else {
+				currentState = EnchantState.SWITCHING_DONT_UPDATE;
+			}
+		}
+
+		if (currentState == EnchantState.HAS_ITEM) {
+			ItemStack pageUpStack = cc.getLowerChestInventory().getStackInSlot(17);
+			ItemStack pageDownStack = cc.getLowerChestInventory().getStackInSlot(35);
+			if (pageUpStack != null && pageDownStack != null) {
+				currentPage = 0;
+				boolean upIsGlass = pageUpStack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane);
+				boolean downIsGlass = pageDownStack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane);
+				int page = -1;
+
+				expectedMaxPage = 1;
+				if (!downIsGlass) {
+					try {
+						page = Integer.parseInt(Utils.getRawTooltip(pageDownStack).get(1).substring(11)) - 1;
+						expectedMaxPage = page + 1;
+					} catch (Exception ignored) {
+					}
+				}
+				if (page == -1 && !upIsGlass) {
+					try {
+						page = Integer.parseInt(Utils.getRawTooltip(pageUpStack).get(1).substring(11)) + 1;
+						expectedMaxPage = page;
+					} catch (Exception ignored) {
+					}
+				}
+				if (page == -1) {
+					currentPage = 1;
+				} else {
+					currentPage = page;
+				}
+			}
+		}
+
+		orbDisplay.physicsTickOrbs();
+
+		if (++tickCounter >= 20) {
+			tickCounter = 0;
+		}
+
+		boolean updateItems = tickCounter == 0;
+
+		if (currentState == EnchantState.ADDING_ENCHANT) {
+			if (arrowAmount.getTarget() != 1) {
+				arrowAmount.setTarget(1);
+				arrowAmount.resetTimer();
+			}
+		} else {
+			if (arrowAmount.getTarget() != 0) {
+				arrowAmount.setTarget(0);
+				arrowAmount.resetTimer();
+			}
+		}
+
+		// Set<EnchantState> allowedSwitchStates = Sets.newHashSet(EnchantState.ADDING_ENCHANT, EnchantState.HAS_ITEM, EnchantState.SWITCHING_DONT_UPDATE);
+		if (lastState != currentState || lastPage != currentPage) {
+			// if (!allowedSwitchStates.contains(lastState) || !allowedSwitchStates.contains(currentState)) {
+			leftScroll.setValue(0);
+			rightScroll.setValue(0);
+			// }
+			updateItems = true;
+		}
+
+		if (updateItems && currentState != EnchantState.SWITCHING_DONT_UPDATE) {
+			enchanterEnchLevels.clear();
+
+			if (enchantingItem != null) {
+				playerEnchantIds.clear();
+				NBTTagCompound tag = enchantingItem.getTagCompound();
+				if (tag != null) {
+					NBTTagCompound ea = tag.getCompoundTag("ExtraAttributes");
+					if (ea != null) {
+						NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+						if (enchantments != null) {
+							for (String enchId : enchantments.getKeySet()) {
+								playerEnchantIds.put(enchId, enchantments.getInteger(enchId));
+							}
+						}
+					}
+				}
+			}
+
+			if (currentState == EnchantState.ADDING_ENCHANT) {
+				removingEnchantPlayerLevel = -1;
+				boolean updateLevel = enchanterCurrentEnch == null;
+				boolean hasXpBottle = false;
+				for (int i = 0; i < 27; i++) {
+					int slotIndex = 9 + i;
+					ItemStack book = cc.getLowerChestInventory().getStackInSlot(slotIndex);
+					ItemStack xpBottle = cc.getLowerChestInventory().getStackInSlot(50);
+					if (!hasXpBottle && xpBottle != null &&
+						xpBottle.getItem() == Items.experience_bottle) { //Make show when in dungeon screen
+						String name = "Buy Xp Bottles";
+						String id = "XP_BOTTLE";
+						Enchantment xpBottleEnch = new Enchantment(50, name, id,
+							Utils.getRawTooltip(xpBottle), 1, true, false
+						);
+						boolean hasHasXpBottle = false;
+						for (Enchantment ench : applicable) {
+							if (ench.enchId.equals("XP_BOTTLE")) {
+								hasHasXpBottle = true;
+								break;
+							}
+						}
+						if (!hasHasXpBottle) applicable.add(xpBottleEnch);
+						hasXpBottle = true;
+					}
+					if (book != null && book.getItem() == Items.enchanted_book) {
+						NBTTagCompound tagBook = book.getTagCompound();
+						if (tagBook != null) {
+							NBTTagCompound ea = tagBook.getCompoundTag("ExtraAttributes");
+							if (ea != null) {
+								NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+								if (enchantments != null) {
+									String enchId = Utils.cleanColour(book.getDisplayName()).toLowerCase().replace(" ", "_").replace(
+										"-",
+										"_"
+									);
+									String name = Utils.cleanColour(book.getDisplayName());
+									int enchLevel = -1;
+									if (name.equalsIgnoreCase("Bane of Arthropods")) {
+										name = "Bane of Arth.";
+									} else if (name.equalsIgnoreCase("Projectile Protection")) {
+										name = "Projectile Prot";
+									} else if (name.equalsIgnoreCase("Blast Protection")) {
+										name = "Blast Prot";
+									} else if (name.equalsIgnoreCase("Turbo-Mushrooms")) {
+										name = "Turbo-Mush";
+									}
+									Matcher levelMatcher = ENCHANT_LEVEL_PATTERN.matcher(enchId);
+									if (levelMatcher.matches()) {
+										enchLevel = Utils.parseRomanNumeral(levelMatcher.group(2).toUpperCase());
+										enchId = levelMatcher.group(1);
+									}
+									Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+										Utils.getRawTooltip(book), enchLevel, false, true
+									);
+									int index = 0;
+									for (String lore : enchantment.displayLore) {
+										if (lore.contains("N/A") && enchantment.price > 0) {
+											String price = numberFormat.format(enchantment.price);
+											enchantment.displayLore.set(index, "\u00a76" + price + ".0 Coins");
+										}
+										index++;
+									}
+									enchantment.displayLore.remove(0);
+
+									if (removingEnchantPlayerLevel == -1 && playerEnchantIds.containsKey(enchId)) {
+										removingEnchantPlayerLevel = playerEnchantIds.get(enchId);
+									}
+
+									if (removingEnchantPlayerLevel >= 0 && enchantment.level < removingEnchantPlayerLevel) {
+										continue;
+									}
+
+									if (enchanterCurrentEnch == null) {
+										enchanterCurrentEnch = enchantment;
+									} else if (updateLevel) {
+										if (removingEnchantPlayerLevel < 0 && enchantment.level > enchanterCurrentEnch.level) {
+											enchanterCurrentEnch = enchantment;
+										} else if (removingEnchantPlayerLevel >= 0 && enchantment.level < enchanterCurrentEnch.level) {
+											enchanterCurrentEnch = enchantment;
+										}
+									}
+
+									enchanterEnchLevels.put(enchantment.level, enchantment);
+								}
+							}
+						}
+					}
+				}
+				if (enchanterCurrentEnch != null && removingEnchantPlayerLevel >= 0) {
+					for (String line : enchanterCurrentEnch.displayLore) {
+						Matcher matcher = XP_COST_PATTERN.matcher(line);
+						if (matcher.find()) {
+							enchanterCurrentEnch.xpCost = Integer.parseInt(matcher.group(1));
+						}
+					}
+				}
+			} else {
+				isChangingEnchLevel = false;
+				enchanterCurrentEnch = null;
+
+				searchRemovedFromRemovable = false;
+				searchRemovedFromApplicable = false;
+				applicable.clear();
+				removable.clear();
+				boolean hasXpBottle = false;
+				if (currentState == EnchantState.HAS_ITEM) {
+					for (int i = 0; i < 15; i++) {
+						int slotIndex = 12 + (i % 5) + (i / 5) * 9;
+						ItemStack book = cc.getLowerChestInventory().getStackInSlot(slotIndex);
+						ItemStack xpBottle = cc.getLowerChestInventory().getStackInSlot(50);
+						if (!hasXpBottle && xpBottle != null &&
+							xpBottle.getItem() == Items.experience_bottle) { //Make show when in dungeon screen
+							String name = "Buy Xp Bottles";
+							String id = "XP_BOTTLE";
+							Enchantment xpBottleEnch = new Enchantment(50, name, id,
+								Utils.getRawTooltip(xpBottle), 1, true, false
+							);
+							applicable.add(xpBottleEnch);
+							hasXpBottle = true;
+						}
+						if (book != null) {
+							NBTTagCompound tagBook = book.getTagCompound();
+							if (tagBook != null) {
+								NBTTagCompound ea = tagBook.getCompoundTag("ExtraAttributes");
+								if (ea != null) {
+									NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+									if (enchantments != null) {
+										String enchId = Utils
+											.cleanColour(book.getDisplayName())
+											.toLowerCase()
+											.replace(" ", "_")
+											.replace("-", "_");
+										if (enchId.equalsIgnoreCase("_")) continue;
+										if (enchId.equals("prosecute")) {
+											enchId = "PROSECUTE";
+										}
+										String name = Utils.cleanColour(book.getDisplayName());
+
+										if (searchField.getText().trim().isEmpty() ||
+											name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+											if (name.equalsIgnoreCase("Bane of Arthropods")) {
+												name = "Bane of Arth.";
+											} else if (name.equalsIgnoreCase("Projectile Protection")) {
+												name = "Projectile Prot";
+											} else if (name.equalsIgnoreCase("Blast Protection")) {
+												name = "Blast Prot";
+											} else if (name.equalsIgnoreCase("Turbo-Mushrooms")) {
+												name = "Turbo-Mush";
+											}
+											Matcher nameMatcher = ENCHANT_NAME_PATTERN.matcher(name);
+											if (nameMatcher.matches()) {
+												name = nameMatcher.group(1);
+											}
+
+											if (playerEnchantIds.containsKey(enchId)) {
+												Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+													Utils.getRawTooltip(book), playerEnchantIds.get(enchId), false, false
+												);
+												if (!enchantment.overMaxLevel) {
+													removable.add(enchantment);
+												}
+											} else {
+												Enchantment enchantment = new Enchantment(slotIndex, name, enchId,
+													Utils.getRawTooltip(book), 1, true, true
+												);
+												applicable.add(enchantment);
+											}
+										} else {
+											if (playerEnchantIds.containsKey(enchId)) {
+												searchRemovedFromRemovable = true;
+											} else {
+												searchRemovedFromApplicable = true;
+											}
+										}
+
+									}
+								}
+							}
+						}
+					}
+					NEUConfig cfg = NotEnoughUpdates.INSTANCE.config;
+					int mult = cfg.enchantingSolvers.enchantOrdering == 0 ? 1 : -1;
+					Comparator<Enchantment> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
+						Comparator.comparingInt(e -> mult * e.xpCost) :
+						(c1, c2) -> mult *
+							c1.enchId.toLowerCase().compareTo(c2.enchId.toLowerCase());
+					removable.sort(comparator);
+					applicable.sort(comparator);
+				}
+			}
+		}
+
+		//Update book model state
+		if (lastState != currentState) {
+			do {
+				this.pageOpenRandom += (float) (this.random.nextInt(4) - this.random.nextInt(4));
+
+			} while (!(this.pageOpen > this.pageOpenRandom + 1.0F) && !(this.pageOpen < this.pageOpenRandom - 1.0F));
+		}
+
+		this.pageOpenLast = this.pageOpen;
+		this.bookOpenLast = this.bookOpen;
+
+		if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
+			this.bookOpen += 0.2F;
+		} else {
+			this.bookOpen -= 0.2F;
+		}
+
+		this.bookOpen = MathHelper.clamp_float(this.bookOpen, 0.0F, 1.0F);
+		float f1 = (this.pageOpenRandom - this.pageOpen) * 0.4F;
+		f1 = MathHelper.clamp_float(f1, -0.2F, 0.2F);
+		this.pageOpenVelocity += (f1 - this.pageOpenVelocity) * 0.9F;
+		this.pageOpen += this.pageOpenVelocity;
+	}
+
+	private void tickBooks() {
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		ItemStack enchantingItemStack = cc.getLowerChestInventory().getStackInSlot(19);
+		ItemStack anvilStack = cc.getLowerChestInventory().getStackInSlot(28);
+
+		this.lastState = currentState;
+
+		if (anvilStack != null && anvilStack.getItem() == Item.getItemFromBlock(Blocks.anvil) &&
+			currentState != EnchantState.ADDING_BOOK) {
+			currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+			enchantingItem = enchantingItemStack;
+		} else if (currentState == EnchantState.HAS_ITEM_IN_BOOKS && enchantingItem == null &&
+			enchantingItemStack != null) {
+			enchantingItem = enchantingItemStack;
+		} else if (anvilStack != null && anvilStack.getItem() == Item.getItemFromBlock(Blocks.enchanting_table) &&
+			currentState != EnchantState.ADDING_BOOK) {
+			currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+			enchantingItem = enchantingItemStack;
+		}
+
+		orbDisplay.physicsTickOrbs();
+
+		if (++tickCounter >= 20) {
+			tickCounter = 0;
+		}
+
+		if (currentState == EnchantState.ADDING_BOOK) {
+			if (arrowAmount.getTarget() != 1) {
+				arrowAmount.setTarget(1);
+				arrowAmount.resetTimer();
+			}
+		} else {
+			if (arrowAmount.getTarget() != 0) {
+				arrowAmount.setTarget(0);
+				arrowAmount.resetTimer();
+			}
+		}
+
+		isChangingEnchLevel = false;
+
+		searchRemovedFromRemovable = false;
+		searchRemovedFromApplicable = false;
+		if (applicableItem.size() < 6) leftScroll.setValue(0);
+		applicableItem.clear();
+		removableItem.clear();
+		if (currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
+			boolean hasRandomReforge = false;
+			for (int i = 0; i < 15; i++) {
+				int slotIndex = 12 + (i % 5) + (i / 5) * 9;
+				ItemStack book = cc.getLowerChestInventory().getStackInSlot(slotIndex);
+				ItemStack randomReforge = cc.getLowerChestInventory().getStackInSlot(48);
+				if (!hasRandomReforge && randomReforge != null &&
+					randomReforge.getItem() == Item.getItemFromBlock(Blocks.anvil)) { //Make show when in dungeon screen
+					String name = Utils.cleanColour(randomReforge.getDisplayName());
+					String id = Utils.cleanColour(randomReforge.getDisplayName());
+					if (name.equals("Convert to Dungeon Item")) {
+						name = "Dungeonize Item";
+						id = "CONVERT_TO_DUNGEON";
+					} else if (name.equals("Random Basic Reforge")) {
+						name = "Basic Reforge";
+						id = "RANDOM_REFORGE";
+					}
+					HexItem reforgeItem = new HexItem(48, name, id,
+						Utils.getRawTooltip(randomReforge), true, true
+					);
+					boolean hasAdded = false;
+					for (String lore : reforgeItem.displayLore) {
+						if (lore.contains("This item is already a Dungeon")) {
+							removableItem.add(reforgeItem);
+							hasAdded = true;
+							break;
+						}
+					}
+					if (!hasAdded) applicableItem.add(reforgeItem);
+					hasRandomReforge = true;
+				}
+				if (book != null) {
+					NBTTagCompound tagBook = book.getTagCompound();
+					if (tagBook != null) {
+						NBTTagCompound ea = tagBook.getCompoundTag("ExtraAttributes");
+						if (ea != null) {
+							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+							if (enchantments != null) {
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+									"-",
+									"_"
+								);
+								String name = Utils.cleanColour(book.getDisplayName());
+								if (itemId.equalsIgnoreCase("_")) continue;
+								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
+								if (searchField.getText().trim().isEmpty() ||
+									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									if (name.equalsIgnoreCase("Hot Potato Book")) {
+										name = "Hot Potato";
+									} else if (name.equalsIgnoreCase("Fuming Potato Book")) {
+										name = "Fuming Potato";
+									} else if (name.equalsIgnoreCase("Recombobulator 3000")) {
+										name = "Recombobulator";
+									} else if (name.contains("Power Scroll")) {
+										name = name.replace("Power ", "");
+									} else if (name.contains("\u272a")) {
+										name = name.replaceAll("[^✪]*", "");
+									} else if (name.equalsIgnoreCase("First Master Star")) {
+										name = "Master Star \u00a7c➊";
+									} else if (name.equalsIgnoreCase("Second Master Star")) {
+										name = "Master Star \u00a7c➋";
+									} else if (name.equalsIgnoreCase("Third Master Star")) {
+										name = "Master Star \u00a7c➌";
+									} else if (name.equalsIgnoreCase("Fourth Master Star")) {
+										name = "Master Star \u00a7c➍";
+									} else if (name.equalsIgnoreCase("Fifth Master Star")) {
+										name = "Master Star \u00a7c➎";
+									} else if (name.equalsIgnoreCase("The Art Of Peace")) {
+										name = "Art Of Peace";
+									} else if (name.equalsIgnoreCase("Mana Disintegrator")) {
+										name = "M Disintegrator";
+									}
+									/*if (playerEnchantIds.containsKey(itemId)) {
+										HexItem item = new HexItem(slotIndex, name, itemId,
+											Utils.getRawTooltip(book), false, false
+										);
+										if (!item.overMaxLevel) {
+											removableItem.add(item);
+										}
+										enchanterItemLevels.put(item.level, item);
+									} else */
+									{
+										HexItem item = new HexItem(slotIndex, name, itemId,
+											Utils.getRawTooltip(book), true, true
+										);
+										enchanterItemLevels.put(item.level, item);
+										if (item.itemType != ItemType.UNKNOWN) {
+											int potatoCount = 0;
+											int killCount = 0;
+											int warCount = 0;
+											int ffdCount = 0;
+											int recombCount = 0;
+											int effLevel = 0;
+											int starCount = 0;
+											int singularityCount = 0;
+											int tunerCount = 0;
+											int peaceCount = 0;
+											int manaDisintegratorCount = 0;
+											boolean shadowWarp = false;
+											boolean witherShield = false;
+											boolean implosion = false;
+											String reforge = "";
+											if (enchantingItem != null) {
+												NBTTagCompound tagItem = enchantingItem.getTagCompound();
+												if (tagItem != null) {
+													NBTTagCompound extra = tagItem.getCompoundTag("ExtraAttributes");
+													if (extra != null) {
+														potatoCount = extra.getInteger("hot_potato_count");
+														killCount = extra.getInteger("stats_book");
+														warCount = extra.getInteger("art_of_war_count");
+														ffdCount = extra.getInteger("farming_for_dummies_count");
+														recombCount = extra.getInteger("rarity_upgrades");
+														starCount = extra.getInteger("upgrade_level");
+														singularityCount = extra.getInteger("wood_singularity_count");
+														tunerCount = extra.getInteger("tuned_transmission");
+														peaceCount = extra.getInteger("art_of_peace_count");
+														manaDisintegratorCount = extra.getInteger("mana_disintegrator_count");
+														reforge = extra.getString("modifier");
+														NBTTagCompound enchs = extra.getCompoundTag("enchantments");
+														NBTTagList scrolls = extra.getTagList("ability_scroll", 8);
+														if (enchs != null) {
+															effLevel = enchs.getInteger("efficiency");
+														}
+														if (scrolls != null) {
+															for (int index = 0; index < scrolls.tagCount(); index++) {
+																if (scrolls.getStringTagAt(index).equals("IMPLOSION_SCROLL")) {
+																	implosion = true;
+																} else if (scrolls.getStringTagAt(index).equals("SHADOW_WARP_SCROLL")) {
+																	shadowWarp = true;
+																} else if (scrolls.getStringTagAt(index).equals("WITHER_SHIELD_SCROLL")) {
+																	witherShield = true;
+																}
+															}
+														}
+													}
+												}
+											}
+											if (item.itemName.length() > 14) item.itemName = item.itemName.substring(0, 14);
+
+											if (item.itemType == ItemType.HOT_POTATO) {
+												if (potatoCount < 10) applicableItem.add(item);
+												else removableItem.add(item);
+
+											} else if (item.itemType == ItemType.FUMING_POTATO) {
+												if (potatoCount >= 10 && potatoCount < 15) applicableItem.add(item);
+												else if (potatoCount >= 15) removableItem.add(item);
+
+											} else if (item.itemType == ItemType.BOOK_OF_STATS) {
+												if (killCount > 0) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.ART_OF_WAR) {
+												if (warCount > 0) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.FARMING_DUMMY) {
+												if (ffdCount < 5) applicableItem.add(item);
+												else removableItem.add(item);
+
+											} else if (item.itemType == ItemType.RECOMB) {
+												if (recombCount > 0) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.SILEX) {
+												if (effLevel >= 5 && effLevel < 10) applicableItem.add(item);
+												else if (effLevel == 10) removableItem.add(item);
+
+											} else if (item.isPowerScroll()) {
+												applicableItem.add(item);
+
+											} else if (item.isMasterStar()) {
+												applicableItem.add(item);
+
+											} else if (item.isDungeonStar()) {
+												if (starCount >= item.itemType.getStarLevel()) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.WOOD_SINGULARITY) {
+												if (singularityCount > 0) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.isHypeScroll()) {
+												if (shadowWarp) removableItem.add(item);
+												else if (implosion) removableItem.add(item);
+												else if (witherShield) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.TUNER) {
+												if (tunerCount >= 4) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.REFORGE) {
+												if (item.getReforge().equalsIgnoreCase(reforge) && !reforge.equals("")) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.ART_OF_PEACE) {
+												if (peaceCount > 0) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else if (item.itemType == ItemType.MANA_DISINTEGRATOR) {
+												if (manaDisintegratorCount >= 10) removableItem.add(item);
+												else applicableItem.add(item);
+
+											} else {
+												applicableItem.add(item);
+											}
+										} else {
+											applicableItem.add(item);
+										}
+									}
+								} else {
+									if (playerEnchantIds.containsKey(itemId)) {
+										searchRemovedFromRemovable = true;
+									} else {
+										searchRemovedFromApplicable = true;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			NEUConfig cfg = NotEnoughUpdates.INSTANCE.config;
+			int mult = cfg.enchantingSolvers.enchantOrdering == 0 ? 1 : -1;
+			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
+				Comparator.comparingInt(e -> (int) (mult * e.price)) :
+				(c1, c2) -> mult *
+					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+			removableItem.sort(comparator);
+			applicableItem.sort(comparator);
+		}
+	}
+
+	private void tickHex() {
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		ItemStack enchantingItemStack = cc.getLowerChestInventory().getStackInSlot(22);
+		ItemStack glassStack = cc.getLowerChestInventory().getStackInSlot(12);
+		//ItemStack anvilStack = cc.getLowerChestInventory().getStackInSlot(28);
+
+		this.lastState = currentState;
+
+		if (enchantingItemStack != null) {
+			if (glassStack.getItem() != null && glassStack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane)) {
+				if (glassStack.getItemDamage() == 14) {
+					currentState = EnchantState.INVALID_ITEM_HEX;
+				} else if (glassStack.getItemDamage() == 10) {
+					currentState = EnchantState.HAS_ITEM_IN_HEX;
+				} else {
+					currentState = EnchantState.NO_ITEM_IN_HEX;
+				}
+				enchantingItem = enchantingItemStack;
+			}
+		} else {
+			currentState = EnchantState.NO_ITEM_IN_HEX;
+		}
+
+		orbDisplay.physicsTickOrbs();
+
+		if (++tickCounter >= 20) {
+			tickCounter = 0;
+		}
+
+		if (currentState == EnchantState.ADDING_BOOK) {
+			if (arrowAmount.getTarget() != 1) {
+				arrowAmount.setTarget(1);
+				arrowAmount.resetTimer();
+			}
+		} else {
+			if (arrowAmount.getTarget() != 0) {
+				arrowAmount.setTarget(0);
+				arrowAmount.resetTimer();
+			}
+		}
+
+		isChangingEnchLevel = false;
+
+		searchRemovedFromRemovable = false;
+		searchRemovedFromApplicable = false;
+		applicableItem.clear();
+		removableItem.clear();
+		boolean hasHexItem = false;
+		if (currentState == EnchantState.HAS_ITEM_IN_HEX) {
+			for (int i = 0; i < 9; i++) {
+				int slotIndex = 15 + (i % 3) + (i / 3) * 9;
+				ItemStack book = cc.getLowerChestInventory().getStackInSlot(slotIndex);
+				if (!hasHexItem && glassStack != null) {
+					HexItem item = new HexItem(slotIndex, "Total Upgrades", "TOTAL_UPGRADES",
+						Utils.getRawTooltip(glassStack), true, true
+					);
+					removableItem.add(item);
+					hasHexItem = true;
+				}
+				if (book != null) {
+					NBTTagCompound tagBook = book.getTagCompound();
+					if (tagBook != null) {
+						NBTTagCompound ea = tagBook.getCompoundTag("ExtraAttributes");
+						if (ea != null) {
+							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+							if (enchantments != null) {
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+									"-",
+									"_"
+								);
+								String name = Utils.cleanColour(book.getDisplayName());
+								if (itemId.equalsIgnoreCase("_")) continue;
+								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
+								if (searchField.getText().trim().isEmpty() ||
+									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									if (name.equalsIgnoreCase("Ultimate Enchantments")) {
+										name = "Ult Enchants";
+									}
+									/*if (playerEnchantIds.containsKey(itemId)) {
+										HexItem item = new HexItem(slotIndex, name, itemId,
+											Utils.getRawTooltip(book), false, false
+										);
+										if (!item.overMaxLevel) {
+											removableItem.add(item);
+										}
+										enchanterItemLevels.put(item.level, item);
+									} else */
+									{
+										HexItem item = new HexItem(slotIndex, name, "HEX_ITEM" + i,
+											Utils.getRawTooltip(book), true, true
+										);
+										enchanterItemLevels.put(item.level, item);
+										applicableItem.add(item);
+									}
+								} else {
+									if (playerEnchantIds.containsKey(itemId)) {
+										searchRemovedFromRemovable = true;
+									} else {
+										searchRemovedFromApplicable = true;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			NEUConfig cfg = NotEnoughUpdates.INSTANCE.config;
+			int mult = cfg.enchantingSolvers.enchantOrdering == 0 ? 1 : -1;
+			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
+				Comparator.comparingInt(e -> (int) (mult * e.price)) :
+				(c1, c2) -> mult *
+					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+			removableItem.sort(comparator);
+			applicableItem.sort(comparator);
+		}
+	}
+
+	private void tickGemstones() {
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		ItemStack enchantingItemStack = cc.getLowerChestInventory().getStackInSlot(19);
+		ItemStack portalStack = cc.getLowerChestInventory().getStackInSlot(28);
+
+		int lastPage = currentPage;
+		this.lastState = currentState;
+		if (portalStack != null && portalStack.getItem() == Item.getItemFromBlock(Blocks.end_portal_frame) &&
+			currentState != EnchantState.ADDING_GEMSTONE && !shouldOverrideGemstones &&
+			currentState != EnchantState.APPLYING_GEMSTONE) {
+			currentState = EnchantState.HAS_ITEM_IN_GEMSTONE;
+			enchantingItem = enchantingItemStack;
+		} else if (portalStack != null && portalStack.getItem() == Item.getItemFromBlock(Blocks.end_portal_frame) &&
+			shouldOverrideGemstones && currentState != EnchantState.APPLYING_GEMSTONE) {
+			currentState = EnchantState.ADDING_GEMSTONE;
+		} else if (currentState == EnchantState.HAS_ITEM_IN_GEMSTONE && enchantingItem == null &&
+			enchantingItemStack != null) {
+			enchantingItem = enchantingItemStack;
+		} else if (currentState != EnchantState.APPLYING_GEMSTONE) {
+			currentState = EnchantState.HAS_ITEM_IN_GEMSTONE;
+		}
+
+		if (currentState == EnchantState.APPLYING_GEMSTONE || currentState == EnchantState.ADDING_GEMSTONE) {
+			ItemStack pageUpStack = cc.getLowerChestInventory().getStackInSlot(17);
+			ItemStack pageDownStack = cc.getLowerChestInventory().getStackInSlot(35);
+			if (pageUpStack != null && pageDownStack != null) {
+				currentPage = 0;
+				boolean upIsGlass = pageUpStack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane);
+				boolean downIsGlass = pageDownStack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane);
+				int page = -1;
+
+				expectedMaxPage = 1;
+				if (!downIsGlass) {
+					try {
+						page = Integer.parseInt(Utils.getRawTooltip(pageDownStack).get(1).substring(11)) - 1;
+						expectedMaxPage = page + 1;
+					} catch (Exception ignored) {
+					}
+				}
+				if (page == -1 && !upIsGlass) {
+					try {
+						page = Integer.parseInt(Utils.getRawTooltip(pageUpStack).get(1).substring(11)) + 1;
+						expectedMaxPage = page;
+					} catch (Exception ignored) {
+					}
+				}
+				if (page == -1) {
+					currentPage = 1;
+				} else {
+					currentPage = page;
+				}
+			}
+		}
+
+		orbDisplay.physicsTickOrbs();
+
+		if (++tickCounter >= 20) {
+			tickCounter = 0;
+		}
+
+		if (lastState != currentState || lastPage != currentPage) {
+			leftScroll.setValue(0);
+			rightScroll.setValue(0);
+		}
+
+		if (currentState == EnchantState.APPLYING_GEMSTONE) {
+			if (arrowAmount.getTarget() != 1) {
+				arrowAmount.setTarget(1);
+				arrowAmount.resetTimer();
+			}
+		} else {
+			if (arrowAmount.getTarget() != 0) {
+				arrowAmount.setTarget(0);
+				arrowAmount.resetTimer();
+			}
+		}
+
+		isChangingEnchLevel = false;
+
+		searchRemovedFromRemovable = false;
+		searchRemovedFromApplicable = false;
+		applicableItem.clear();
+		removableItem.clear();
+		if (isInGemstones()) {
+			for (int i = 0; i < 15; i++) {
+				int slotIndex = 12 + (i % 5) + (i / 5) * 9;
+				ItemStack book = cc.getLowerChestInventory().getStackInSlot(slotIndex);
+				if (book != null) {
+					NBTTagCompound tagBook = book.getTagCompound();
+					if (tagBook != null) {
+						NBTTagCompound ea = tagBook.getCompoundTag("ExtraAttributes");
+						if (ea != null) {
+							NBTTagCompound enchantments = ea.getCompoundTag("enchantments");
+							if (enchantments != null) {
+								String itemId = Utils.cleanColour(book.getDisplayName()).toUpperCase().replace(" ", "_").replace(
+									"-",
+									"_"
+								);
+								String name = Utils.cleanColour(book.getDisplayName());
+								if (itemId.equalsIgnoreCase("_")) continue;
+								if (itemId.equalsIgnoreCase("Item_Maxed_Out")) continue;
+								if (searchField.getText().trim().isEmpty() ||
+									name.toLowerCase().contains(searchField.getText().trim().toLowerCase())) {
+									/*if (playerEnchantIds.containsKey(itemId)) {
+										HexItem item = new HexItem(slotIndex, name, itemId,
+											Utils.getRawTooltip(book), false, false
+										);
+										if (!item.overMaxLevel) {
+											removableItem.add(item);
+										}
+										enchanterItemLevels.put(item.level, item);
+									} else */
+									{
+										HexItem item = new HexItem(slotIndex, name, itemId,
+											Utils.getRawTooltip(book), true, true
+										);
+										enchanterItemLevels.put(item.level, item);
+										if (item.isGemstone()) {
+											if (book.getItem() == Items.dye) {
+												item.conflicts = true;
+											}
+											boolean removed = false;
+											for (String lore : item.displayLore) {
+												if (lore.contains("Click to remove!")) {
+													removableItem.add(item);
+													removed = true;
+													break;
+												}
+											}
+											if (!removed) {
+												applicableItem.add(item);
+											}
+											if (item.itemName.length() > 14) item.itemName = item.itemName.substring(0, 14);
+										} else {
+											applicableItem.add(item);
+										}
+									}
+								} else {
+									if (playerEnchantIds.containsKey(itemId)) {
+										searchRemovedFromRemovable = true;
+									} else {
+										searchRemovedFromApplicable = true;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			NEUConfig cfg = NotEnoughUpdates.INSTANCE.config;
+			int mult = cfg.enchantingSolvers.enchantOrdering == 0 ? 1 : -1;
+			Comparator<HexItem> comparator = cfg.enchantingSolvers.enchantSorting == 0 ?
+				Comparator.comparingInt(e -> (int) (mult * e.price)) :
+				(c1, c2) -> mult *
+					c1.itemId.toLowerCase().compareTo(c2.itemId.toLowerCase());
+			removableItem.sort(comparator);
+			applicableItem.sort(comparator);
+		}
+		this.pageOpenLast = this.pageOpen;
+	}
+
+	private List<String> createTooltip(String title, int selectedOption, String... options) {
+		String selPrefix = EnumChatFormatting.DARK_AQUA + " \u25b6 ";
+		String unselPrefix = EnumChatFormatting.GRAY.toString();
+
+		for (int i = 0; i < options.length; i++) {
+			if (i == selectedOption) {
+				options[i] = selPrefix + options[i];
+			} else {
+				options[i] = unselPrefix + options[i];
+			}
+		}
+
+		List<String> list = Lists.newArrayList(options);
+		list.add(0, "");
+		list.add(0, EnumChatFormatting.GREEN + title);
+		return list;
+	}
+
+	public void render(float partialTicks, String containerName) {
+		if (containerName == null) return;
+		if (containerName.equals("The Hex")) {
+			renderHex(partialTicks);
+		} else if (containerName.contains("Enchant Item")) {
+			renderEnchantment(partialTicks);
+		} else if (containerName.contains("Books") || containerName.contains("Modifiers") || containerName.contains("Bottles of Enchanting")) {
+			renderBooks(partialTicks);
+		} else if (containerName.contains("Gemstones")) {
+			renderGemstones(partialTicks);
+		} else {
+			renderBooks(partialTicks);
+		}
+	}
+
+	private void renderEnchantment(float partialTicks) {
+		if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return;
+
+		int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
+
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		leftScroll.tick();
+		rightScroll.tick();
+		arrowAmount.tick();
+
+		ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		int width = scaledResolution.getScaledWidth();
+		int height = scaledResolution.getScaledHeight();
+		int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+		int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+		guiLeft = (width - X_SIZE) / 2;
+		guiTop = (height - Y_SIZE) / 2;
+
+		List<String> tooltipToDisplay = null;
+		boolean disallowClick = false;
+		ItemStack stackOnMouse = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
+		int itemHoverX = -1;
+		int itemHoverY = -1;
+		boolean hoverLocked = false;
+
+		drawGradientRect(0, 0, width, height, 0xc0101010, 0xd0101010);
+
+		renderBaseTexture();
+
+		Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+		Minecraft.getMinecraft().fontRendererObj.drawString("Removable", guiLeft + 247, guiTop + 7, 0x404040, false);
+
+		//Page Text
+		if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
+			String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
+			int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
+			Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040
+			);
+
+			//Page Arrows
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - pageStrLen / 2 - 2 - 15, guiTop + 6, 15, 15,
+				0, 15 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + pageStrLen / 2 + 2, guiTop + 6, 15, 15,
+				15 / 512f, 30 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+		}
+
+		tooltipToDisplay = renderSettings(mouseX, mouseY, tooltipToDisplay);
+
+		renderScrollBars(applicable, removable, mouseY);
+
+		//Enchant book model
+		renderEnchantBook(scaledResolution, partialTicks);
+
+		//Can't be enchanted text
+		if (currentState == EnchantState.INVALID_ITEM) {
+			GlStateManager.disableDepth();
+			Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
+			);
+			Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
+			);
+			GlStateManager.enableDepth();
+		}
+
+		renderArrow();
+
+		//Text if no enchants appear
+		if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
+			if (applicable.isEmpty() && removable.isEmpty() && searchRemovedFromApplicable) {
+				Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
+				);
+				Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 58, true, 0xffff5555
+				);
+			} else if (applicable.isEmpty() && !searchRemovedFromApplicable) {
+				Utils.drawStringCentered("No applicable", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
+				);
+			}
+			if (applicable.isEmpty() && removable.isEmpty() && searchRemovedFromRemovable) {
+				Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
+				);
+				Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 58, true, 0xffff5555
+				);
+			} else if (removable.isEmpty() && !searchRemovedFromRemovable) {
+				Utils.drawStringCentered("No removable", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
+				);
+			}
+		}
+		//Available enchants (left)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + leftScroll.getValue() / 16;
+
+			if (applicable.size() <= index) break;
+			Enchantment ench = applicable.get(index);
+
+			int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentEnch != null && enchanterCurrentEnch.enchId.equals(ench.enchId) ? 16 : 0;
+			int uOffset = ench.conflicts ? 112 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 8, top, 96, 16,
+				uOffset / 512f, (96 + uOffset) / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (ench.displayLore != null) {
+					tooltipToDisplay = ench.displayLore;
+				}
+			}
+
+			String levelStr = "" + ench.xpCost;
+			int colour = 0xc8ff8f;
+			if (ench.xpCost > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				ench.enchantName,
+				guiLeft + 8 + 16 + 2 + textOffset,
+				top + 4 + textOffset,
+				0xffffffdd,
+				true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Removable enchants (right)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + rightScroll.getValue() / 16;
+
+			if (removable.size() <= index) break;
+			Enchantment ench = removable.get(index);
+
+			int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentEnch != null && enchanterCurrentEnch.enchId.equals(ench.enchId) ? 16 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 248, top, 96, 16,
+				0, 96 / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (ench.displayLore != null) {
+					tooltipToDisplay = ench.displayLore;
+				}
+			}
+
+			String levelStr = "" + ench.xpCost;
+			if (ench.xpCost < 0) levelStr = "?";
+			int colour = 0xc8ff8f;
+			if (ench.xpCost > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(ench.enchantName,
+				guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Player Inventory Items
+		Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+				.getDisplayName()
+				.getUnformattedText(),
+			guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
+		);
+		int inventoryStartIndex = cc.getLowerChestInventory().getSizeInventory();
+		GlStateManager.enableDepth();
+		for (int i = 0; i < 36; i++) {
+			int itemX = guiLeft + 102 + 18 * (i % 9);
+			int itemY = guiTop + 133 + 18 * (i / 9);
+
+			if (i >= 27) {
+				itemY += 4;
+			}
+
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(guiLeft + 102 - 8, guiTop + 191 - (inventoryStartIndex / 9 * 18 + 89), 0);
+			Slot slot = cc.getSlot(inventoryStartIndex + i);
+			((AccessorGuiContainer) chest).doDrawSlot(slot);
+			GlStateManager.popMatrix();
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+				hoverLocked = SlotLocking.getInstance().isSlotLocked(slot);
+
+				if (slot.getHasStack()) {
+					tooltipToDisplay = slot.getStack().getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		//Search bar
+		if (currentState == EnchantState.HAS_ITEM) {
+			if (searchField.getText().isEmpty() && !searchField.getFocus()) {
+				searchField.setSize(90, 14);
+				searchField.setPrependText("\u00a77Search...");
+			} else {
+				if (searchField.getFocus()) {
+					int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchField.getTextDisplay()) + 10;
+					searchField.setSize(Math.max(90, len), 14);
+				} else {
+					searchField.setSize(90, 14);
+				}
+				searchField.setPrependText("");
+			}
+			searchField.render(guiLeft + X_SIZE / 2 - searchField.getWidth() / 2, guiTop + 83);
+		} else if (currentState == EnchantState.ADDING_ENCHANT &&
+			enchanterCurrentEnch != null && !enchanterEnchLevels.isEmpty()) {
+			int left = guiLeft + X_SIZE / 2 - 56;
+			int top = guiTop + 83;
+
+			int uOffset = enchanterCurrentEnch.conflicts ? 112 : 0;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(left, top, 112, 16,
+				uOffset / 512f, (112 + uOffset) / 512f, 249 / 512f, (249 + 16) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > left + 16 && mouseX <= left + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (enchanterCurrentEnch.displayLore != null) {
+					tooltipToDisplay = enchanterCurrentEnch.displayLore;
+				}
+			}
+
+			//Enchant cost
+			String levelStr = "" + enchanterCurrentEnch.xpCost;
+			if (enchanterCurrentEnch.xpCost < 0) levelStr = "?";
+
+			int colour = 0xc8ff8f;
+			if (enchanterCurrentEnch.xpCost > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(levelStr, left + 8 - levelWidth / 2, top + 4, colour, false);
+
+			//Enchant name
+			String name = WordUtils.capitalizeFully(enchanterCurrentEnch.enchId.replace("_", " "));
+			if (name.equalsIgnoreCase("Bane of Arthropods")) {
+				name = "Bane of Arth.";
+			} else if (name.equalsIgnoreCase("Projectile Protection")) {
+				name = "Projectile Prot";
+			} else if (name.equalsIgnoreCase("Blast Protection")) {
+				name = "Blast Prot";
+			} else if (name.equalsIgnoreCase("Luck of the Sea")) {
+				name = "Luck of Sea";
+			} else if (name.equalsIgnoreCase("Turbo Mushrooms")) {
+				name = "Turbo-Mush";
+			}
+			Utils.drawStringCentered(
+				name,
+				Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2,
+				top + 8,
+				true,
+				0xffffffdd
+			);
+
+			if (isChangingEnchLevel) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(left + 96, top, 16, 16,
+					96 / 512f, 112 / 512f, 265 / 512f, (265 + 16) / 512f, GL11.GL_NEAREST
+				);
+			}
+
+			//Enchant level
+			levelStr = "" + enchanterCurrentEnch.level;
+			if (enchanterCurrentEnch.xpCost < 0) levelStr = "?";
+			levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4,
+				0xea82ff,
+				false
+			);
+
+			//Confirm button
+
+			String confirmText = "Apply";
+			if (removingEnchantPlayerLevel >= 0) {
+				if (removingEnchantPlayerLevel == enchanterCurrentEnch.level) {
+					confirmText = "Remove";
+				} else if (enchanterCurrentEnch.level > removingEnchantPlayerLevel) {
+					confirmText = "Upgrade";
+				} else {
+					confirmText = "Bad Level";
+				}
+			}
+			if (System.currentTimeMillis() - confirmButtonAnimTime < 500 && !(playerXpLevel < enchanterCurrentEnch.xpCost)) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 - 1 - 23, top + 18 + 9, false, 0x408040
+				);
+			} else {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 - 1 - 24, top + 18 + 8, false, 0x408040
+				);
+
+				if (playerXpLevel < enchanterCurrentEnch.xpCost) {
+					Gui.drawRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, guiLeft + X_SIZE / 2 - 1, top + 18 + 14, 0x80000000);
+				}
+			}
+
+			//Cancel button
+			if (System.currentTimeMillis() - cancelButtonAnimTime < 500) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
+				);
+			} else {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
+				);
+			}
+
+			if (mouseY > top + 18 && mouseY <= top + 18 + 16) {
+				if (mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1) {
+					disallowClick = true;
+					if (enchanterCurrentEnch.displayLore != null) {
+						tooltipToDisplay = enchanterCurrentEnch.displayLore;
+					}
+				} else if (mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48) {
+					disallowClick = true;
+					tooltipToDisplay = Lists.newArrayList("\u00a7cCancel");
+				}
+			}
+
+			//Enchant level switcher
+			if (isChangingEnchLevel) {
+				tooltipToDisplay = null;
+
+				List<Enchantment> before = new ArrayList<>();
+				List<Enchantment> after = new ArrayList<>();
+
+				for (Enchantment ench : enchanterEnchLevels.values()) {
+					if (ench.level < enchanterCurrentEnch.level) {
+						before.add(ench);
+					} else if (ench.level > enchanterCurrentEnch.level) {
+						after.add(ench);
+					}
+				}
+
+				before.sort(Comparator.comparingInt(o -> -o.level));
+				after.sort(Comparator.comparingInt(o -> o.level));
+
+				int bSize = before.size();
+				int aSize = after.size();
+				GlStateManager.disableDepth();
+				for (int i = 0; i < bSize + aSize; i++) {
+					Enchantment ench;
+					int yIndex;
+					if (i < bSize) {
+						ench = before.get(i);
+						yIndex = -i - 1;
+					} else {
+						ench = after.get(i - bSize);
+						yIndex = i - bSize + 1;
+					}
+
+					Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+					GlStateManager.color(1, 1, 1, 1);
+
+					int type = 0;
+					if (i == bSize) {
+						type = 2;
+					} else if (i == 0) {
+						type = 1;
+					}
+
+					if (mouseX > left + 96 && mouseX <= left + 96 + 16 &&
+						mouseY > top + 16 * yIndex && mouseY <= top + 16 * yIndex + 16) {
+						tooltipToDisplay = new ArrayList<>(ench.displayLore);
+						if (tooltipToDisplay.size() > 2) {
+							tooltipToDisplay.remove(tooltipToDisplay.size() - 1);
+							tooltipToDisplay.remove(tooltipToDisplay.size() - 1);
+						}
+						itemHoverX = -1;
+						itemHoverY = -1;
+					}
+
+					Utils.drawTexturedRect(left + 96, top + 16 * yIndex, 16, 16,
+						16 * type / 512f, (16 + 16 * type) / 512f, 356 / 512f, (356 + 16) / 512f, GL11.GL_NEAREST
+					);
+
+					levelStr = "" + ench.level;
+					levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+					Minecraft.getMinecraft().fontRendererObj.drawString(
+						levelStr,
+						left + 96 + 8 - levelWidth / 2 - 1,
+						top + 16 * yIndex + 4,
+						0x2d2102,
+						false
+					);
+					Minecraft.getMinecraft().fontRendererObj.drawString(
+						levelStr,
+						left + 96 + 8 - levelWidth / 2 + 1,
+						top + 16 * yIndex + 4,
+						0x2d2102,
+						false
+					);
+					Minecraft.getMinecraft().fontRendererObj.drawString(
+						levelStr,
+						left + 96 + 8 - levelWidth / 2,
+						top + 16 * yIndex + 4 - 1,
+						0x2d2102,
+						false
+					);
+					Minecraft.getMinecraft().fontRendererObj.drawString(
+						levelStr,
+						left + 96 + 8 - levelWidth / 2,
+						top + 16 * yIndex + 4 + 1,
+						0x2d2102,
+						false
+					);
+					Minecraft.getMinecraft().fontRendererObj.drawString(
+						levelStr,
+						left + 96 + 8 - levelWidth / 2,
+						top + 16 * yIndex + 4,
+						0xea82ff,
+						false
+					);
+				}
+				GlStateManager.enableDepth();
+			}
+
+			if (mouseX > left + 96 && mouseX <= left + 96 + 16 &&
+				mouseY > top && mouseY <= top + 16) {
+				if (isChangingEnchLevel) {
+					tooltipToDisplay = Lists.newArrayList("\u00a7cCancel level change");
+				} else {
+					tooltipToDisplay = Lists.newArrayList("\u00a7aChange enchant level");
+				}
+			}
+		}
+
+		if (currentState == EnchantState.HAS_ITEM) {
+			renderCancel();
+		}
+
+		//Item enchant input
+		ItemStack itemEnchantInput;
+		if (currentState == EnchantState.HAS_ITEM_IN_HEX) {
+			itemEnchantInput = cc.getSlot(22).getStack();
+		} else {
+			itemEnchantInput = cc.getSlot(19).getStack();
+		}
+		if (itemEnchantInput != null && itemEnchantInput.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane)) {
+			itemEnchantInput = enchantingItem;
+		}
+		{
+			int itemX = guiLeft + 174;
+			int itemY = guiTop + 58;
+
+			if (itemEnchantInput == null) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(itemX, itemY, 16, 16,
+					0, 16 / 512f, 281 / 512f, (281 + 16) / 512f, GL11.GL_NEAREST
+				);
+			} else {
+				Utils.drawItemStack(itemEnchantInput, itemX, itemY);
+			}
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+
+				if (itemEnchantInput != null) {
+					tooltipToDisplay = itemEnchantInput.getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (!isChangingEnchLevel && itemHoverX >= 0 && itemHoverY >= 0) {
+			GlStateManager.disableDepth();
+			GlStateManager.colorMask(true, true, true, false);
+			Gui.drawRect(itemHoverX, itemHoverY, itemHoverX + 16, itemHoverY + 16,
+				hoverLocked ? 0x80ff8080 : 0x80ffffff
+			);
+			GlStateManager.colorMask(true, true, true, true);
+			GlStateManager.enableDepth();
+		}
+
+		GlStateManager.translate(0, 0, 300);
+
+		renderOrbAnim(partialTicks);
+
+		renderMouseStack(stackOnMouse, disallowClick, mouseX, mouseY,
+			width, height, tooltipToDisplay
+		);
+		GlStateManager.translate(0, 0, -300);
+	}
+
+	private void renderBooks(float partialTicks) {
+		if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return;
+
+		int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
+
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		leftScroll.tick();
+		rightScroll.tick();
+		arrowAmount.tick();
+
+		ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		int width = scaledResolution.getScaledWidth();
+		int height = scaledResolution.getScaledHeight();
+		int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+		int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+		guiLeft = (width - X_SIZE) / 2;
+		guiTop = (height - Y_SIZE) / 2;
+
+		List<String> tooltipToDisplay = null;
+		boolean disallowClick = false;
+		ItemStack stackOnMouse = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
+		int itemHoverX = -1;
+		int itemHoverY = -1;
+		boolean hoverLocked = false;
+
+		drawGradientRect(0, 0, width, height, 0xc0101010, 0xd0101010);
+
+		renderBaseTexture();
+
+		Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+		Minecraft.getMinecraft().fontRendererObj.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
+
+		//Page Text
+		/*if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
+			String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
+			int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
+			Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040
+			);
+
+			//Page Arrows
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - pageStrLen / 2 - 2 - 15, guiTop + 6, 15, 15,
+				0, 15 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + pageStrLen / 2 + 2, guiTop + 6, 15, 15,
+				15 / 512f, 30 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+		}*/
+
+		tooltipToDisplay = renderSettings(mouseX, mouseY, tooltipToDisplay);
+
+		renderScrollBars(applicableItem, applicableItem, mouseY);
+
+		//Enchant book model
+		renderEnchantBook(scaledResolution, partialTicks);
+
+		//Can't be enchanted text
+		/*if (currentState == EnchantState.INVALID_ITEM) {
+			GlStateManager.disableDepth();
+			Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
+			);
+			Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
+			);
+			GlStateManager.enableDepth();
+		}*/
+
+		renderArrow();
+
+		//Text if no enchants appear
+		if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT ||
+			currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
+			if (applicableItem.isEmpty() && removableItem.isEmpty() && searchRemovedFromApplicable) {
+				Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
+				);
+				Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 58, true, 0xffff5555
+				);
+			} else if (applicableItem.isEmpty() && !searchRemovedFromApplicable) {
+				Utils.drawStringCentered("No applicable", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555
+				);
+			}
+			if (applicableItem.isEmpty() && removableItem.isEmpty() && searchRemovedFromRemovable) {
+				Utils.drawStringCentered("Can't find that", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchant, perhaps", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("it is on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
+				);
+				Utils.drawStringCentered("another page?", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 58, true, 0xffff5555
+				);
+			} else if (removableItem.isEmpty() && !searchRemovedFromRemovable) {
+				Utils.drawStringCentered("No removable", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555
+				);
+				Utils.drawStringCentered("enchants on", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555
+				);
+				Utils.drawStringCentered("this page...", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555
+				);
+			}
+		}
+		//Available enchants (left)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + leftScroll.getValue() / 16;
+
+			if (applicableItem.size() <= index) break;
+			HexItem item = applicableItem.get(index);
+
+			int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int uOffset = item.conflicts ? 112 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 8, top, 96, 16,
+				uOffset / 512f, (96 + uOffset) / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				item.itemName,
+				guiLeft + 8 + 16 + 2 + textOffset,
+				top + 4 + textOffset,
+				0xffffffdd,
+				true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Removable enchants (right)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + rightScroll.getValue() / 16;
+
+			if (removableItem.size() <= index) break;
+			HexItem item = removableItem.get(index);
+
+			int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 248, top, 96, 16,
+				0, 96 / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			/*if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}*/
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(item.itemName,
+				guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Player Inventory Items
+		Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+				.getDisplayName()
+				.getUnformattedText(),
+			guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
+		);
+		int inventoryStartIndex = cc.getLowerChestInventory().getSizeInventory();
+		GlStateManager.enableDepth();
+		for (int i = 0; i < 36; i++) {
+			int itemX = guiLeft + 102 + 18 * (i % 9);
+			int itemY = guiTop + 133 + 18 * (i / 9);
+
+			if (i >= 27) {
+				itemY += 4;
+			}
+
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(guiLeft + 102 - 8, guiTop + 191 - (inventoryStartIndex / 9 * 18 + 89), 0);
+			Slot slot = cc.getSlot(inventoryStartIndex + i);
+			((AccessorGuiContainer) chest).doDrawSlot(slot);
+			GlStateManager.popMatrix();
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+				hoverLocked = SlotLocking.getInstance().isSlotLocked(slot);
+
+				if (slot.getHasStack()) {
+					tooltipToDisplay = slot.getStack().getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		//Search bar
+		if (currentState == EnchantState.HAS_ITEM) {
+			if (searchField.getText().isEmpty() && !searchField.getFocus()) {
+				searchField.setSize(90, 14);
+				searchField.setPrependText("\u00a77Search...");
+			} else {
+				if (searchField.getFocus()) {
+					int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchField.getTextDisplay()) + 10;
+					searchField.setSize(Math.max(90, len), 14);
+				} else {
+					searchField.setSize(90, 14);
+				}
+				searchField.setPrependText("");
+			}
+			searchField.render(guiLeft + X_SIZE / 2 - searchField.getWidth() / 2, guiTop + 83);
+		} else if (currentState == EnchantState.ADDING_BOOK &&
+			enchanterCurrentItem != null /*&& !enchanterItemLevels.isEmpty()*/) {
+			int left = guiLeft + X_SIZE / 2 - 56;
+			int top = guiTop + 83;
+
+			int uOffset = enchanterCurrentItem.conflicts ? 112 : 0;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(left, top, 112, 16,
+				uOffset / 512f, (112 + uOffset) / 512f, 249 / 512f, (249 + 16) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > left + 16 && mouseX <= left + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (enchanterCurrentItem.displayLore != null) {
+					tooltipToDisplay = enchanterCurrentItem.displayLore;
+				}
+			}
+
+			String priceStr = "" + numberFormat.format(enchanterCurrentItem.getPrice()) + " Coins";
+			if (enchanterCurrentItem.price < 0) priceStr = "";
+			int priceWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(priceStr);
+			int priceTop = guiTop + 10;
+			int x = 180;
+			int color = 0x2d2102;
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				priceStr,
+				guiLeft + x - priceWidth / 2 - 1,
+				priceTop + 4,
+				color,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				priceStr,
+				guiLeft + x - priceWidth / 2 + 1,
+				priceTop + 4,
+				color,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				priceStr,
+				guiLeft + x - priceWidth / 2,
+				priceTop + 4 - 1,
+				color,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				priceStr,
+				guiLeft + x - priceWidth / 2,
+				priceTop + 4 + 1,
+				color,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				priceStr,
+				guiLeft + x - priceWidth / 2,
+				priceTop + 4,
+				0xfcba03,
+				false
+			);
+
+			//Enchant name
+			String name = WordUtils.capitalizeFully(enchanterCurrentItem.itemId.replace("_", " "));
+			if (name.equalsIgnoreCase("Hot Potato Book")) {
+				name = "Hot Potato";
+			} else if (name.equalsIgnoreCase("Fuming Potato Book")) {
+				name = "Fuming Potato";
+			} else if (name.equalsIgnoreCase("Recombobulator 3000")) {
+				name = "Recombobulator";
+			} else if (name.contains("Power Scroll")) {
+				name = name.replace("Power ", "");
+			} else if (name.contains("\u272a")) {
+				name = name.replaceAll("[^✪]*", "");
+			} else if (name.equalsIgnoreCase("First Master Star")) {
+				name = "Master Star \u00a7c➊";
+			} else if (name.equalsIgnoreCase("Second Master Star")) {
+				name = "Master Star \u00a7c➋";
+			} else if (name.equalsIgnoreCase("Third Master Star")) {
+				name = "Master Star \u00a7c➌";
+			} else if (name.equalsIgnoreCase("Fourth Master Star")) {
+				name = "Master Star \u00a7c➍";
+			} else if (name.equalsIgnoreCase("Fifth Master Star")) {
+				name = "Master Star \u00a7c➎";
+			} else if (name.equalsIgnoreCase("The Art Of Peace")) {
+				name = "Art Of Peace";
+			} else if (name.equalsIgnoreCase("Mana Disintegrator")) {
+				name = "M Disintegrator";
+			}
+			Utils.drawStringCentered(
+				name,
+				Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2,
+				top + 8,
+				true,
+				0xffffffdd
+			);
+
+			//Confirm button
+			String confirmText = "Apply";
+			if (removingEnchantPlayerLevel >= 0) {
+				if (removingEnchantPlayerLevel == enchanterCurrentItem.level) {
+					confirmText = "Remove";
+				} else if (enchanterCurrentItem.level > removingEnchantPlayerLevel) {
+					confirmText = "Upgrade";
+				} else {
+					confirmText = "Bad Level";
+				}
+			}
+			if (System.currentTimeMillis() - confirmButtonAnimTime < 500 && !(playerXpLevel < enchanterCurrentItem.price)) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 - 1 - 23, top + 18 + 9, false, 0x408040
+				);
+			} else {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 - 1 - 24, top + 18 + 8, false, 0x408040
+				);
+
+				/*if (playerXpLevel < enchanterCurrentItem.price) {
+					Gui.drawRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, guiLeft + X_SIZE / 2 - 1, top + 18 + 14, 0x80000000);
+				}*/
+			}
+
+			//Cancel button
+			if (System.currentTimeMillis() - cancelButtonAnimTime < 500) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
+				);
+			} else {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
+				);
+			}
+
+			if (mouseY > top + 18 && mouseY <= top + 18 + 16) {
+				if (mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1) {
+					disallowClick = true;
+					if (enchanterCurrentItem.displayLore != null) {
+						tooltipToDisplay = enchanterCurrentItem.displayLore;
+					}
+				} else if (mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48) {
+					disallowClick = true;
+					tooltipToDisplay = Lists.newArrayList("\u00a7cCancel");
+				}
+			}
+		}
+
+		if (currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
+			renderCancel();
+		}
+
+		//Item enchant input
+		ItemStack itemEnchantInput;
+		if (currentState == EnchantState.HAS_ITEM_IN_HEX) {
+			itemEnchantInput = cc.getSlot(22).getStack();
+		} else {
+			itemEnchantInput = cc.getSlot(19).getStack();
+		}
+		if (itemEnchantInput != null && itemEnchantInput.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane)) {
+			itemEnchantInput = enchantingItem;
+		}
+		{
+			int itemX = guiLeft + 174;
+			int itemY = guiTop + 58;
+
+			if (itemEnchantInput == null) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(itemX, itemY, 16, 16,
+					0, 16 / 512f, 281 / 512f, (281 + 16) / 512f, GL11.GL_NEAREST
+				);
+			} else {
+				Utils.drawItemStack(itemEnchantInput, itemX, itemY);
+			}
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+
+				if (itemEnchantInput != null) {
+					tooltipToDisplay = itemEnchantInput.getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (!isChangingEnchLevel && itemHoverX >= 0 && itemHoverY >= 0) {
+			GlStateManager.disableDepth();
+			GlStateManager.colorMask(true, true, true, false);
+			Gui.drawRect(itemHoverX, itemHoverY, itemHoverX + 16, itemHoverY + 16,
+				hoverLocked ? 0x80ff8080 : 0x80ffffff
+			);
+			GlStateManager.colorMask(true, true, true, true);
+			GlStateManager.enableDepth();
+		}
+
+		GlStateManager.translate(0, 0, 300);
+
+		renderOrbAnim(partialTicks);
+
+		renderMouseStack(stackOnMouse, disallowClick, mouseX, mouseY,
+			width, height, tooltipToDisplay
+		);
+		GlStateManager.translate(0, 0, -300);
+	}
+
+	private void renderHex(float partialTicks) {
+		if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return;
+
+		int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
+
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		leftScroll.tick();
+		//rightScroll.tick();
+		//arrowAmount.tick();
+
+		ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		int width = scaledResolution.getScaledWidth();
+		int height = scaledResolution.getScaledHeight();
+		int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+		int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+		guiLeft = (width - X_SIZE) / 2;
+		guiTop = (height - Y_SIZE) / 2;
+
+		List<String> tooltipToDisplay = null;
+		boolean disallowClick = false;
+		ItemStack stackOnMouse = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
+		int itemHoverX = -1;
+		int itemHoverY = -1;
+		boolean hoverLocked = false;
+
+		drawGradientRect(0, 0, width, height, 0xc0101010, 0xd0101010);
+
+		renderBaseTexture();
+
+		Minecraft.getMinecraft().fontRendererObj.drawString("The Hex", guiLeft + 7, guiTop + 7, 0x404040, false);
+		//Minecraft.getMinecraft().fontRendererObj.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
+
+		tooltipToDisplay = renderSettings(mouseX, mouseY, tooltipToDisplay);
+
+		renderScrollBars(applicableItem, applicableItem, mouseY);
+
+		//Enchant book model
+		renderEnchantBook(scaledResolution, partialTicks);
+
+		//Can't be enchanted text
+		if (currentState == EnchantState.INVALID_ITEM_HEX) {
+			GlStateManager.disableDepth();
+			Utils.drawStringCentered("This item can't", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555
+			);
+			Utils.drawStringCentered("be enchanted", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555
+			);
+			GlStateManager.enableDepth();
+		}
+
+		renderArrow();
+
+		//Available enchants (left)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + leftScroll.getValue() / 16;
+
+			if (applicableItem.size() <= index) break;
+			HexItem item = applicableItem.get(index);
+
+			int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int uOffset = item.conflicts ? 112 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 8, top, 96, 16,
+				uOffset / 512f, (96 + uOffset) / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				item.itemName,
+				guiLeft + 8 + 16 + 2 + textOffset,
+				top + 4 + textOffset,
+				0xffffffdd,
+				true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Removable enchants (right)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + rightScroll.getValue() / 16;
+
+			if (removableItem.size() <= index) break;
+			HexItem item = removableItem.get(index);
+
+			int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 248, top, 96, 16,
+				0, 96 / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(item.itemName,
+				guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Player Inventory Items
+		Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+				.getDisplayName()
+				.getUnformattedText(),
+			guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
+		);
+		int inventoryStartIndex = cc.getLowerChestInventory().getSizeInventory();
+		GlStateManager.enableDepth();
+		for (int i = 0; i < 36; i++) {
+			int itemX = guiLeft + 102 + 18 * (i % 9);
+			int itemY = guiTop + 133 + 18 * (i / 9);
+
+			if (i >= 27) {
+				itemY += 4;
+			}
+
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(guiLeft + 102 - 8, guiTop + 191 - (inventoryStartIndex / 9 * 18 + 89), 0);
+			Slot slot = cc.getSlot(inventoryStartIndex + i);
+			((AccessorGuiContainer) chest).doDrawSlot(slot);
+			GlStateManager.popMatrix();
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+				hoverLocked = SlotLocking.getInstance().isSlotLocked(slot);
+
+				if (slot.getHasStack()) {
+					tooltipToDisplay = slot.getStack().getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (currentState == EnchantState.ADDING_BOOK &&
+			enchanterCurrentItem != null /*&& !enchanterItemLevels.isEmpty()*/) {
+			int left = guiLeft + X_SIZE / 2 - 56;
+			int top = guiTop + 83;
+
+			int uOffset = enchanterCurrentItem.conflicts ? 112 : 0;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(left, top, 112, 16,
+				uOffset / 512f, (112 + uOffset) / 512f, 249 / 512f, (249 + 16) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > left + 16 && mouseX <= left + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (enchanterCurrentItem.displayLore != null) {
+					tooltipToDisplay = enchanterCurrentItem.displayLore;
+				}
+			}
+
+			if (mouseY > top + 18 && mouseY <= top + 18 + 16) {
+				if (mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1) {
+					disallowClick = true;
+					if (enchanterCurrentItem.displayLore != null) {
+						tooltipToDisplay = enchanterCurrentItem.displayLore;
+					}
+				} else if (mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48) {
+					disallowClick = true;
+					tooltipToDisplay = Lists.newArrayList("\u00a7cCancel");
+				}
+			}
+		}
+
+		if (currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
+			renderCancel();
+		}
+
+		//Item enchant input
+		ItemStack itemEnchantInput;
+		if (isInHex()) {
+			itemEnchantInput = cc.getSlot(22).getStack();
+		} else {
+			itemEnchantInput = cc.getSlot(19).getStack();
+		}
+		if (itemEnchantInput != null && itemEnchantInput.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane)) {
+			itemEnchantInput = enchantingItem;
+		}
+		{
+			int itemX = guiLeft + 174;
+			int itemY = guiTop + 58;
+
+			if (itemEnchantInput == null) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(itemX, itemY, 16, 16,
+					0, 16 / 512f, 281 / 512f, (281 + 16) / 512f, GL11.GL_NEAREST
+				);
+			} else {
+				Utils.drawItemStack(itemEnchantInput, itemX, itemY);
+			}
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+
+				if (itemEnchantInput != null) {
+					tooltipToDisplay = itemEnchantInput.getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (!isChangingEnchLevel && itemHoverX >= 0 && itemHoverY >= 0) {
+			GlStateManager.disableDepth();
+			GlStateManager.colorMask(true, true, true, false);
+			Gui.drawRect(itemHoverX, itemHoverY, itemHoverX + 16, itemHoverY + 16,
+				hoverLocked ? 0x80ff8080 : 0x80ffffff
+			);
+			GlStateManager.colorMask(true, true, true, true);
+			GlStateManager.enableDepth();
+		}
+
+		GlStateManager.translate(0, 0, 300);
+
+		renderOrbAnim(partialTicks);
+
+		renderMouseStack(stackOnMouse, disallowClick, mouseX, mouseY,
+			width, height, tooltipToDisplay
+		);
+		GlStateManager.translate(0, 0, -300);
+	}
+
+	private void renderGemstones(float partialTicks) {
+		if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return;
+
+		int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
+
+		GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+		ContainerChest cc = (ContainerChest) chest.inventorySlots;
+
+		leftScroll.tick();
+		rightScroll.tick();
+		arrowAmount.tick();
+
+		ScaledResolution scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		int width = scaledResolution.getScaledWidth();
+		int height = scaledResolution.getScaledHeight();
+		int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+		int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+		guiLeft = (width - X_SIZE) / 2;
+		guiTop = (height - Y_SIZE) / 2;
+
+		List<String> tooltipToDisplay = null;
+		boolean disallowClick = false;
+		ItemStack stackOnMouse = Minecraft.getMinecraft().thePlayer.inventory.getItemStack();
+		int itemHoverX = -1;
+		int itemHoverY = -1;
+		boolean hoverLocked = false;
+
+		drawGradientRect(0, 0, width, height, 0xc0101010, 0xd0101010);
+
+		renderBaseTexture();
+
+		Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+		Minecraft.getMinecraft().fontRendererObj.drawString("Applied", guiLeft + 247, guiTop + 7, 0x404040, false);
+
+		//Page Text
+		if (currentState == EnchantState.ADDING_GEMSTONE || currentState == EnchantState.APPLYING_GEMSTONE) {
+			String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
+			int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
+			Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040
+			);
+
+			//Page Arrows
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - pageStrLen / 2 - 2 - 15, guiTop + 6, 15, 15,
+				0, 15 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + pageStrLen / 2 + 2, guiTop + 6, 15, 15,
+				15 / 512f, 30 / 512f, 372 / 512f, 387 / 512f, GL11.GL_NEAREST
+			);
+		}
+
+		//Confirm button
+		{
+			int top = guiTop + 83;
+			if (currentState == EnchantState.APPLYING_GEMSTONE) {
+				String confirmText = "Apply";
+				if (removingEnchantPlayerLevel >= 0) {
+					if (removingEnchantPlayerLevel == enchanterCurrentItem.level) {
+						confirmText = "Remove";
+					} else if (enchanterCurrentItem.level > removingEnchantPlayerLevel) {
+						confirmText = "Upgrade";
+					} else {
+						confirmText = "Bad Level";
+					}
+				}
+				if (System.currentTimeMillis() - confirmButtonAnimTime < 500) {
+					Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+					GlStateManager.color(1, 1, 1, 1);
+					Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+						0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+					);
+					Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+						guiLeft + X_SIZE / 2 - 1 - 23, top + 18 + 9, false, 0x408040
+					);
+				} else {
+					Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+					GlStateManager.color(1, 1, 1, 1);
+					Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+						0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+					);
+					Utils.drawStringCentered(confirmText, Minecraft.getMinecraft().fontRendererObj,
+						guiLeft + X_SIZE / 2 - 1 - 24, top + 18 + 8, false, 0x408040
+					);
+				}
+			}
+
+			//Cancel button
+
+			if (System.currentTimeMillis() - cancelButtonAnimTime < 500) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
+				);
+			} else {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+					guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
+				);
+			}
+		}
+
+		tooltipToDisplay = renderSettings(mouseX, mouseY, tooltipToDisplay);
+
+		renderScrollBars(applicableItem, applicableItem, mouseY);
+
+		//Enchant book model
+		renderEnchantBook(scaledResolution, partialTicks);
+
+		renderArrow();
+
+		//Available enchants (left)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + leftScroll.getValue() / 16;
+
+			if (applicableItem.size() <= index) break;
+			HexItem item = applicableItem.get(index);
+
+			int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int uOffset = item.conflicts ? 112 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 8, top, 96, 16,
+				uOffset / 512f, (96 + uOffset) / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 16 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				item.itemName,
+				guiLeft + 8 + 16 + 2 + textOffset,
+				top + 4 + textOffset,
+				0xffffffdd,
+				true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Removable enchants (right)
+		GlScissorStack.push(0, guiTop + 18, width, guiTop + 18 + 96, scaledResolution);
+		for (int i = 0; i < 7; i++) {
+			int index = i + rightScroll.getValue() / 16;
+
+			if (removableItem.size() <= index) break;
+			HexItem item = removableItem.get(index);
+
+			int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+			int vOffset = enchanterCurrentItem != null && enchanterCurrentItem.itemId.equals(item.itemId) ? 16 : 0;
+			int textOffset = vOffset / 16;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 248, top, 96, 16,
+				0, 96 / 512f, (249 + vOffset) / 512f, (249 + 16 + vOffset) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (item.displayLore != null) {
+					tooltipToDisplay = item.displayLore;
+				}
+			}
+
+			String levelStr = getIconStr(item);
+			int colour = 0xc8ff8f;
+			if (item.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				guiLeft + 256 - levelWidth / 2,
+				top + 4,
+				colour,
+				false
+			);
+
+			Minecraft.getMinecraft().fontRendererObj.drawString(item.itemName,
+				guiLeft + 248 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true
+			);
+		}
+		GlScissorStack.pop(scaledResolution);
+
+		//Player Inventory Items
+		Minecraft.getMinecraft().fontRendererObj.drawString(Minecraft.getMinecraft().thePlayer.inventory
+				.getDisplayName()
+				.getUnformattedText(),
+			guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
+		);
+		int inventoryStartIndex = cc.getLowerChestInventory().getSizeInventory();
+		GlStateManager.enableDepth();
+		for (int i = 0; i < 36; i++) {
+			int itemX = guiLeft + 102 + 18 * (i % 9);
+			int itemY = guiTop + 133 + 18 * (i / 9);
+
+			if (i >= 27) {
+				itemY += 4;
+			}
+
+			GlStateManager.pushMatrix();
+			GlStateManager.translate(guiLeft + 102 - 8, guiTop + 191 - (inventoryStartIndex / 9 * 18 + 89), 0);
+			Slot slot = cc.getSlot(inventoryStartIndex + i);
+			((AccessorGuiContainer) chest).doDrawSlot(slot);
+			GlStateManager.popMatrix();
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+				hoverLocked = SlotLocking.getInstance().isSlotLocked(slot);
+
+				if (slot.getHasStack()) {
+					tooltipToDisplay = slot.getStack().getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (currentState == EnchantState.APPLYING_GEMSTONE &&
+			enchanterCurrentItem != null /*&& !enchanterItemLevels.isEmpty()*/) {
+			int left = guiLeft + X_SIZE / 2 - 56;
+			int top = guiTop + 83;
+
+			int uOffset = enchanterCurrentItem.conflicts ? 112 : 0;
+
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(left, top, 112, 16,
+				uOffset / 512f, (112 + uOffset) / 512f, 249 / 512f, (249 + 16) / 512f, GL11.GL_NEAREST
+			);
+
+			if (mouseX > left + 16 && mouseX <= left + 96 &&
+				mouseY > top && mouseY <= top + 16) {
+				disallowClick = true;
+				if (enchanterCurrentItem.displayLore != null) {
+					tooltipToDisplay = enchanterCurrentItem.displayLore;
+				}
+			}
+
+			if (mouseY > top + 18 && mouseY <= top + 18 + 16) {
+				if (mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1) {
+					disallowClick = true;
+					if (enchanterCurrentItem.displayLore != null) {
+						tooltipToDisplay = enchanterCurrentItem.displayLore;
+					}
+				} else if (mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48) {
+					disallowClick = true;
+					tooltipToDisplay = Lists.newArrayList("\u00a7cCancel");
+				}
+			}
+		}
+
+		if (currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.ADDING_BOOK) {
+			renderCancel();
+		}
+
+		//Item enchant input
+		ItemStack itemEnchantInput;
+		if (isInHex()) {
+			itemEnchantInput = cc.getSlot(22).getStack();
+		} else {
+			itemEnchantInput = cc.getSlot(19).getStack();
+		}
+		if (itemEnchantInput != null && itemEnchantInput.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane)) {
+			itemEnchantInput = enchantingItem;
+		}
+		{
+			int itemX = guiLeft + 174;
+			int itemY = guiTop + 58;
+
+			if (itemEnchantInput == null) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(itemX, itemY, 16, 16,
+					0, 16 / 512f, 281 / 512f, (281 + 16) / 512f, GL11.GL_NEAREST
+				);
+			} else {
+				Utils.drawItemStack(itemEnchantInput, itemX, itemY);
+			}
+
+			if (mouseX >= itemX && mouseX < itemX + 18 &&
+				mouseY >= itemY && mouseY < itemY + 18) {
+				itemHoverX = itemX;
+				itemHoverY = itemY;
+
+				if (itemEnchantInput != null) {
+					tooltipToDisplay = itemEnchantInput.getTooltip(
+						Minecraft.getMinecraft().thePlayer,
+						Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+					);
+				}
+			}
+		}
+
+		if (currentState == EnchantState.APPLYING_GEMSTONE) {
+			int left = guiLeft + X_SIZE / 2 - 56;
+			int top = guiTop + 83;
+			//Enchant cost
+			String levelStr = getIconStr(enchanterCurrentItem);
+
+			int colour = 0xc8ff8f;
+			if (enchanterCurrentItem.price > playerXpLevel) {
+				colour = 0xff5555;
+			}
+
+			int levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 8 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(levelStr, left + 8 - levelWidth / 2, top + 4, colour, false);
+
+			//Enchant name
+			String name = WordUtils.capitalizeFully(enchanterCurrentItem.itemName);
+			if (name.equalsIgnoreCase("Bane of Arthropods")) {
+				name = "Bane of Arth.";
+			} else if (name.equalsIgnoreCase("Projectile Protection")) {
+				name = "Projectile Prot";
+			} else if (name.equalsIgnoreCase("Blast Protection")) {
+				name = "Blast Prot";
+			} else if (name.equalsIgnoreCase("Luck of the Sea")) {
+				name = "Luck of Sea";
+			} else if (name.equalsIgnoreCase("Turbo Mushrooms")) {
+				name = "Turbo-Mush";
+			}
+			Utils.drawStringCentered(
+				name,
+				Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2,
+				top + 8,
+				true,
+				0xffffffdd
+			);
+
+			if (isChangingEnchLevel) {
+				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+				GlStateManager.color(1, 1, 1, 1);
+				Utils.drawTexturedRect(left + 96, top, 16, 16,
+					96 / 512f, 112 / 512f, 265 / 512f, (265 + 16) / 512f, GL11.GL_NEAREST
+				);
+			}
+
+			//Enchant level
+			levelStr = "";
+			levelWidth = Minecraft.getMinecraft().fontRendererObj.getStringWidth(levelStr);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2 - 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2 + 1,
+				top + 4,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4 - 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4 + 1,
+				0x2d2102,
+				false
+			);
+			Minecraft.getMinecraft().fontRendererObj.drawString(
+				levelStr,
+				left + 96 + 8 - levelWidth / 2,
+				top + 4,
+				0xea82ff,
+				false
+			);
+		}
+
+		if (!isChangingEnchLevel && itemHoverX >= 0 && itemHoverY >= 0) {
+			GlStateManager.disableDepth();
+			GlStateManager.colorMask(true, true, true, false);
+			Gui.drawRect(itemHoverX, itemHoverY, itemHoverX + 16, itemHoverY + 16,
+				hoverLocked ? 0x80ff8080 : 0x80ffffff
+			);
+			GlStateManager.colorMask(true, true, true, true);
+			GlStateManager.enableDepth();
+		}
+
+		GlStateManager.translate(0, 0, 300);
+
+		renderOrbAnim(partialTicks);
+
+		renderMouseStack(stackOnMouse, disallowClick, mouseX, mouseY,
+			width, height, tooltipToDisplay
+		);
+		GlStateManager.translate(0, 0, -300);
+	}
+
+	private String getIconStr(HexItem item) {
+		String levelStr = "";
+		if (item.itemType != ItemType.UNKNOWN) {
+			int potatoCount = 0;
+			int killCount = 0;
+			int warCount = 0;
+			int ffdCount = 0;
+			int recombCount = 0;
+			int effLevel = 0;
+			int starCount = 0;
+			int singularityCount = 0;
+			int tunerCount = 0;
+			int manaDisintegratorCount = 0;
+			int peaceCount = 0;
+			int dungeonItem = 0;
+			boolean shadowWarp = false;
+			boolean witherShield = false;
+			boolean implosion = false;
+			String reforge = "";
+			if (enchantingItem != null) {
+				NBTTagCompound tagItem = enchantingItem.getTagCompound();
+				if (tagItem != null) {
+					NBTTagCompound ea = tagItem.getCompoundTag("ExtraAttributes");
+					if (ea != null) {
+						potatoCount = ea.getInteger("hot_potato_count");
+						killCount = ea.getInteger("stats_book");
+						warCount = ea.getInteger("art_of_war_count");
+						ffdCount = ea.getInteger("farming_for_dummies_count");
+						recombCount = ea.getInteger("rarity_upgrades");
+						starCount = ea.getInteger("upgrade_level");
+						singularityCount = ea.getInteger("wood_singularity_count");
+						tunerCount = ea.getInteger("tuned_transmission");
+						peaceCount = ea.getInteger("art_of_peace_count");
+						manaDisintegratorCount = ea.getInteger("mana_disintegrator_count");
+						dungeonItem = ea.getInteger("dungeon_item");
+						reforge = ea.getString("modifier");
+						NBTTagCompound enchs = ea.getCompoundTag("enchantments");
+						NBTTagList scrolls = ea.getTagList("ability_scroll", 8);
+						if (enchs != null) {
+							effLevel = enchs.getInteger("efficiency");
+						}
+						if (scrolls != null) {
+							for (int index = 0; index < scrolls.tagCount(); index++) {
+								if (scrolls.getStringTagAt(index).equals("IMPLOSION_SCROLL")) {
+									implosion = true;
+								} else if (scrolls.getStringTagAt(index).equals("SHADOW_WARP_SCROLL")) {
+									shadowWarp = true;
+								} else if (scrolls.getStringTagAt(index).equals("WITHER_SHIELD_SCROLL")) {
+									witherShield = true;
+								}
+							}
+						}
+					}
+				}
+			}
+			if (item.itemType == ItemType.HOT_POTATO) {
+				if (potatoCount < 10) levelStr = "" + potatoCount;
+				else levelStr = "✔";
+
+			} else if (item.itemType == ItemType.FUMING_POTATO) {
+				if (potatoCount <= 10) levelStr = "" + 0;
+				else if (potatoCount < 15) levelStr = "" + (potatoCount - 10);
+				else levelStr = "✔";
+
+			} else if (item.itemType == ItemType.BOOK_OF_STATS) {
+				if (killCount > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.ART_OF_WAR) {
+				if (warCount > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.FARMING_DUMMY) {
+				if (ffdCount < 5) levelStr = "" + ffdCount;
+				else levelStr = "✔";
+
+			} else if (item.itemType == ItemType.RECOMB) {
+				if (recombCount > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.SILEX) {
+				if (effLevel < 10) levelStr = "✖";
+				else levelStr = "✔";
+
+			} else if (item.isPowerScroll()) {
+				levelStr = "✖";
+
+			} else if (item.isMasterStar()) {
+				levelStr = "✖";
+
+			} else if (item.isDungeonStar()) {
+				if (starCount >= item.itemType.getStarLevel()) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.WOOD_SINGULARITY) {
+				if (singularityCount > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.isHypeScroll()) {
+				if (shadowWarp) levelStr = "✔";
+				else if (implosion) levelStr = "✔";
+				else if (witherShield) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.TUNER) {
+				if (tunerCount >= 4) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.REFORGE) {
+				if (item.getReforge().equalsIgnoreCase(reforge)) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.RANDOM_REFORGE) {
+				levelStr = "?";
+
+			} else if (item.itemType == ItemType.ART_OF_PEACE) {
+				if (peaceCount > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.MANA_DISINTEGRATOR) {
+				if (manaDisintegratorCount >= 10) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.CONVERT_TO_DUNGEON) {
+				if (dungeonItem > 0) levelStr = "✔";
+				else levelStr = "✖";
+
+			} else if (item.itemType == ItemType.RUBY_GEMSTONE) {
+				levelStr = "❤";
+
+			} else if (item.itemType == ItemType.AMETHYST_GEMSTONE) {
+				levelStr = "❈";
+
+			} else if (item.itemType == ItemType.SAPPHIRE_GEMSTONE) {
+				levelStr = "✎";
+
+			} else if (item.itemType == ItemType.JADE_GEMSTONE) {
+				levelStr = "☘";
+
+			} else if (item.itemType == ItemType.AMBER_GEMSTONE) {
+				levelStr = "⸕";
+
+			} else if (item.itemType == ItemType.TOPAZ_GEMSTONE) {
+				levelStr = "✧";
+
+			} else if (item.itemType == ItemType.JASPER_GEMSTONE) {
+				levelStr = "❁";
+
+			} else if (item.itemType == ItemType.OPAL_GEMSTONE) {
+				levelStr = "❂";
+			}
+		} else {
+			levelStr = "?";
+		}
+		return levelStr;
+	}
+
+	private void renderBaseTexture() {
+		//Base Texture
+		Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+		GlStateManager.color(1, 1, 1, 1);
+		Utils.drawTexturedRect(guiLeft, guiTop, X_SIZE, Y_SIZE,
+			0, X_SIZE / 512f, 0, Y_SIZE / 512f, GL11.GL_NEAREST
+		);
+	}
+
+	private List<String> renderSettings(int mouseX, int mouseY, List<String> tooltipToDisplay) {
+		//Settings Buttons
+		Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+		GlStateManager.color(1, 1, 1, 1);
+		//On Settings Button
+		Utils.drawTexturedRect(guiLeft + 295, guiTop + 147, 16, 16,
+			0, 16 / 512f, 387 / 512f, (387 + 16) / 512f, GL11.GL_NEAREST
+		);
+		//Sorting Settings Button
+		float sortingMinU = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting * 16 / 512f;
+		Utils.drawTexturedRect(guiLeft + 295, guiTop + 147 + 18, 16, 16,
+			sortingMinU, sortingMinU + 16 / 512f, 419 / 512f, (419 + 16) / 512f, GL11.GL_NEAREST
+		);
+		//Ordering Settings Button
+		float orderingMinU = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering * 16 / 512f;
+		Utils.drawTexturedRect(guiLeft + 295 + 18, guiTop + 147 + 18, 16, 16,
+			orderingMinU, orderingMinU + 16 / 512f, 435 / 512f, (435 + 16) / 512f, GL11.GL_NEAREST
+		);
+
+		if (mouseX >= guiLeft + 294 && mouseX < guiLeft + 294 + 36 &&
+			mouseY >= guiTop + 146 && mouseY < guiTop + 146 + 36) {
+			int index = (mouseX - (guiLeft + 295)) / 18 + (mouseY - (guiTop + 147)) / 18 * 2;
+			switch (index) {
+				case 0:
+					Gui.drawRect(guiLeft + 295, guiTop + 147, guiLeft + 295 + 16, guiTop + 147 + 16, 0x80ffffff);
+					tooltipToDisplay = createTooltip("Enable GUI", 0, "On", "Off");
+					break;
+				case 2:
+					Gui.drawRect(guiLeft + 295, guiTop + 147 + 18, guiLeft + 295 + 16, guiTop + 147 + 16 + 18, 0x80ffffff);
+					tooltipToDisplay = createTooltip("Sort enchants...",
+						NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting,
+						"By Cost", "Alphabetically"
+					);
+					break;
+				case 3:
+					Gui.drawRect(
+						guiLeft + 295 + 18,
+						guiTop + 147 + 18,
+						guiLeft + 295 + 16 + 18,
+						guiTop + 147 + 16 + 18,
+						0x80ffffff
+					);
+					tooltipToDisplay = createTooltip("Order enchants...",
+						NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering,
+						"Ascending", "Descending"
+					);
+					break;
+			}
+		}
+		return tooltipToDisplay;
+	}
+
+	private void renderScrollBars(List applicable, List removable, int mouseY) {
+		//Left scroll bar
+		{
+			int offset;
+			if (applicable.size() <= 6) {
+				offset = 0;
+			} else if (isScrollingLeft && clickedScrollOffset >= 0) {
+				offset = mouseY - clickedScrollOffset;
+				if (offset < 0) offset = 0;
+				if (offset > 96 - 15) offset = 96 - 15;
+			} else {
+				offset = Math.round((96 - 15) * (leftScroll.getValue() / (float) ((applicable.size() - 6) * 16)));
+			}
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 104, guiTop + 18 + offset, 12, 15,
+				0, 12 / 512f, 313 / 512f, (313 + 15) / 512f, GL11.GL_NEAREST
+			);
+		}
+		//Right scroll bar
+		{
+			int offset;
+			if (removable.size() <= 6) {
+				offset = 0;
+			} else if (!isScrollingLeft && clickedScrollOffset >= 0) {
+				offset = mouseY - clickedScrollOffset;
+				if (offset < 0) offset = 0;
+				if (offset > 96 - 15) offset = 96 - 15;
+			} else {
+				offset = Math.round((96 - 15) * (rightScroll.getValue() / (float) ((removable.size() - 6) * 16)));
+			}
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + 344, guiTop + 18 + offset, 12, 15,
+				0, 12 / 512f, 313 / 512f, (313 + 15) / 512f, GL11.GL_NEAREST
+			);
+		}
+	}
+
+	private void renderArrow() {
+		//Enchant arrow
+		if (arrowAmount.getValue() > 0) {
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			float w = 22 * arrowAmount.getValue();
+			if (removingEnchantPlayerLevel < 0) {
+				Utils.drawTexturedRect(guiLeft + 134, guiTop + 58, w, 16,
+					0, w / 512f, 297 / 512f, (297 + 16) / 512f, GL11.GL_NEAREST
+				);
+			} else {
+				Utils.drawTexturedRect(guiLeft + 230 - w, guiTop + 58, w, 16,
+					(44 - w) / 512f, 44 / 512f, 297 / 512f, (297 + 16) / 512f, GL11.GL_NEAREST
+				);
+			}
+		}
+	}
+
+	private void renderCancel() {
+		int top = guiTop + 83;
+		//Cancel button
+		if (System.currentTimeMillis() - cancelButtonAnimTime < 500) {
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+				0, 48 / 512f, 342 / 512f, (342 + 14) / 512f, GL11.GL_NEAREST
+			);
+			Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2 + 1 + 25, top + 18 + 9, false, 0xa04040
+			);
+		} else {
+			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+			GlStateManager.color(1, 1, 1, 1);
+			Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+				0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+			);
+			Utils.drawStringCentered("Cancel", Minecraft.getMinecraft().fontRendererObj,
+				guiLeft + X_SIZE / 2 + 1 + 24, top + 18 + 8, false, 0xa04040
+			);
+		}
+	}
+
+	private void renderOrbAnim(float partialTicks) {
+		//Orb animation
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(guiLeft, guiTop, 0);
+		orbDisplay.renderOrbs(partialTicks);
+		GlStateManager.popMatrix();
+	}
+
+	private void renderMouseStack(
+		ItemStack stackOnMouse, boolean disallowClick,
+		int mouseX, int mouseY, int width, int height,
+		List<String> tooltipToDisplay
+	) {
+		if (stackOnMouse != null) {
+			if (disallowClick) {
+				Utils.drawItemStack(new ItemStack(Item.getItemFromBlock(Blocks.barrier)), mouseX - 8, mouseY - 8);
+			} else {
+				Utils.drawItemStack(stackOnMouse, mouseX - 8, mouseY - 8);
+			}
+		} else if (tooltipToDisplay != null) {
+			Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1,
+				Minecraft.getMinecraft().fontRendererObj
+			);
+		}
+	}
+
+	private void renderEnchantBook(ScaledResolution scaledresolution, float partialTicks) {
+		GlStateManager.enableDepth();
+
+		GlStateManager.pushMatrix();
+		GlStateManager.matrixMode(5889);
+		GlStateManager.pushMatrix();
+		GlStateManager.loadIdentity();
+		GlStateManager.viewport((scaledresolution.getScaledWidth() - 320) / 2 * scaledresolution.getScaleFactor(),
+			(scaledresolution.getScaledHeight() - 240) / 2 * scaledresolution.getScaleFactor(),
+			320 * scaledresolution.getScaleFactor(), 240 * scaledresolution.getScaleFactor()
+		);
+		GlStateManager.translate(0.0F, 0.33F, 0.0F);
+		Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
+		GlStateManager.matrixMode(5888);
+		GlStateManager.loadIdentity();
+		RenderHelper.enableStandardItemLighting();
+		GlStateManager.translate(0.0F, 3.3F, -16.0F);
+		GlStateManager.scale(5, 5, 5);
+		GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(ENCHANTMENT_TABLE_BOOK_TEXTURE);
+		GlStateManager.rotate(20.0F, 1.0F, 0.0F, 0.0F);
+		float bookOpenAngle = this.bookOpenLast + (this.bookOpen - this.bookOpenLast) * partialTicks;
+		GlStateManager.translate(
+			(1.0F - bookOpenAngle) * 0.2F,
+			(1.0F - bookOpenAngle) * 0.1F,
+			(1.0F - bookOpenAngle) * 0.25F
+		);
+		GlStateManager.rotate(-(1.0F - bookOpenAngle) * 90.0F - 90.0F, 0.0F, 1.0F, 0.0F);
+		GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
+		float pageAngle1 = this.pageOpenLast + (this.pageOpen - this.pageOpenLast) * partialTicks + 0.25F;
+		float pageAngle2 = this.pageOpenLast + (this.pageOpen - this.pageOpenLast) * partialTicks + 0.75F;
+		pageAngle1 = (pageAngle1 - (float) MathHelper.truncateDoubleToInt(pageAngle1)) * 1.6F - 0.3F;
+		pageAngle2 = (pageAngle2 - (float) MathHelper.truncateDoubleToInt(pageAngle2)) * 1.6F - 0.3F;
+
+		if (pageAngle1 < 0.0F) pageAngle1 = 0.0F;
+		if (pageAngle1 > 1.0F) pageAngle1 = 1.0F;
+		if (pageAngle2 < 0.0F) pageAngle2 = 0.0F;
+		if (pageAngle2 > 1.0F) pageAngle2 = 1.0F;
+
+		GlStateManager.enableRescaleNormal();
+		MODEL_BOOK.render(null, 0.0F, pageAngle1, pageAngle2, bookOpenAngle, 0.0F, 0.0625F);
+		GlStateManager.disableRescaleNormal();
+		RenderHelper.disableStandardItemLighting();
+		GlStateManager.matrixMode(5889);
+		GlStateManager.viewport(0, 0, Minecraft.getMinecraft().displayWidth, Minecraft.getMinecraft().displayHeight);
+		GlStateManager.popMatrix();
+		GlStateManager.matrixMode(5888);
+		GlStateManager.popMatrix();
+		RenderHelper.disableStandardItemLighting();
+		GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+
+		GlStateManager.enableDepth();
+	}
+
+	private boolean isInEnchanting() {
+		return currentState == EnchantState.ADDING_ENCHANT || currentState == EnchantState.HAS_ITEM ||
+			currentState == EnchantState.SWITCHING_DONT_UPDATE;
+	}
+
+	private boolean isInHex() {
+		return currentState == EnchantState.HAS_ITEM_IN_HEX || currentState == EnchantState.INVALID_ITEM_HEX ||
+			currentState == EnchantState.NO_ITEM_IN_HEX;
+	}
+
+	private boolean isInGemstones() {
+		return currentState == EnchantState.HAS_ITEM_IN_GEMSTONE || currentState == EnchantState.ADDING_GEMSTONE ||
+			currentState == EnchantState.APPLYING_GEMSTONE;
+	}
+
+	public void overrideIsMouseOverSlot(Slot slot, int mouseX, int mouseY, CallbackInfoReturnable<Boolean> cir) {
+		if ((shouldOverrideFast || shouldOverrideGemstones || shouldOverrideXp) && currentState != EnchantState.ADDING_ENCHANT) {
+			boolean playerInv = slot.inventory == Minecraft.getMinecraft().thePlayer.inventory;
+			int slotId = slot.getSlotIndex();
+			if (playerInv && slotId < 36) {
+				slotId -= 9;
+				if (slotId < 0) slotId += 36;
+
+				int itemX = guiLeft + 102 + 18 * (slotId % 9);
+				int itemY = guiTop + 133 + 18 * (slotId / 9);
+
+				if (slotId >= 27) {
+					itemY += 4;
+				}
+
+				if (mouseX >= itemX && mouseX < itemX + 18 &&
+					mouseY >= itemY && mouseY < itemY + 18) {
+					cir.setReturnValue(true);
+				} else {
+					cir.setReturnValue(false);
+				}
+			} else if ((slotId == 19 && !isInHex()) || (slotId == 22 && isInHex())) {
+				cir.setReturnValue(mouseX >= guiLeft + 173 && mouseX < guiLeft + 173 + 18 &&
+					mouseY >= guiTop + 57 && mouseY < guiTop + 57 + 18);
+			}
+		}
+	}
+
+	public boolean mouseInput(int mouseX, int mouseY) {
+		if (Mouse.getEventButtonState() &&
+			(currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT ||
+				currentState == EnchantState.HAS_ITEM_IN_HEX || currentState == EnchantState.ADDING_BOOK ||
+				currentState == EnchantState.ADDING_GEMSTONE || currentState == EnchantState.APPLYING_GEMSTONE)) {
+			if (mouseY > guiTop + 6 && mouseY < guiTop + 6 + 15) {
+				String pageStr = "Page: " + currentPage + "/" + expectedMaxPage;
+				int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
+
+				int click = -1;
+				if (mouseX > guiLeft + X_SIZE / 2 - pageStrLen / 2 - 2 - 15 &&
+					mouseX <= guiLeft + X_SIZE / 2 - pageStrLen / 2 - 2) {
+					click = 17;
+				} else if (mouseX > guiLeft + X_SIZE / 2 + pageStrLen / 2 + 2 &&
+					mouseX <= guiLeft + X_SIZE / 2 + pageStrLen / 2 + 2 + 15) {
+					click = 35;
+				}
+
+				if (click >= 0) {
+					if (currentState == EnchantState.ADDING_ENCHANT || currentState == EnchantState.ADDING_BOOK) {
+						if (Mouse.getEventButtonState()) {
+							if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+							GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+							EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+							short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+							ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+							Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+								chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+							cancelButtonAnimTime = System.currentTimeMillis();
+						}
+					} else {
+						if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+						GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+						EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+						short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(click);
+						Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+							chest.inventorySlots.windowId, click, 0, 0, stack, transactionID));
+					}
+					return true;
+				}
+			}
+		}
+
+		// Cancel button
+		if (currentState == EnchantState.HAS_ITEM ||
+			currentState == EnchantState.HAS_ITEM_IN_BOOKS || currentState == EnchantState.HAS_ITEM_IN_GEMSTONE) {
+			if (Mouse.getEventButtonState()) {
+				int top = guiTop + 83;
+
+				if (!isChangingEnchLevel && mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48 &&
+					mouseY > top + 18 && mouseY <= top + 18 + 14) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					leftScroll.setValue(0);
+					rightScroll.setValue(0);
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					if (currentState != EnchantState.ADDING_BOOK) {
+						EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+						short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+						Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+							chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+						if (isInGemstones()) {
+							currentState = EnchantState.HAS_ITEM_IN_GEMSTONE;
+						}
+					} else {
+						currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+					}
+					searchField.setText("");
+					cancelButtonAnimTime = System.currentTimeMillis();
+					enchanterCurrentItem = null;
+				}
+
+				if (mouseX > guiLeft + X_SIZE / 2 - searchField.getWidth() / 2 &&
+					mouseX < guiLeft + X_SIZE / 2 + searchField.getWidth() / 2 &&
+					mouseY > guiTop + 80 && mouseY < guiTop + 96) {
+					searchField.mouseClicked(mouseX, mouseY, Mouse.getEventButton());
+				} else {
+					searchField.setFocus(false);
+				}
+			} else if (Mouse.getEventButton() < 0 && searchField.getFocus() && Mouse.isButtonDown(0)) {
+				searchField.mouseClickMove(mouseX, mouseY, 0, 0);
+			}
+		} else if (currentState == EnchantState.ADDING_ENCHANT && !enchanterEnchLevels.isEmpty()) {
+			if (Mouse.getEventButtonState()) {
+				int left = guiLeft + X_SIZE / 2 - 56;
+				int top = guiTop + 83;
+
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+
+				if (!isChangingEnchLevel && mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48 &&
+					mouseY > top + 18 && mouseY <= top + 18 + 14) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+					cancelButtonAnimTime = System.currentTimeMillis();
+				} else if (!isChangingEnchLevel && enchanterCurrentEnch != null &&
+					(mouseX > left + 16 && mouseX <= left + 96 &&
+						mouseY > top && mouseY <= top + 16) ||
+					(mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1 &&
+						mouseY > top + 18 && mouseY <= top + 18 + 14)) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(
+						enchanterCurrentEnch.slotIndex);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId,
+						enchanterCurrentEnch.slotIndex, 0, 0, stack, transactionID
+					));
+
+					int playerXpLevel = Minecraft.getMinecraft().thePlayer.experienceLevel;
+					if (playerXpLevel >= enchanterCurrentEnch.xpCost) {
+						if (removingEnchantPlayerLevel >= 0 && enchanterCurrentEnch.level == removingEnchantPlayerLevel) {
+							orbDisplay.spawnExperienceOrbs(X_SIZE / 2, 66, X_SIZE / 2, 36, 3);
+						} else {
+							orbDisplay.spawnExperienceOrbs(mouseX - guiLeft, mouseY - guiTop, X_SIZE / 2, 66, 0);
+						}
+					}
+
+					confirmButtonAnimTime = System.currentTimeMillis();
+				} else if (mouseX > left + 96 && mouseX <= left + 96 + 16) {
+					if (!isChangingEnchLevel) {
+						if (mouseY > top && mouseY < top + 16) {
+							isChangingEnchLevel = true;
+							return true;
+						}
+					} else {
+						List<Enchantment> before = new ArrayList<>();
+						List<Enchantment> after = new ArrayList<>();
+
+						for (Enchantment ench : enchanterEnchLevels.values()) {
+							if (ench.level < enchanterCurrentEnch.level) {
+								before.add(ench);
+							} else if (ench.level > enchanterCurrentEnch.level) {
+								after.add(ench);
+							}
+						}
+
+						before.sort(Comparator.comparingInt(o -> -o.level));
+						after.sort(Comparator.comparingInt(o -> o.level));
+
+						int bSize = before.size();
+						int aSize = after.size();
+						for (int i = 0; i < bSize + aSize; i++) {
+							Enchantment ench;
+							int yIndex;
+							if (i < bSize) {
+								yIndex = -i - 1;
+								ench = before.get(i);
+							} else {
+								yIndex = i - bSize + 1;
+								ench = after.get(i - bSize);
+							}
+
+							if (mouseY > top + 16 * yIndex && mouseY <= top + 16 * yIndex + 16) {
+								enchanterCurrentEnch = ench;
+								isChangingEnchLevel = false;
+								return true;
+							}
+						}
+					}
+				}
+
+				if (isChangingEnchLevel) {
+					isChangingEnchLevel = false;
+					return true;
+				}
+			}
+		} else if (currentState == EnchantState.ADDING_BOOK) {
+			if (Mouse.getEventButtonState()) {
+				int left = guiLeft + X_SIZE / 2 - 56;
+				int top = guiTop + 83;
+
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+
+				if (!isChangingEnchLevel && mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48 &&
+					mouseY > top + 18 && mouseY <= top + 18 + 14) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					/*GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));*/
+
+					cancelButtonAnimTime = System.currentTimeMillis();
+					currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+					enchanterCurrentItem = null;
+				} else if (!isChangingEnchLevel && enchanterCurrentItem != null &&
+					(mouseX > left + 16 && mouseX <= left + 96 &&
+						mouseY > top && mouseY <= top + 16) ||
+					(mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1 &&
+						mouseY > top + 18 && mouseY <= top + 18 + 14)) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(
+						enchanterCurrentItem.slotIndex);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId,
+						enchanterCurrentItem.slotIndex, 0, 0, stack, transactionID
+					));
+
+					if (removingEnchantPlayerLevel >= 0 && enchanterCurrentItem.level == removingEnchantPlayerLevel) {
+						orbDisplay.spawnExperienceOrbs(X_SIZE / 2, 66, X_SIZE / 2, 36, 3);
+					} else {
+						orbDisplay.spawnExperienceOrbs(mouseX - guiLeft, mouseY - guiTop, X_SIZE / 2, 66, 0);
+					}
+
+					confirmButtonAnimTime = System.currentTimeMillis();
+					enchanterCurrentItem = null;
+					currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+				} else if (mouseX > left + 96 && mouseX <= left + 96 + 16) {
+					if (!isChangingEnchLevel) {
+						if (mouseY > top && mouseY < top + 16) {
+							isChangingEnchLevel = true;
+							return true;
+						}
+					} else {
+						List<HexItem> before = new ArrayList<>();
+						List<HexItem> after = new ArrayList<>();
+
+						for (HexItem item : enchanterItemLevels.values()) {
+							if (item.level < enchanterCurrentItem.level) {
+								before.add(item);
+							} else if (item.level > enchanterCurrentItem.level) {
+								after.add(item);
+							}
+						}
+
+						before.sort(Comparator.comparingInt(o -> -o.level));
+						after.sort(Comparator.comparingInt(o -> o.level));
+
+						int bSize = before.size();
+						int aSize = after.size();
+						for (int i = 0; i < bSize + aSize; i++) {
+							HexItem item;
+							int yIndex;
+							if (i < bSize) {
+								yIndex = -i - 1;
+								item = before.get(i);
+							} else {
+								yIndex = i - bSize + 1;
+								item = after.get(i - bSize);
+							}
+
+							if (mouseY > top + 16 * yIndex && mouseY <= top + 16 * yIndex + 16) {
+								enchanterCurrentItem = item;
+								isChangingEnchLevel = false;
+								return true;
+							}
+						}
+					}
+				}
+
+				if (isChangingEnchLevel) {
+					isChangingEnchLevel = false;
+					return true;
+				}
+			}
+		} else if (currentState == EnchantState.HAS_ITEM_IN_HEX) {
+			if (Mouse.getEventButtonState()) {
+				int left = guiLeft + X_SIZE / 2 - 56;
+				int top = guiTop + 83;
+
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+
+				if (!isChangingEnchLevel && mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48 &&
+					mouseY > top + 18 && mouseY <= top + 18 + 14) {
+					/*if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+					cancelButtonAnimTime = System.currentTimeMillis();
+					currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+					enchanterCurrentItem = null;*/
+				} else if (!isChangingEnchLevel && enchanterCurrentItem != null &&
+					(mouseX > left + 16 && mouseX <= left + 96 &&
+						mouseY > top && mouseY <= top + 16) ||
+					(mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1 &&
+						mouseY > top + 18 && mouseY <= top + 18 + 14)) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(
+						enchanterCurrentItem.slotIndex);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId,
+						enchanterCurrentItem.slotIndex, 0, 0, stack, transactionID
+					));
+					enchantingItem = null;
+					if (removingEnchantPlayerLevel >= 0 && enchanterCurrentItem.level == removingEnchantPlayerLevel) {
+						orbDisplay.spawnExperienceOrbs(X_SIZE / 2, 66, X_SIZE / 2, 36, 3);
+					} else {
+						orbDisplay.spawnExperienceOrbs(mouseX - guiLeft, mouseY - guiTop, X_SIZE / 2, 66, 0);
+					}
+
+					confirmButtonAnimTime = System.currentTimeMillis();
+					//enchanterCurrentItem = null;
+					//currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+				} else if (mouseX > left + 96 && mouseX <= left + 96 + 16) {
+					if (!isChangingEnchLevel) {
+						if (mouseY > top && mouseY < top + 16) {
+							isChangingEnchLevel = true;
+							return true;
+						}
+					} else {
+						List<HexItem> before = new ArrayList<>();
+						List<HexItem> after = new ArrayList<>();
+
+						for (HexItem item : enchanterItemLevels.values()) {
+							if (item.level < enchanterCurrentItem.level) {
+								before.add(item);
+							} else if (item.level > enchanterCurrentItem.level) {
+								after.add(item);
+							}
+						}
+
+						before.sort(Comparator.comparingInt(o -> -o.level));
+						after.sort(Comparator.comparingInt(o -> o.level));
+
+						int bSize = before.size();
+						int aSize = after.size();
+						for (int i = 0; i < bSize + aSize; i++) {
+							HexItem item;
+							int yIndex;
+							if (i < bSize) {
+								yIndex = -i - 1;
+								item = before.get(i);
+							} else {
+								yIndex = i - bSize + 1;
+								item = after.get(i - bSize);
+							}
+
+							if (mouseY > top + 16 * yIndex && mouseY <= top + 16 * yIndex + 16) {
+								enchanterCurrentItem = item;
+								isChangingEnchLevel = false;
+								return true;
+							}
+						}
+					}
+				}
+
+				if (isChangingEnchLevel) {
+					isChangingEnchLevel = false;
+					return true;
+				}
+			}
+		} else if (currentState == EnchantState.ADDING_GEMSTONE || currentState == EnchantState.APPLYING_GEMSTONE) {
+			if (Mouse.getEventButtonState()) {
+				int left = guiLeft + X_SIZE / 2 - 56;
+				int top = guiTop + 83;
+
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 - 1 - 48, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+				Utils.drawTexturedRect(guiLeft + X_SIZE / 2 + 1, top + 18, 48, 14,
+					0, 48 / 512f, 328 / 512f, (328 + 14) / 512f, GL11.GL_NEAREST
+				);
+
+				if (!isChangingEnchLevel && mouseX > guiLeft + X_SIZE / 2 + 1 && mouseX <= guiLeft + X_SIZE / 2 + 1 + 48 &&
+					mouseY > top + 18 && mouseY <= top + 18 + 14) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					if (currentState != EnchantState.APPLYING_GEMSTONE) {
+						EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+						short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+						Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+							chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+						cancelButtonAnimTime = System.currentTimeMillis();
+						currentState = EnchantState.HAS_ITEM_IN_GEMSTONE;
+						enchanterCurrentItem = null;
+					} else {
+						currentState = EnchantState.ADDING_ENCHANT;
+						enchanterCurrentItem = null;
+					}
+				} else if (!isChangingEnchLevel && enchanterCurrentItem != null &&
+					(mouseX > left + 16 && mouseX <= left + 96 &&
+						mouseY > top && mouseY <= top + 16) ||
+					(mouseX > guiLeft + X_SIZE / 2 - 1 - 48 && mouseX <= guiLeft + X_SIZE / 2 - 1 &&
+						mouseY > top + 18 && mouseY <= top + 18 + 14) && currentState == EnchantState.APPLYING_GEMSTONE) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(
+						enchanterCurrentItem.slotIndex);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId,
+						enchanterCurrentItem.slotIndex, 0, 0, stack, transactionID
+					));
+					enchantingItem = null;
+					if (removingEnchantPlayerLevel >= 0 && enchanterCurrentItem.level == removingEnchantPlayerLevel) {
+						orbDisplay.spawnExperienceOrbs(X_SIZE / 2, 66, X_SIZE / 2, 36, 3);
+					} else {
+						orbDisplay.spawnExperienceOrbs(mouseX - guiLeft, mouseY - guiTop, X_SIZE / 2, 66, 0);
+					}
+
+					confirmButtonAnimTime = System.currentTimeMillis();
+					enchanterCurrentItem = null;
+					currentState = EnchantState.ADDING_GEMSTONE;
+				} else if (mouseX > left + 96 && mouseX <= left + 96 + 16) {
+					if (!isChangingEnchLevel) {
+						if (mouseY > top && mouseY < top + 16) {
+							isChangingEnchLevel = true;
+							return true;
+						}
+					} else {
+						List<HexItem> before = new ArrayList<>();
+						List<HexItem> after = new ArrayList<>();
+
+						for (HexItem item : enchanterItemLevels.values()) {
+							if (item.level < enchanterCurrentItem.level) {
+								before.add(item);
+							} else if (item.level > enchanterCurrentItem.level) {
+								after.add(item);
+							}
+						}
+
+						before.sort(Comparator.comparingInt(o -> -o.level));
+						after.sort(Comparator.comparingInt(o -> o.level));
+
+						int bSize = before.size();
+						int aSize = after.size();
+						for (int i = 0; i < bSize + aSize; i++) {
+							HexItem item;
+							int yIndex;
+							if (i < bSize) {
+								yIndex = -i - 1;
+								item = before.get(i);
+							} else {
+								yIndex = i - bSize + 1;
+								item = after.get(i - bSize);
+							}
+
+							if (mouseY > top + 16 * yIndex && mouseY <= top + 16 * yIndex + 16) {
+								enchanterCurrentItem = item;
+								isChangingEnchLevel = false;
+								return true;
+							}
+						}
+					}
+				}
+
+				if (isChangingEnchLevel) {
+					isChangingEnchLevel = false;
+					return true;
+				}
+			}
+		}
+
+		if (!Mouse.getEventButtonState() && Mouse.getEventButton() < 0 && clickedScrollOffset != -1) {
+			if (isInEnchanting()) {
+				LerpingInteger lerpingInteger = isClickedScrollLeft ? leftScroll : rightScroll;
+				List<Enchantment> enchantsList = isClickedScrollLeft ? applicable : removable;
+
+				if (enchantsList.size() > 6) {
+					int newOffset = mouseY - clickedScrollOffset;
+
+					int newScroll = Math.round(newOffset * (float) ((enchantsList.size() - 6) * 16) / (96 - 15));
+					int max = (enchantsList.size() - 6) * 16;
+
+					if (newScroll > max) newScroll = max;
+					if (newScroll < 0) newScroll = 0;
+
+					lerpingInteger.setValue(newScroll);
+				}
+			} else {
+				LerpingInteger lerpingInteger = isClickedScrollLeft ? leftScroll : rightScroll;
+				List<HexItem> itemsList = isClickedScrollLeft ? applicableItem : removableItem;
+
+				if (itemsList.size() > 6) {
+					int newOffset = mouseY - clickedScrollOffset;
+
+					int newScroll = Math.round(newOffset * (float) ((itemsList.size() - 6) * 16) / (96 - 15));
+					int max = (itemsList.size() - 6) * 16;
+
+					if (newScroll > max) newScroll = max;
+					if (newScroll < 0) newScroll = 0;
+
+					lerpingInteger.setValue(newScroll);
+				}
+			}
+		}
+
+		//Config options
+		if (Mouse.getEventButtonState()) {
+			if (mouseX >= guiLeft + 294 && mouseX < guiLeft + 294 + 36 &&
+				mouseY >= guiTop + 146 && mouseY < guiTop + 146 + 36) {
+				int index = (mouseX - (guiLeft + 295)) / 18 + (mouseY - (guiTop + 147)) / 18 * 2;
+
+				int direction = Mouse.getEventButton() == 0 ? 1 : -1;
+
+				switch (index) {
+					case 0: {
+						NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI = false;
+						break;
+					}
+					case 2: {
+						int val = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting;
+						val += direction;
+						if (val < 0) val = 1;
+						if (val > 1) val = 0;
+						NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting = val;
+						break;
+					}
+					case 3: {
+						int val = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering;
+						val += direction;
+						if (val < 0) val = 1;
+						if (val > 1) val = 0;
+						NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering = val;
+						break;
+					}
+				}
+			}
+		}
+
+		if (Mouse.getEventButton() == 0) {
+			if (Mouse.getEventButtonState()) {
+				if (isInEnchanting()) {
+					if (mouseX > guiLeft + 104 && mouseX < guiLeft + 104 + 12) {
+						int offset;
+						if (applicable.size() <= 6) {
+							offset = 0;
+						} else {
+							offset = Math.round((96 - 15) * (leftScroll.getValue() / (float) ((applicable.size() - 6) * 16)));
+						}
+						if (mouseY >= guiTop + 18 + offset && mouseY < guiTop + 18 + offset + 15) {
+							isClickedScrollLeft = true;
+							clickedScrollOffset = mouseY - offset;
+						}
+					} else if (mouseX > guiLeft + 344 && mouseX < guiLeft + 344 + 12) {
+						int offset;
+						if (removable.size() <= 6) {
+							offset = 0;
+						} else {
+							offset = Math.round((96 - 15) * (rightScroll.getValue() / (float) ((removable.size() - 6) * 16)));
+						}
+						if (mouseY >= guiTop + 18 + offset && mouseY < guiTop + 18 + offset + 15) {
+							isClickedScrollLeft = false;
+							clickedScrollOffset = mouseY - offset;
+						}
+					}
+				} else {
+					if (mouseX > guiLeft + 104 && mouseX < guiLeft + 104 + 12) {
+						int offset;
+						if (applicableItem.size() <= 6) {
+							offset = 0;
+						} else {
+							offset = Math.round((96 - 15) * (leftScroll.getValue() / (float) ((applicableItem.size() - 6) * 16)));
+						}
+						if (mouseY >= guiTop + 18 + offset && mouseY < guiTop + 18 + offset + 15) {
+							isClickedScrollLeft = true;
+							clickedScrollOffset = mouseY - offset;
+						}
+					} else if (mouseX > guiLeft + 344 && mouseX < guiLeft + 344 + 12) {
+						int offset;
+						if (removableItem.size() <= 6) {
+							offset = 0;
+						} else {
+							offset = Math.round((96 - 15) * (rightScroll.getValue() / (float) ((removableItem.size() - 6) * 16)));
+						}
+						if (mouseY >= guiTop + 18 + offset && mouseY < guiTop + 18 + offset + 15) {
+							isClickedScrollLeft = false;
+							clickedScrollOffset = mouseY - offset;
+						}
+					}
+				}
+			} else {
+				clickedScrollOffset = -1;
+			}
+		}
+
+		if (mouseY > guiTop + 18 && mouseY < guiTop + 18 + 96) {
+			if (mouseX > guiLeft + 8 && mouseX < guiLeft + 8 + 96) {
+				if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() &&
+					Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
+					if (isInEnchanting()) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + leftScroll.getValue() / 16;
+							if (applicable.size() <= index) break;
+
+							int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								Enchantment ench = applicable.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.HAS_ITEM) {
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(ench.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										ench.slotIndex, 0, 0, stack, transactionID
+									));
+								} else if (currentState == EnchantState.ADDING_ENCHANT) {
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								}
+
+								return true;
+							}
+						}
+					} else if (!isInHex() && !isInGemstones()) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + leftScroll.getValue() / 16;
+							if (applicableItem.size() <= index) break;
+
+							int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = applicableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.HAS_ITEM_IN_BOOKS) {
+									currentState = EnchantState.ADDING_BOOK;
+									enchanterCurrentItem = item;
+								} else if (currentState == EnchantState.ADDING_BOOK && enchanterCurrentItem == item) {
+									currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										item.slotIndex, 0, 0, stack, transactionID
+									));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								} else {
+									currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+									enchanterCurrentItem = null;
+								}
+
+								return true;
+							}
+						}
+					} else if (isInHex() && !isInGemstones()) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + leftScroll.getValue() / 16;
+							if (applicableItem.size() <= index) break;
+
+							int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = applicableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+								EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+								short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+								ItemStack stack =
+									((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+								Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+									chest.inventorySlots.windowId,
+									item.slotIndex, 0, 0, stack, transactionID
+								));
+
+								//cancelButtonAnimTime = System.currentTimeMillis();
+
+								return true;
+							}
+						}
+					} else if (currentState == EnchantState.ADDING_GEMSTONE || currentState == EnchantState.APPLYING_GEMSTONE) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + leftScroll.getValue() / 16;
+							if (applicableItem.size() <= index) break;
+
+							int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = applicableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.ADDING_GEMSTONE) {
+									currentState = EnchantState.APPLYING_GEMSTONE;
+									enchanterCurrentItem = item;
+								} else if (currentState == EnchantState.APPLYING_GEMSTONE && enchanterCurrentItem == item) {
+									currentState = EnchantState.ADDING_GEMSTONE;
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										item.slotIndex, 0, 0, stack, transactionID
+									));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								} else {
+									currentState = EnchantState.ADDING_GEMSTONE;
+									enchanterCurrentItem = null;
+								}
+
+								//cancelButtonAnimTime = System.currentTimeMillis();
+
+								return true;
+							}
+						}
+					} else if (currentState == EnchantState.HAS_ITEM_IN_GEMSTONE) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + leftScroll.getValue() / 16;
+							if (applicableItem.size() <= index) break;
+
+							int top = guiTop - (leftScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 8 && mouseX <= guiLeft + 8 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = applicableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+								short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+								ItemStack stack =
+									((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+								Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+									chest.inventorySlots.windowId,
+									item.slotIndex, 0, 0, stack, transactionID
+								));
+
+								cancelButtonAnimTime = System.currentTimeMillis();
+
+								//cancelButtonAnimTime = System.currentTimeMillis();
+
+								return true;
+							}
+						}
+					}
+				}
+
+				isScrollingLeft = true;
+			} else if (mouseX > guiLeft + 248 && mouseX < guiLeft + 248 + 96) {
+				if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() &&
+					Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
+					if (isInEnchanting()) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + rightScroll.getValue() / 16;
+							if (removable.size() <= index) break;
+
+							int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								Enchantment ench = removable.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.HAS_ITEM || currentState == EnchantState.HAS_ITEM_IN_HEX) {
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(ench.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										ench.slotIndex, 0, 0, stack, transactionID
+									));
+								} else if (currentState == EnchantState.ADDING_ENCHANT) {
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								}
+
+								return true;
+							}
+						}
+					} else if (currentState == EnchantState.ADDING_GEMSTONE) {
+						for (int i = 0; i < 7; i++) {
+							int index = i + rightScroll.getValue() / 16;
+							if (removableItem.size() <= index) break;
+
+							int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = removableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.ADDING_GEMSTONE) {
+									currentState = EnchantState.APPLYING_GEMSTONE;
+									enchanterCurrentItem = item;
+								} else if (currentState == EnchantState.APPLYING_GEMSTONE && enchanterCurrentItem == item) {
+									currentState = EnchantState.ADDING_GEMSTONE;
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										item.slotIndex, 0, 0, stack, transactionID
+									));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								} else {
+									currentState = EnchantState.ADDING_GEMSTONE;
+									enchanterCurrentItem = null;
+								}
+
+								return true;
+							}
+						}
+
+					} else {
+						for (int i = 0; i < 7; i++) {
+							int index = i + rightScroll.getValue() / 16;
+							if (removableItem.size() <= index) break;
+
+							int top = guiTop - (rightScroll.getValue() % 16) + 18 + 16 * i;
+							if (mouseX > guiLeft + 248 && mouseX <= guiLeft + 248 + 96 &&
+								mouseY > top && mouseY <= top + 16) {
+								HexItem item = removableItem.get(index);
+
+								if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+								GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+								if (currentState == EnchantState.HAS_ITEM_IN_BOOKS) {
+									currentState = EnchantState.ADDING_BOOK;
+									enchanterCurrentItem = item;
+								} else if (currentState == EnchantState.ADDING_BOOK && enchanterCurrentItem == item) {
+									currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+									EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+									short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+									ItemStack stack =
+										((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(item.slotIndex);
+									Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+										chest.inventorySlots.windowId,
+										item.slotIndex, 0, 0, stack, transactionID
+									));
+
+									cancelButtonAnimTime = System.currentTimeMillis();
+								} else {
+									currentState = EnchantState.HAS_ITEM_IN_BOOKS;
+									enchanterCurrentItem = null;
+								}
+
+								return true;
+							}
+						}
+					}
+				}
+				isScrollingLeft = false;
+			}
+		}
+		if (Mouse.getEventDWheel() != 0) {
+			int scroll = Mouse.getEventDWheel();
+			if (scroll > 0) {
+				scroll = -16;
+			} else {
+				scroll = 16;
+			}
+
+			LerpingInteger lerpingInteger = isScrollingLeft ? leftScroll : rightScroll;
+			int elementsCount;
+			if (isInEnchanting()) {
+				elementsCount = isScrollingLeft ? applicable.size() : removable.size();
+			} else {
+				elementsCount = isScrollingLeft ? applicableItem.size() : removableItem.size();
+			}
+			int max = (elementsCount - 6) * 16;
+
+			int newTarget = lerpingInteger.getTarget() + scroll;
+			if (newTarget > max) newTarget = max;
+			if (newTarget < 0) newTarget = 0;
+
+			if (newTarget != lerpingInteger.getTarget()) {
+				lerpingInteger.resetTimer();
+				lerpingInteger.setTarget(newTarget);
+			}
+		}
+
+		if (mouseX > guiLeft + 102 && mouseX < guiLeft + 102 + 160) {
+			if ((mouseY > guiTop + 133 && mouseY < guiTop + 133 + 54) ||
+				(mouseY > guiTop + 133 + 54 + 4 && mouseY < guiTop + 133 + 54 + 4 + 18)) {
+				if (currentState == EnchantState.ADDING_ENCHANT) {
+					if (Mouse.getEventButtonState()) {
+						if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+						GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+						EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+						short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+						ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+						Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+							chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+						cancelButtonAnimTime = System.currentTimeMillis();
+					}
+					return true;
+				} else {
+					return false;
+				}
+			}
+		}
+		if (mouseX >= guiLeft + 173 && mouseX < guiLeft + 173 + 18 &&
+			mouseY >= guiTop + 57 && mouseY < guiTop + 57 + 18) {
+			if (currentState == EnchantState.ADDING_ENCHANT) {
+				if (Mouse.getEventButtonState()) {
+					if (!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return true;
+					GuiContainer chest = ((GuiContainer) Minecraft.getMinecraft().currentScreen);
+
+					EntityPlayerSP playerIn = Minecraft.getMinecraft().thePlayer;
+					short transactionID = playerIn.openContainer.getNextTransactionID(playerIn.inventory);
+					ItemStack stack = ((ContainerChest) chest.inventorySlots).getLowerChestInventory().getStackInSlot(45);
+					Minecraft.getMinecraft().getNetHandler().addToSendQueue(new C0EPacketClickWindow(
+						chest.inventorySlots.windowId, 45, 0, 0, stack, transactionID));
+
+					cancelButtonAnimTime = System.currentTimeMillis();
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public boolean keyboardInput() {
+		if (currentState == EnchantState.HAS_ITEM && searchField.getFocus()) {
+			if (Keyboard.getEventKeyState()) {
+				searchField.keyTyped(Keyboard.getEventCharacter(), Keyboard.getEventKey());
+			}
+			return true;
+		}
+		if (Keyboard.getEventKey() == Minecraft.getMinecraft().gameSettings.keyBindScreenshot.getKeyCode()) {
+			return false;
+		}
+
+		return Keyboard.getEventKey() != Keyboard.KEY_ESCAPE &&
+			Keyboard.getEventKey() != Minecraft.getMinecraft().gameSettings.keyBindInventory.getKeyCode() &&
+			(!NotEnoughUpdates.INSTANCE.config.slotLocking.enableSlotLocking ||
+				Keyboard.getEventKey() != NotEnoughUpdates.INSTANCE.config.slotLocking.slotLockKey);
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
new file mode 100644
index 00000000..5b3b30ea
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/HexItem.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.hex;
+
+import com.google.gson.JsonObject;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.Constants;
+import io.github.moulberry.notenoughupdates.util.Utils;
+import net.minecraft.util.StringUtils;
+
+import java.util.List;
+
+public class HexItem {
+	public int slotIndex;
+	public String itemName;
+	public String itemId;
+	public List<String> displayLore;
+	public int level;
+	public int price = -1;
+	public boolean overMaxLevel = false;
+	public boolean conflicts = false;
+	public ItemType itemType;
+	public int gemstoneLevel = -1;
+
+	public HexItem(
+		int slotIndex, String itemName, String itemId, List<String> displayLore,
+		boolean useMaxLevelForCost, boolean checkConflicts
+	) {
+		this.slotIndex = slotIndex;
+		this.itemName = itemName;
+		this.itemId = itemId.replace("'S", "");
+		this.displayLore = displayLore;
+		switch (itemId) {
+			default:
+				this.itemType = ItemType.UNKNOWN;
+				break;
+			case "HOT_POTATO_BOOK":
+				this.itemType = ItemType.HOT_POTATO;
+				break;
+			case "FUMING_POTATO_BOOK":
+				this.itemType = ItemType.FUMING_POTATO;
+				break;
+			case "BOOK_OF_STATS":
+				this.itemType = ItemType.BOOK_OF_STATS;
+				break;
+			case "THE_ART_OF_WAR":
+				this.itemType = ItemType.ART_OF_WAR;
+				break;
+			case "FARMING_FOR_DUMMIES":
+				this.itemType = ItemType.FARMING_DUMMY;
+				break;
+			case "THE_ART_OF_PEACE":
+				this.itemType = ItemType.ART_OF_PEACE;
+				break;
+			case "RECOMBOBULATOR_3000":
+				this.itemType = ItemType.RECOMB;
+				break;
+			case "SILEX":
+				this.itemId = "SIL_EX";
+				this.itemType = ItemType.SILEX;
+				break;
+			case "RUBY_POWER_SCROLL":
+				this.itemType = ItemType.RUBY_SCROLL;
+				break;
+			case "SAPPHIRE_POWER_SCROLL":
+				this.itemType = ItemType.SAPPHIRE_SCROLL;
+				break;
+			case "JASPER_POWER_SCROLL":
+				this.itemType = ItemType.JASPER_SCROLL;
+				break;
+			case "AMETHYST_POWER_SCROLL":
+				this.itemType = ItemType.AMETHYST_SCROLL;
+				break;
+			case "AMBER_POWER_SCROLL":
+				this.itemType = ItemType.AMBER_SCROLL;
+				break;
+			case "OPAL_POWER_SCROLL":
+				this.itemType = ItemType.OPAL_SCROLL;
+				break;
+			case "FIRST_MASTER_STAR":
+				this.itemType = ItemType.FIRST_MASTER_STAR;
+				break;
+			case "SECOND_MASTER_STAR":
+				this.itemType = ItemType.SECOND_MASTER_STAR;
+				break;
+			case "THIRD_MASTER_STAR":
+				this.itemType = ItemType.THIRD_MASTER_STAR;
+				break;
+			case "FOURTH_MASTER_STAR":
+				this.itemType = ItemType.FOURTH_MASTER_STAR;
+				break;
+			case "FIFTH_MASTER_STAR":
+				this.itemType = ItemType.FIFTH_MASTER_STAR;
+				break;
+			case "WOOD_SINGULARITY":
+				this.itemType = ItemType.WOOD_SINGULARITY;
+				break;
+			case "IMPLOSION":
+				this.itemType = ItemType.IMPLOSION_SCROLL;
+				break;
+			case "WITHER_SHIELD":
+				this.itemType = ItemType.WITHER_SHIELD_SCROLL;
+				break;
+			case "SHADOW_WARP":
+				this.itemType = ItemType.SHADOW_WARP_SCROLL;
+				break;
+			case "TRANSMISSION_TUNER":
+				this.itemType = ItemType.TUNER;
+				break;
+			case "RANDOM_REFORGE":
+				this.itemType = ItemType.RANDOM_REFORGE;
+				break;
+			case "MANA_DISINTEGRATOR":
+				this.itemType = ItemType.MANA_DISINTEGRATOR;
+				break;
+			case "TOTAL_UPGRADES":
+				this.itemType = ItemType.TOTAL_UPGRADES;
+				break;
+			case "CONVERT_TO_DUNGEON":
+				this.itemType = ItemType.CONVERT_TO_DUNGEON;
+				break;
+			case "EXPERIENCE_BOTTLE":
+				this.itemType = ItemType.EXPERIENCE_BOTTLE;
+				break;
+			case "GRAND_EXPERIENCE_BOTTLE":
+				this.itemType = ItemType.GRAND_EXPERIENCE_BOTTLE;
+				break;
+			case "TITANIC_EXPERIENCE_BOTTLE":
+				this.itemType = ItemType.TITANIC_EXPERIENCE_BOTTLE;
+				break;
+			case "COLOSSAL_EXPERIENCE_BOTTLE":
+				this.itemType = ItemType.COLOSSAL_EXPERIENCE_BOTTLE;
+				break;
+		}
+		if (this.itemType == ItemType.UNKNOWN) {
+			for (String string : displayLore) {
+				if ((string.contains("Applies the") && string.contains("reforge")) ||
+					string.contains("reforge when combined")) {
+					this.itemType = ItemType.REFORGE;
+					break;
+				}
+			}
+		}
+		if (!this.isMasterStar() && itemId.contains("✪")) {
+			if (itemId.contains("✪✪✪✪✪")) this.itemType = ItemType.FIFTH_STAR;
+			else if (itemId.contains("✪✪✪✪")) this.itemType = ItemType.FOURTH_STAR;
+			else if (itemId.contains("✪✪✪")) this.itemType = ItemType.THIRD_STAR;
+			else if (itemId.contains("✪✪")) this.itemType = ItemType.SECOND_STAR;
+			else if (itemId.contains("✪")) this.itemType = ItemType.FIRST_STAR;
+		}
+		if (this.itemId.contains("EXPERIENCE_BOTTLE")) {
+			this.itemId = this.itemId.replace("EXPERIENCE_BOTTLE", "EXP_BOTTLE");
+		}
+		if (this.itemId.contains("END_STONE_GEODE")) {
+			this.itemId = this.itemId.replace("END_STONE_GEODE", "ENDSTONE_GEODE");
+		}
+		if (itemId.contains("HEX_ITEM")) this.itemType = ItemType.HEX_ITEM;
+		JsonObject bazaarInfo = NotEnoughUpdates.INSTANCE.manager.auctionManager.getBazaarInfo(this.itemId);
+		if (bazaarInfo != null && bazaarInfo.get("curr_buy") != null) {
+			this.price = bazaarInfo.get("curr_buy").getAsInt();
+		}
+		if ("SIL_EX".equals(this.itemId)) this.itemId = "SILEX";
+		if (itemName.contains("Amethyst Gemstone")) this.itemType = ItemType.AMETHYST_GEMSTONE;
+		if (itemName.contains("Ruby Gemstone")) this.itemType = ItemType.RUBY_GEMSTONE;
+		if (itemName.contains("Sapphire Gemstone")) this.itemType = ItemType.SAPPHIRE_GEMSTONE;
+		if (itemName.contains("Jasper Gemstone")) this.itemType = ItemType.JASPER_GEMSTONE;
+		if (itemName.contains("Jade Gemstone")) this.itemType = ItemType.JADE_GEMSTONE;
+		if (itemName.contains("Amber Gemstone")) this.itemType = ItemType.AMBER_GEMSTONE;
+		if (itemName.contains("Opal Gemstone")) this.itemType = ItemType.OPAL_GEMSTONE;
+		if (itemName.contains("Topaz Gemstone")) this.itemType = ItemType.TOPAZ_GEMSTONE;
+		if (itemName.contains("Gemstone Slot")) this.itemType = ItemType.GEMSTONE_SLOT;
+		if (this.itemName.contains(" Gemstone")) {
+			this.itemName = this.itemName.replace(" Gemstone", "").substring(2);
+		} else if (this.itemName.contains(" Experience Bottle")) {
+			this.itemName = this.itemName.replace("Experience Bottle", "");
+		} else if (this.itemName.equals("Experience Bottle")) {
+			this.itemName = "Exp Bottle";
+		}
+		if (isGemstone()) {
+			if (this.itemName.contains("Rough")) this.gemstoneLevel = 0;
+			if (this.itemName.contains("Flawed")) this.gemstoneLevel = 1;
+			if (this.itemName.contains("Fine")) this.gemstoneLevel = 2;
+			if (this.itemName.contains("Flawless")) this.gemstoneLevel = 3;
+			if (this.itemName.contains("Perfect")) this.gemstoneLevel = 4;
+		}
+	}
+
+	public boolean isPowerScroll() {
+		return itemType == ItemType.RUBY_SCROLL || itemType == ItemType.SAPPHIRE_SCROLL ||
+			itemType == ItemType.JASPER_SCROLL || itemType == ItemType.AMETHYST_SCROLL ||
+			itemType == ItemType.AMBER_SCROLL || itemType == ItemType.OPAL_SCROLL;
+	}
+
+	public boolean isDungeonStar() {
+		return itemType == ItemType.FIRST_STAR || itemType == ItemType.SECOND_STAR ||
+			itemType == ItemType.THIRD_STAR || itemType == ItemType.FOURTH_STAR ||
+			itemType == ItemType.FIFTH_STAR;
+	}
+
+	public boolean isMasterStar() {
+		return itemType == ItemType.FIRST_MASTER_STAR || itemType == ItemType.SECOND_MASTER_STAR ||
+			itemType == ItemType.THIRD_MASTER_STAR || itemType == ItemType.FOURTH_MASTER_STAR ||
+			itemType == ItemType.FIFTH_MASTER_STAR;
+	}
+
+	public String getReforge() {
+		JsonObject reforgeStones = Constants.REFORGESTONES;
+		if (reforgeStones != null && reforgeStones.has(this.itemId.toUpperCase())) {
+			JsonObject reforgeInfo = reforgeStones.get(this.itemId.toUpperCase()).getAsJsonObject();
+			if (reforgeInfo != null) {
+				return Utils.getElementAsString(reforgeInfo.get("reforgeName"), "");
+			}
+
+		}
+		return "";
+	}
+
+	public int getPrice() {
+		if (this.itemType == ItemType.RANDOM_REFORGE) {
+			for (String string : displayLore) {
+				if (string.contains("Coins")) {
+					try {
+						price = Integer.parseInt(StringUtils
+							.stripControlCodes(string)
+							.replace(" Coins", "")
+							.replace(",", "")
+							.trim());
+					} catch (NumberFormatException ignored) {
+					}
+				}
+			}
+		}
+		return price;
+	}
+
+	public boolean isHypeScroll() {
+		return itemType == ItemType.IMPLOSION_SCROLL || itemType == ItemType.WITHER_SHIELD_SCROLL ||
+			itemType == ItemType.SHADOW_WARP_SCROLL;
+	}
+
+	public boolean isGemstone() {
+		return itemType == ItemType.RUBY_GEMSTONE || itemType == ItemType.AMETHYST_GEMSTONE ||
+			itemType == ItemType.SAPPHIRE_GEMSTONE || itemType == ItemType.JASPER_GEMSTONE ||
+			itemType == ItemType.JADE_GEMSTONE || itemType == ItemType.AMBER_GEMSTONE ||
+			itemType == ItemType.OPAL_GEMSTONE || itemType == ItemType.TOPAZ_GEMSTONE;
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/ItemType.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/ItemType.java
new file mode 100644
index 00000000..3b47a86d
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/hex/ItemType.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.hex;
+
+enum ItemType {
+	HOT_POTATO,
+	FUMING_POTATO,
+	BOOK_OF_STATS,
+	ART_OF_WAR,
+	ART_OF_PEACE,
+	FARMING_DUMMY,
+	RECOMB,
+	SILEX,
+	RUBY_SCROLL,
+	SAPPHIRE_SCROLL,
+	JASPER_SCROLL,
+	AMETHYST_SCROLL,
+	AMBER_SCROLL,
+	OPAL_SCROLL,
+	FIRST_STAR(1),
+	SECOND_STAR(2),
+	THIRD_STAR(3),
+	FOURTH_STAR(4),
+	FIFTH_STAR(5),
+	FIRST_MASTER_STAR(6),
+	SECOND_MASTER_STAR(7),
+	THIRD_MASTER_STAR(8),
+	FOURTH_MASTER_STAR(9),
+	FIFTH_MASTER_STAR(10),
+	WOOD_SINGULARITY,
+	IMPLOSION_SCROLL,
+	SHADOW_WARP_SCROLL,
+	WITHER_SHIELD_SCROLL,
+	TUNER,
+	REFORGE,
+	RANDOM_REFORGE,
+	MANA_DISINTEGRATOR,
+	HEX_ITEM,
+	TOTAL_UPGRADES,
+	RUBY_GEMSTONE,
+	AMETHYST_GEMSTONE,
+	SAPPHIRE_GEMSTONE,
+	JASPER_GEMSTONE,
+	JADE_GEMSTONE,
+	AMBER_GEMSTONE,
+	OPAL_GEMSTONE,
+	TOPAZ_GEMSTONE,
+	CONVERT_TO_DUNGEON,
+	GEMSTONE_SLOT,
+	EXPERIENCE_BOTTLE,
+	GRAND_EXPERIENCE_BOTTLE,
+	TITANIC_EXPERIENCE_BOTTLE,
+	COLOSSAL_EXPERIENCE_BOTTLE,
+	UNKNOWN;
+
+	private int starLevel = -1;
+
+	ItemType() {}
+
+	ItemType(int starLevel) {
+		this.starLevel = starLevel;
+	}
+
+	public int getStarLevel() {
+		return starLevel;
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/ExperienceOrb.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/ExperienceOrb.java
new file mode 100644
index 00000000..9da4f553
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/ExperienceOrb.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.util;
+
+import org.lwjgl.util.vector.Vector2f;
+
+public class ExperienceOrb {
+	public Vector2f position;
+	public Vector2f positionLast;
+	public Vector2f velocity;
+	public Vector2f target;
+
+	public int type;
+	public int rotationDeg;
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/OrbDisplay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/OrbDisplay.java
new file mode 100644
index 00000000..42e935f5
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/util/OrbDisplay.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.miscgui.util;
+
+import io.github.moulberry.notenoughupdates.core.util.lerp.LerpUtils;
+import io.github.moulberry.notenoughupdates.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.util.vector.Vector2f;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Random;
+
+public class OrbDisplay {
+	private static final ResourceLocation TEXTURE = new ResourceLocation("notenoughupdates:custom_enchant_gui.png");
+	private static final int DEFAULT_COUNT = 30;
+
+	private final List<ExperienceOrb> experienceOrbList = new ArrayList<>();
+
+	public ExperienceOrb spawnExperienceOrb(Random random, Vector2f start, Vector2f target, int baseType) {
+		ExperienceOrb orb = new ExperienceOrb();
+		orb.position = new Vector2f(start);
+		orb.positionLast = new Vector2f(orb.position);
+		orb.velocity = new Vector2f(
+			random.nextFloat() * 20 - 10,
+			random.nextFloat() * 20 - 10
+		);
+		orb.target = new Vector2f(target);
+		orb.type = baseType;
+		orb.rotationDeg = random.nextInt(4) * 90;
+
+		float v = random.nextFloat();
+		if (v > 0.6) {
+			orb.type += 1;
+		}
+		if (v > 0.9) {
+			orb.type += 1;
+		}
+
+		experienceOrbList.add(orb);
+
+		return orb;
+	}
+
+	public void spawnExperienceOrbs(int startX, int startY, int targetX, int targetY, int baseType) {
+		spawnExperienceOrbs(new Random(),new Vector2f(startX, startY), new Vector2f(targetX, targetY), baseType, DEFAULT_COUNT);
+	}
+
+	public void spawnExperienceOrbs(Random random, Vector2f start, Vector2f target, int baseType, int count) {
+		for (int i = 0; i < count; i++) {
+			spawnExperienceOrb(random, start, target, baseType);
+		}
+	}
+
+	public void physicsTickOrbs() {
+		for (ListIterator<ExperienceOrb> it = experienceOrbList.listIterator(); it.hasNext(); ) {
+			ExperienceOrb orb = it.next();
+
+			Vector2f delta = Vector2f.sub(orb.target, orb.position, null);
+			float length = delta.length();
+
+			// Remove close Orbs
+			if (length < 8 && orb.velocity.lengthSquared() < 20) {
+				it.remove();
+				continue;
+			}
+
+			// Update velocity
+			Vector2f.add(orb.velocity, (Vector2f) delta.scale(2 / length), orb.velocity);
+			orb.velocity.scale(0.9F);
+
+			// Update position
+			orb.positionLast.set(orb.position);
+			Vector2f.add(orb.position, orb.velocity, orb.position);
+		}
+	}
+
+	public void renderOrbs(float partialTicks) {
+		Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+		GlStateManager.disableDepth();
+
+		for (ExperienceOrb orb : experienceOrbList) {
+			int orbX = Math.round(LerpUtils.lerp(orb.position.x, orb.positionLast.x, partialTicks));
+			int orbY = Math.round(LerpUtils.lerp(orb.position.y, orb.positionLast.y, partialTicks));
+
+			GlStateManager.pushMatrix();
+
+			GlStateManager.translate(orbX, orbY, 0);
+			GlStateManager.rotate(orb.rotationDeg, 0, 0, 1);
+
+			Vector2f delta = Vector2f.sub(orb.position, orb.target, null);
+
+			float length = delta.length();
+			float velocitySquared = orb.velocity.lengthSquared();
+			float opacity = (float) Math.sqrt(
+				Math.min(
+					1,
+					Math.min(2, Math.max(0.5F, length / 16))
+						* Math.min(2, Math.max(0.5F, velocitySquared / 40))
+				));
+			GlStateManager.color(1, 1, 1, opacity);
+
+			int orbU = (orb.type % 3) * 16;
+			int orbV = (orb.type / 3) * 16 + 217;
+
+			Utils.drawTexturedRect(
+				-8, -8, 16, 16,
+				orbU / 512f,
+				(orbU + 16) / 512f,
+				orbV / 512f,
+				(orbV + 16) / 512f,
+				GL11.GL_NEAREST
+			);
+
+			GlStateManager.popMatrix();
+		}
+
+		GlStateManager.enableDepth();
+	}
+
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
index be36d0b4..7d17aa3e 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
@@ -30,6 +30,7 @@ import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers;
 import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking;
 import io.github.moulberry.notenoughupdates.miscgui.GuiCustomEnchant;
+import io.github.moulberry.notenoughupdates.miscgui.hex.GuiCustomHex;
 import io.github.moulberry.notenoughupdates.miscgui.StorageOverlay;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
@@ -189,6 +190,7 @@ public abstract class MixinGuiContainer extends GuiScreen {
 	public void isMouseOverSlot(Slot slotIn, int mouseX, int mouseY, CallbackInfoReturnable<Boolean> cir) {
 		StorageOverlay.getInstance().overrideIsMouseOverSlot(slotIn, mouseX, mouseY, cir);
 		GuiCustomEnchant.getInstance().overrideIsMouseOverSlot(slotIn, mouseX, mouseY, cir);
+		GuiCustomHex.getInstance().overrideIsMouseOverSlot(slotIn, mouseX, mouseY, cir);
 		AuctionBINWarning.getInstance().overrideIsMouseOverSlot(slotIn, mouseX, mouseY, cir);
 		AbiphoneWarning.getInstance().overrideIsMouseOverSlot(slotIn, mouseX, mouseY, cir);
 	}
-- 
cgit 


From 1aab0b30aaa7bf164e3ef84254c01519470dbd65 Mon Sep 17 00:00:00 2001
From: NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:58:42 +1000
Subject: Fixed experiment table timer in todo overlay (#267)

---
 .../github/moulberry/notenoughupdates/overlays/TimersOverlay.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java
index 86df47ff..4d82ebaf 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/TimersOverlay.java
@@ -660,7 +660,7 @@ public class TimersOverlay extends TextTabOverlay {
 				6,
 				DARK_AQUA + "Experiments: " +
 					EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.verySoonColour] +
-					Utils.prettyTime(catacombsReset)
+					Utils.prettyTime(catacombsReset + 86400000 - currentTime)
 			);
 		} else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.experimentationDisplay >= DISPLAYTYPE.SOON.ordinal() &&
 			(hidden.experimentsCompleted < (midnightReset - TimeEnums.HOUR.time))) {
@@ -668,7 +668,7 @@ public class TimersOverlay extends TextTabOverlay {
 				6,
 				DARK_AQUA + "Experiments: " +
 					EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.soonColour] +
-					Utils.prettyTime(catacombsReset)
+					Utils.prettyTime(catacombsReset + 86400000 - currentTime)
 			);
 		} else if (
 			NotEnoughUpdates.INSTANCE.config.miscOverlays.experimentationDisplay >= DISPLAYTYPE.KINDASOON.ordinal() &&
@@ -677,14 +677,14 @@ public class TimersOverlay extends TextTabOverlay {
 				6,
 				DARK_AQUA + "Experiments: " +
 					EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.kindaSoonColour] +
-					Utils.prettyTime(catacombsReset)
+					Utils.prettyTime(catacombsReset + 86400000 - currentTime)
 			);
 		} else if (NotEnoughUpdates.INSTANCE.config.miscOverlays.experimentationDisplay >= DISPLAYTYPE.ALWAYS.ordinal()) {
 			map.put(
 				6,
 				DARK_AQUA + "Experiments: " +
 					EnumChatFormatting.values()[NotEnoughUpdates.INSTANCE.config.miscOverlays.defaultColour] +
-					Utils.prettyTime(catacombsReset)
+					Utils.prettyTime(catacombsReset + 86400000 - currentTime)
 			);
 		}
 
-- 
cgit