From 4875d5a9706ca3ce1288dbd853b65cde4a48a27a Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Thu, 9 Apr 2020 23:33:40 +0100
Subject: [PATCH] Put excess upgrades onto a second row so they don't go off
 the edge

---
 .../client/gui/GuiArcaneWorkbench.java        | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
index a551cd73..5b5f2ff3 100644
--- a/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
+++ b/src/main/java/electroblob/wizardry/client/gui/GuiArcaneWorkbench.java
@@ -391,12 +391,20 @@ public class GuiArcaneWorkbench extends GuiContainer {
 					int level = WandHelper.getUpgradeLevel(stack, item);
 
 					if(level > 0){
+
 						ItemStack stack1 = new ItemStack(item, level);
 						GlStateManager.enableDepth();
+
 						this.itemRender.renderItemAndEffectIntoGUI(stack1, left + MAIN_GUI_WIDTH + TOOLTIP_TEXT_INSET + x, y);
-						this.itemRender.renderItemOverlayIntoGUI(this.fontRenderer, stack1, left + MAIN_GUI_WIDTH + TOOLTIP_TEXT_INSET + x, y,
-								null);
+						this.itemRender.renderItemOverlayIntoGUI(this.fontRenderer, stack1, left + MAIN_GUI_WIDTH + TOOLTIP_TEXT_INSET + x, y, null);
+
 						x += 18;
+
+						if(TOOLTIP_TEXT_INSET * 2 + x + 16 > TOOLTIP_WIDTH){
+							x = 0;
+							y += 18;
+						}
+
 						GlStateManager.disableDepth();
 						GlStateManager.disableLighting(); // Whyyyyyy?
 					}
@@ -522,7 +530,14 @@ public class GuiArcaneWorkbench extends GuiContainer {
 								ItemStack stack1 = new ItemStack(item, level);
 								this.renderToolTip(stack1, mouseX - guiLeft, mouseY - guiTop);
 							}
+
 							x += 18;
+
+							if(TOOLTIP_TEXT_INSET * 2 + x + 16 > TOOLTIP_WIDTH){
+								x = 0;
+								y += 18;
+							}
+
 						}
 					}
 				}