add toggle to hide buttons while in experimentation table (#205)

4 files changed, 184 insertions, 156 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index de050e5e..b54dfee9 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -36,6 +36,7 @@ import io.github.moulberry.notenoughupdates.mbgui.MBAnchorPoint;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiElement;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupAligned;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupFloating;
+import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers;
 import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.SunTzu;
 import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph;
@@ -548,6 +549,7 @@ public class NEUOverlay extends Gui {
 			@Override
 			public void mouseClick(float x, float y, int mouseX, int mouseY) {
 				if (!NotEnoughUpdates.INSTANCE.config.toolbar.quickCommands) return;
+				if (EnchantingSolvers.disableButtons()) return;
 
 				if ((NotEnoughUpdates.INSTANCE.config.toolbar.quickCommandsClickType != 0 && Mouse.getEventButtonState()) ||
 					(NotEnoughUpdates.INSTANCE.config.toolbar.quickCommandsClickType == 0 && !Mouse.getEventButtonState() &&
@@ -570,6 +572,7 @@ public class NEUOverlay extends Gui {
 			@Override
 			public void render(float x, float y) {
 				if (!NotEnoughUpdates.INSTANCE.config.toolbar.quickCommands) return;
+				if (EnchantingSolvers.disableButtons()) return;
 
 				int paddingUnscaled = getPaddingUnscaled();
 				int bigItemSize = getSearchBarYSize();
@@ -1947,7 +1950,7 @@ public class NEUOverlay extends Gui {
 		if (textField.getText().toLowerCase().contains("lunar")) {
 			Minecraft.getMinecraft().getTextureManager().bindTexture(ATMOULBERRYWHYISMYLUNARCLIENTBUGGING);
 			GlStateManager.color(1, 1, 1, 1);
-			GlStateManager.translate(0,0,100);
+			GlStateManager.translate(0, 0, 100);
 			Utils.drawTexturedRect((width + 410) / 2f, (height + 450) / 2f - 114, 113, 64, GL11.GL_LINEAR);
 			GlStateManager.bindTexture(0);
 		}
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 02c25333..72a385f1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/RenderListener.java
@@ -39,6 +39,7 @@ import io.github.moulberry.notenoughupdates.miscfeatures.AuctionBINWarning;
 import io.github.moulberry.notenoughupdates.miscfeatures.AuctionProfit;
 import io.github.moulberry.notenoughupdates.miscfeatures.BetterContainers;
 import io.github.moulberry.notenoughupdates.miscfeatures.CrystalMetalDetectorSolver;
+import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers;
 import io.github.moulberry.notenoughupdates.miscfeatures.StorageManager;
 import io.github.moulberry.notenoughupdates.miscgui.AccessoryBagOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.CalendarOverlay;
@@ -487,64 +488,67 @@ public class RenderListener {
 			int guiTop = ((AccessorGuiContainer) event.gui).getGuiTop();
 
 			if (!NEUApi.disableInventoryButtons) {
-				for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
-					if (!button.isActive()) continue;
-					if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
-
-					int x = guiLeft + button.x;
-					int y = guiTop + button.y;
-					if (button.anchorRight) {
-						x += xSize;
-					}
-					if (button.anchorBottom) {
-						y += ySize;
-					}
-					if (AccessoryBagOverlay.isInAccessoryBag()) {
-						if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
-							x += 80 + 28;
+				if (!EnchantingSolvers.disableButtons()) {
+					for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
+						if (!button.isActive()) continue;
+						if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
+
+						int x = guiLeft + button.x;
+						int y = guiTop + button.y;
+						if (button.anchorRight) {
+							x += xSize;
 						}
-					}
-					if (TrophyRewardOverlay.inTrophyFishingInventory()) {
-						int diffX = 162;
-						if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
-							x += diffX;
+						if (button.anchorBottom) {
+							y += ySize;
 						}
-					}
-					if (AuctionProfit.inAuctionPage()) {
-						if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 && y < guiTop + 56) {
-							x -= 68 - 200;
+						if (AccessoryBagOverlay.isInAccessoryBag()) {
+							if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
+								x += 80 + 28;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingArmorHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
-							x -= 25;
+						if (TrophyRewardOverlay.inTrophyFishingInventory()) {
+							int diffX = 162;
+							if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
+								x += diffX;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingPetHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
-							x -= 25;
+						if (AuctionProfit.inAuctionPage()) {
+							if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 &&
+								y < guiTop + 56) {
+								x -= 68 - 200;
+							}
+						}
+						if (NEUOverlay.isRenderingArmorHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+								x -= 25;
+							}
+						}
+						if (NEUOverlay.isRenderingPetHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+								x -= 25;
+							}
 						}
-					}
 
-					GlStateManager.color(1, 1, 1, 1f);
-
-					GlStateManager.enableDepth();
-					GlStateManager.enableAlpha();
-					Minecraft.getMinecraft().getTextureManager().bindTexture(EDITOR);
-					Utils.drawTexturedRect(
-						x,
-						y,
-						18,
-						18,
-						button.backgroundIndex * 18 / 256f,
-						(button.backgroundIndex * 18 + 18) / 256f,
-						18 / 256f,
-						36 / 256f,
-						GL11.GL_NEAREST
-					);
+						GlStateManager.color(1, 1, 1, 1f);
+
+						GlStateManager.enableDepth();
+						GlStateManager.enableAlpha();
+						Minecraft.getMinecraft().getTextureManager().bindTexture(EDITOR);
+						Utils.drawTexturedRect(
+							x,
+							y,
+							18,
+							18,
+							button.backgroundIndex * 18 / 256f,
+							(button.backgroundIndex * 18 + 18) / 256f,
+							18 / 256f,
+							36 / 256f,
+							GL11.GL_NEAREST
+						);
 
-					if (button.icon != null && !button.icon.trim().isEmpty()) {
-						GuiInvButtonEditor.renderIcon(button.icon, x + 1, y + 1);
+						if (button.icon != null && !button.icon.trim().isEmpty()) {
+							GuiInvButtonEditor.renderIcon(button.icon, x + 1, y + 1);
+						}
 					}
 				}
 			}
@@ -605,73 +609,76 @@ public class RenderListener {
 			int guiTop = ((AccessorGuiContainer) event.gui).getGuiTop();
 
 			if (!NEUApi.disableInventoryButtons) {
-				for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
-					if (!button.isActive()) continue;
-					if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
-
-					int x = guiLeft + button.x;
-					int y = guiTop + button.y;
-					if (button.anchorRight) {
-						x += xSize;
-					}
-					if (button.anchorBottom) {
-						y += ySize;
-					}
-					if (AccessoryBagOverlay.isInAccessoryBag()) {
-						if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
-							x += 80 + 28;
+				if (!EnchantingSolvers.disableButtons()) {
+					for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
+						if (!button.isActive()) continue;
+						if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
+
+						int x = guiLeft + button.x;
+						int y = guiTop + button.y;
+						if (button.anchorRight) {
+							x += xSize;
 						}
-					}
-					if (TrophyRewardOverlay.inTrophyFishingInventory()) {
-						int diffX = 162;
-						if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
-							x += diffX;
+						if (button.anchorBottom) {
+							y += ySize;
 						}
-					}
-					if (AuctionProfit.inAuctionPage()) {
-						if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 && y < guiTop + 56) {
-							x -= 68 - 200;
+						if (AccessoryBagOverlay.isInAccessoryBag()) {
+							if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
+								x += 80 + 28;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingArmorHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
-							x -= 25;
+						if (TrophyRewardOverlay.inTrophyFishingInventory()) {
+							int diffX = 162;
+							if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
+								x += diffX;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingPetHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
-							x -= 25;
+						if (AuctionProfit.inAuctionPage()) {
+							if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 &&
+								y < guiTop + 56) {
+								x -= 68 - 200;
+							}
+						}
+						if (NEUOverlay.isRenderingArmorHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+								x -= 25;
+							}
+						}
+						if (NEUOverlay.isRenderingPetHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+								x -= 25;
+							}
 						}
-					}
-
-					if (x - guiLeft >= 85 && x - guiLeft <= 115 && y - guiTop >= 4 && y - guiTop <= 25) {
-						disableCraftingText = true;
-					}
-
-					if (event.mouseX >= x && event.mouseX <= x + 18 && event.mouseY >= y && event.mouseY <= y + 18) {
-						hoveringButton = true;
-						long currentTime = System.currentTimeMillis();
 
-						if (buttonHovered != button) {
-							buttonHoveredMillis = currentTime;
-							buttonHovered = button;
+						if (x - guiLeft >= 85 && x - guiLeft <= 115 && y - guiTop >= 4 && y - guiTop <= 25) {
+							disableCraftingText = true;
 						}
 
-						if (currentTime - buttonHoveredMillis > 600) {
-							String command = button.command.trim();
-							if (!command.startsWith("/")) {
-								command = "/" + command;
+						if (event.mouseX >= x && event.mouseX <= x + 18 && event.mouseY >= y && event.mouseY <= y + 18) {
+							hoveringButton = true;
+							long currentTime = System.currentTimeMillis();
+
+							if (buttonHovered != button) {
+								buttonHoveredMillis = currentTime;
+								buttonHovered = button;
 							}
 
-							Utils.drawHoveringText(
-								Lists.newArrayList("\u00a77" + command),
-								event.mouseX,
-								event.mouseY,
-								event.gui.width,
-								event.gui.height,
-								-1,
-								Minecraft.getMinecraft().fontRendererObj
-							);
+							if (currentTime - buttonHoveredMillis > 600) {
+								String command = button.command.trim();
+								if (!command.startsWith("/")) {
+									command = "/" + command;
+								}
+
+								Utils.drawHoveringText(
+									Lists.newArrayList("\u00a77" + command),
+									event.mouseX,
+									event.mouseY,
+									event.gui.width,
+									event.gui.height,
+									-1,
+									Minecraft.getMinecraft().fontRendererObj
+								);
+							}
 						}
 					}
 				}
@@ -749,7 +756,8 @@ public class RenderListener {
 											if (auctionInfo.has("clean_price")) {
 												worth = (long) auctionInfo.get("clean_price").getAsDouble();
 											} else {
-												worth = (long) (auctionInfo.get("price").getAsDouble() / auctionInfo.get("count").getAsDouble());
+												worth =
+													(long) (auctionInfo.get("price").getAsDouble() / auctionInfo.get("count").getAsDouble());
 											}
 										}
 										break;
@@ -1022,61 +1030,65 @@ public class RenderListener {
 			int guiLeft = ((AccessorGuiContainer) event.gui).getGuiLeft();
 			int guiTop = ((AccessorGuiContainer) event.gui).getGuiTop();
 			if (!NEUApi.disableInventoryButtons) {
-				for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
-					if (!button.isActive()) continue;
-					if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
-
-					int x = guiLeft + button.x;
-					int y = guiTop + button.y;
-					if (button.anchorRight) {
-						x += xSize;
-					}
-					if (button.anchorBottom) {
-						y += ySize;
-					}
-					if (AccessoryBagOverlay.isInAccessoryBag()) {
-						if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
-							x += 80 + 28;
+				if (!EnchantingSolvers.disableButtons()) {
+					for (NEUConfig.InventoryButton button : NotEnoughUpdates.INSTANCE.config.hidden.inventoryButtons) {
+						if (!button.isActive()) continue;
+						if (button.playerInvOnly && !(event.gui instanceof GuiInventory)) continue;
+
+						int x = guiLeft + button.x;
+						int y = guiTop + button.y;
+						if (button.anchorRight) {
+							x += xSize;
 						}
-					}
-					if (TrophyRewardOverlay.inTrophyFishingInventory()) {
-						int diffX = 162;
-						if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
-							x += diffX;
+						if (button.anchorBottom) {
+							y += ySize;
 						}
-					}
-					if (AuctionProfit.inAuctionPage()) {
-						if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 && y < guiTop + 56) {
-							x -= 68 - 200;
+						if (AccessoryBagOverlay.isInAccessoryBag()) {
+							if (x > guiLeft + xSize && x < guiLeft + xSize + 80 + 28 + 5 && y > guiTop - 18 && y < guiTop + 150) {
+								x += 80 + 28;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingArmorHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
-							x -= 25;
+						if (TrophyRewardOverlay.inTrophyFishingInventory()) {
+							int diffX = 162;
+							if (x > guiLeft + xSize && x < guiLeft + xSize + diffX + 5 && y > guiTop - 18 && y < guiTop + 120) {
+								x += diffX;
+							}
 						}
-					}
-					if (NEUOverlay.isRenderingPetHud()) {
-						if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
-							x -= 25;
+						if (AuctionProfit.inAuctionPage()) {
+							if (x + 18 > guiLeft + xSize && x + 18 < guiLeft + xSize + 4 + 28 + 20 && y > guiTop - 180 &&
+								y < guiTop + 56) {
+								x -= 68 - 200;
+							}
+						}
+						if (NEUOverlay.isRenderingArmorHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop && y < guiTop + 84) {
+								x -= 25;
+							}
+						}
+						if (NEUOverlay.isRenderingPetHud()) {
+							if (x < guiLeft + xSize - 150 && x > guiLeft + xSize - 200 && y > guiTop + 60 && y < guiTop + 120) {
+								x -= 25;
+							}
 						}
-					}
 
-					if (mouseX >= x && mouseX <= x + 18 && mouseY >= y && mouseY <= y + 18) {
-						if (Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
-							int clickType = NotEnoughUpdates.INSTANCE.config.inventoryButtons.clickType;
-							if ((clickType == 0 && Mouse.getEventButtonState()) || (clickType == 1 && !Mouse.getEventButtonState())) {
-								String command = button.command.trim();
-								if (!command.startsWith("/")) {
-									command = "/" + command;
-								}
-								if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, command) == 0) {
-									NotEnoughUpdates.INSTANCE.sendChatMessage(command);
+						if (mouseX >= x && mouseX <= x + 18 && mouseY >= y && mouseY <= y + 18) {
+							if (Minecraft.getMinecraft().thePlayer.inventory.getItemStack() == null) {
+								int clickType = NotEnoughUpdates.INSTANCE.config.inventoryButtons.clickType;
+								if ((clickType == 0 && Mouse.getEventButtonState()) ||
+									(clickType == 1 && !Mouse.getEventButtonState())) {
+									String command = button.command.trim();
+									if (!command.startsWith("/")) {
+										command = "/" + command;
+									}
+									if (ClientCommandHandler.instance.executeCommand(Minecraft.getMinecraft().thePlayer, command) == 0) {
+										NotEnoughUpdates.INSTANCE.sendChatMessage(command);
+									}
 								}
+							} else {
+								event.setCanceled(true);
 							}
-						} else {
-							event.setCanceled(true);
+							return;
 						}
-						return;
 					}
 				}
 			}
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 aaaa1e24..1032fe16 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
@@ -597,4 +597,8 @@ public class EnchantingSolvers {
 
 		processInventoryContents(true);
 	}
+
+	public static boolean disableButtons() {
+		return currentSolver != SolverType.NONE && NotEnoughUpdates.INSTANCE.config.enchantingSolvers.hideButtons;
+	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
index 7a49f7c2..2f3ffa36 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
@@ -131,6 +131,15 @@ public class Enchanting {
 
 	@Expose
 	@ConfigOption(
+		name = "Hide Buttons",
+		desc = "Hide Inventory Buttons and Quick Commands while in the experimentation table"
+	)
+	@ConfigEditorBoolean
+	@ConfigAccordionId(id = 0)
+	public boolean hideButtons = false;
+
+	@Expose
+	@ConfigOption(
 		name = "Ultrasequencer Next",
 		desc = "Set the colour of the glass pane shown behind the element in the ultrasequencer which is next"
 	)