I hate FontRenderer. (#612)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

17 files changed, 351 insertions, 1363 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
index 530dcfd1..562eb1e0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/AccessoryBagOverlay.java
@@ -204,24 +204,8 @@ public class AccessoryBagOverlay {
 	private static Set<Integer> pagesVisited = new HashSet<>();
 
 	public static void renderVisitOverlay(int x, int y) {
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Please visit all",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 78,
-			true,
-			70,
-			-1
-		);
-		Utils.drawStringCenteredScaledMaxWidth(
-			"pages of the bag",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 86,
-			true,
-			70,
-			-1
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Please visit all", x + 40, y + 78, true, 70, -1);
+		Utils.drawStringCenteredScaledMaxWidth("pages of the bag", x + 40, y + 86, true, 70, -1);
 	}
 
 	private static TreeMap<Integer, Integer> talismanCountRarity = null;
@@ -237,15 +221,7 @@ public class AccessoryBagOverlay {
 			}
 		}
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"# By Rarity",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 12,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		drawString(x, y, "# By Rarity");
 
 		int yIndex = 0;
 		for (Map.Entry<Integer, Integer> entry : talismanCountRarity.descendingMap().entrySet()) {
@@ -271,15 +247,7 @@ public class AccessoryBagOverlay {
 			}
 		}
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Total Stats",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 12,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		drawString(x, y, "Total Stats");
 		int yIndex = 0;
 		for (int i = 0; i < PlayerStats.defaultStatNames.length; i++) {
 			String statName = PlayerStats.defaultStatNames[i];
@@ -319,15 +287,7 @@ public class AccessoryBagOverlay {
 			}
 		}
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Reforge Stats",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 12,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		drawString(x, y, "Reforge Stats");
 		int yIndex = 0;
 		for (int i = 0; i < PlayerStats.defaultStatNames.length; i++) {
 			String statName = PlayerStats.defaultStatNames[i];
@@ -363,28 +323,12 @@ public class AccessoryBagOverlay {
 		if (duplicates == null) {
 			JsonObject misc = Constants.MISC;
 			if (misc == null) {
-				Utils.drawStringCenteredScaledMaxWidth(
-					"Duplicates: ERROR",
-					Minecraft.getMinecraft().fontRendererObj,
-					x + 40,
-					y + 12,
-					false,
-					70,
-					new Color(80, 80, 80).getRGB()
-				);
+				drawString(x, y, "Duplicates: ERROR");
 				return;
 			}
 			JsonElement talisman_upgrades_element = misc.get("talisman_upgrades");
 			if (talisman_upgrades_element == null) {
-				Utils.drawStringCenteredScaledMaxWidth(
-					"Duplicates: ERROR",
-					Minecraft.getMinecraft().fontRendererObj,
-					x + 40,
-					y + 12,
-					false,
-					70,
-					new Color(80, 80, 80).getRGB()
-				);
+				drawString(x, y, "Duplicates: ERROR");
 				return;
 			}
 			JsonObject talisman_upgrades = talisman_upgrades_element.getAsJsonObject();
@@ -419,25 +363,9 @@ public class AccessoryBagOverlay {
 			}
 		}
 		if (duplicates.isEmpty()) {
-			Utils.drawStringCenteredScaledMaxWidth(
-				"No Duplicates",
-				Minecraft.getMinecraft().fontRendererObj,
-				x + 40,
-				y + 12,
-				false,
-				70,
-				new Color(80, 80, 80).getRGB()
-			);
+			drawString(x, y, "No Duplicates");
 		} else {
-			Utils.drawStringCenteredScaledMaxWidth(
-				"Duplicates: " + duplicates.size(),
-				Minecraft.getMinecraft().fontRendererObj,
-				x + 40,
-				y + 12,
-				false,
-				70,
-				new Color(80, 80, 80).getRGB()
-			);
+			drawString(x, y, "Duplicates: " + duplicates.size());
 
 			int yIndex = 0;
 			for (ItemStack duplicate : duplicates) {
@@ -451,9 +379,12 @@ public class AccessoryBagOverlay {
 			}
 
 			if (duplicates.size() > 11) {
-				Utils.drawStringCenteredScaledMaxWidth("+" + (duplicates.size() - 10) + " More",
-					Minecraft.getMinecraft().fontRendererObj, x + 40, y + 16 + 121, false, 70,
-					new Color(80, 80, 80).getRGB()
+				Utils.drawStringCenteredScaledMaxWidth(
+					"+" + (duplicates.size() - 10) + " More",
+					x + 40, y + 16 + 121,
+					false,
+					70,
+					gray()
 				);
 			}
 		}
@@ -465,28 +396,12 @@ public class AccessoryBagOverlay {
 		if (missing == null) {
 			JsonObject misc = Constants.MISC;
 			if (misc == null) {
-				Utils.drawStringCenteredScaledMaxWidth(
-					"Duplicates: ERROR",
-					Minecraft.getMinecraft().fontRendererObj,
-					x + 40,
-					y + 12,
-					false,
-					70,
-					new Color(80, 80, 80).getRGB()
-				);
+				drawString(x, y, "Duplicates: ERROR");
 				return;
 			}
 			JsonElement talisman_upgrades_element = misc.get("talisman_upgrades");
 			if (talisman_upgrades_element == null) {
-				Utils.drawStringCenteredScaledMaxWidth(
-					"Duplicates: ERROR",
-					Minecraft.getMinecraft().fontRendererObj,
-					x + 40,
-					y + 12,
-					false,
-					70,
-					new Color(80, 80, 80).getRGB()
-				);
+				drawString(x, y, "Duplicates: ERROR");
 				return;
 			}
 			JsonObject talisman_upgrades = talisman_upgrades_element.getAsJsonObject();
@@ -554,25 +469,9 @@ public class AccessoryBagOverlay {
 			}
 		}
 		if (missing.isEmpty()) {
-			Utils.drawStringCenteredScaledMaxWidth(
-				"No Missing",
-				Minecraft.getMinecraft().fontRendererObj,
-				x + 40,
-				y + 12,
-				false,
-				70,
-				new Color(80, 80, 80).getRGB()
-			);
+			drawString(x, y, "No Missing");
 		} else {
-			Utils.drawStringCenteredScaledMaxWidth(
-				"Missing: " + missing.size(),
-				Minecraft.getMinecraft().fontRendererObj,
-				x + 40,
-				y + 12,
-				false,
-				70,
-				new Color(80, 80, 80).getRGB()
-			);
+			drawString(x, y, "Missing: " + missing.size());
 
 			int yIndex = 0;
 			long currentTime = System.currentTimeMillis();
@@ -610,10 +509,7 @@ public class AccessoryBagOverlay {
 			}
 
 			if (missing.size() > 11) {
-				Utils.drawStringCenteredScaledMaxWidth("Show All",
-					Minecraft.getMinecraft().fontRendererObj, x + 40, y + 16 + 121, false, 70,
-					new Color(80, 80, 80).getRGB()
-				);
+				Utils.drawStringCenteredScaledMaxWidth("Show All", x + 40, y + 16 + 121, false, 70, gray());
 
 				final ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
 				final int scaledWidth = scaledresolution.getScaledWidth();
@@ -675,7 +571,7 @@ public class AccessoryBagOverlay {
 						mouseX * scaledresolution.getScaleFactor() / 2,
 						mouseY * scaledresolution.getScaleFactor() / 2,
 						scaledWidth * scaledresolution.getScaleFactor() / 2,
-						scaledHeight * scaledresolution.getScaleFactor() / 2, -1, Minecraft.getMinecraft().fontRendererObj
+						scaledHeight * scaledresolution.getScaleFactor() / 2, -1
 					);
 					GlStateManager.popMatrix();
 				}
@@ -683,6 +579,10 @@ public class AccessoryBagOverlay {
 		}
 	}
 
+	private static void drawString(int x, int y, String abc) {
+		Utils.drawStringCenteredScaledMaxWidth(abc, x + 40, y + 12, false, 70, gray());
+	}
+
 	private static boolean forceCC = false;
 	private static boolean forceAS = false;
 	private static boolean useGodPot = true;
@@ -690,15 +590,7 @@ public class AccessoryBagOverlay {
 	private static int mainWeapon = 1;
 
 	public static void renderOptimizerOverlay(int x, int y) {
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Optimizer",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 12,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Optimizer", x + 40, y + 12, false, 70, gray());
 
 		int light = new Color(220, 220, 220).getRGB();
 		int dark = new Color(170, 170, 170).getRGB();
@@ -724,116 +616,50 @@ public class AccessoryBagOverlay {
 			dark
 		);
 
+		Utils.drawStringCenteredScaledMaxWidth("Force 100% CC", x + 40, y + 27, false, 70, gray());
 		Utils.drawStringCenteredScaledMaxWidth(
-			"Force 100% CC",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 27,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
-		Utils.drawStringCenteredScaledMaxWidth((forceCC ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY) + "YES",
-			Minecraft.getMinecraft().fontRendererObj, x + 20, y + 37,
-			true, 30, new Color(80, 80, 80).getRGB()
+			(forceCC ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY) + "YES", x + 20, y + 37, true, 30, gray()
 		);
 		Utils.drawStringCenteredScaledMaxWidth(
 			(forceCC ? EnumChatFormatting.GRAY : EnumChatFormatting.RED) + "NO",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 60,
-			y + 37,
-			true,
-			30,
-			new Color(80, 80, 80).getRGB()
+			x + 60, y + 37, true, 30, gray()
 		);
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Force 100% ATKSPEED",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 47,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Force 100% ATKSPEED", x + 40, y + 47, false, 70, gray());
 		Utils.drawStringCenteredScaledMaxWidth(
 			(forceAS ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY) + "YES",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 20,
-			y + 57,
-			true,
-			30,
-			new Color(80, 80, 80).getRGB()
+			x + 20, y + 57, true, 30, gray()
 		);
 		Utils.drawStringCenteredScaledMaxWidth(
 			(forceAS ? EnumChatFormatting.GRAY : EnumChatFormatting.RED) + "NO",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 60,
-			y + 57,
-			true,
-			30,
-			new Color(80, 80, 80).getRGB()
+			x + 60, y + 57, true, 30, gray()
 		);
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Use God Potion",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 67,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Use God Potion", x + 40, y + 67, false, 70, gray());
 		Utils.drawStringCenteredScaledMaxWidth(
 			(useGodPot ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY) + "YES",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 20,
-			y + 77,
-			true,
-			30,
-			new Color(80, 80, 80).getRGB()
+			x + 20, y + 77, true, 30, gray()
 		);
 		Utils.drawStringCenteredScaledMaxWidth(
 			(useGodPot ? EnumChatFormatting.GRAY : EnumChatFormatting.RED) + "NO",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 60,
-			y + 77,
-			true,
-			30,
-			new Color(80, 80, 80).getRGB()
+			x + 60, y + 77, true, 30, gray()
 		);
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Use God Potion",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 87,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Use God Potion", x + 40, y + 87, false, 70, gray());
 		Utils.drawStringCenteredScaledMaxWidth((allowShaded ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY) + "YES",
-			Minecraft.getMinecraft().fontRendererObj, x + 20, y + 97,
-			true, 30, new Color(80, 80, 80).getRGB()
+			x + 20, y + 97, true, 30, gray()
 		);
 		Utils.drawStringCenteredScaledMaxWidth((allowShaded ? EnumChatFormatting.GRAY : EnumChatFormatting.RED) + "NO",
-			Minecraft.getMinecraft().fontRendererObj, x + 60, y + 97,
-			true, 30, new Color(80, 80, 80).getRGB()
+			x + 60, y + 97,
+			true, 30, gray()
 		);
 
-		Utils.drawStringCenteredScaledMaxWidth(
-			"Main Weapon",
-			Minecraft.getMinecraft().fontRendererObj,
-			x + 40,
-			y + 107,
-			false,
-			70,
-			new Color(80, 80, 80).getRGB()
-		);
-		Utils.drawStringCenteredScaled("1 2 3 4 5 6 7 8 9",
-			Minecraft.getMinecraft().fontRendererObj, x + 40, y + 117,
-			true, 70, new Color(80, 80, 80).getRGB()
-		);
+		Utils.drawStringCenteredScaledMaxWidth("Main Weapon", x + 40, y + 107, false, 70, gray());
+		Utils.drawStringCenteredScaled("1 2 3 4 5 6 7 8 9", x + 40, y + 117, true, 70, gray());
+	}
+
+	private static int gray() {
+		return new Color(80, 80, 80).getRGB();
 	}
 
 	private static Comparator<String> getItemComparator() {
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 baea367c..3bd90db8 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/CalendarOverlay.java
@@ -822,7 +822,7 @@ public class CalendarOverlay {
 				int startingWidth = fr.getStringWidth(starting);
 				fr.drawString(starting, Math.max(guiLeft + 23, width / 2f - startingWidth / 2f), y + 7, -1, false);
 			} else {
-				Utils.drawStringCentered(EnumChatFormatting.YELLOW + "Event Starting Now!", fr, width / 2, y + 11, false, -1);
+				Utils.drawStringCentered(EnumChatFormatting.YELLOW + "Event Starting Now!", width / 2, y + 11, false, -1);
 			}
 
 			int displayWidth = fr.getStringWidth(event.display);
@@ -981,7 +981,7 @@ public class CalendarOverlay {
 						GL11.glDisable(GL11.GL_SCISSOR_TEST);
 					} else {
 						if (guiLeft + xSize - 8 - untilLen > (width + displayWidth) / 2) {
-							Utils.drawStringCentered(nextEvent.display, fr, width / 2f, guiTop + 10, false, -1);
+							Utils.drawStringCentered(nextEvent.display, width / 2f, guiTop + 10, false, -1);
 						} else {
 							fr.drawString(nextEvent.display, guiLeft + 8 + nextSLen, guiTop + 6, -1, false);
 						}
@@ -1026,7 +1026,7 @@ public class CalendarOverlay {
 					if (tooltipToDisplay != null) {
 						drawTimerForeground = true;
 						GlStateManager.translate(0, 0, 100);
-						Utils.drawHoveringText(tooltipToDisplay, mouseX, Math.max(17, mouseY), width, height, -1, fr);
+						Utils.drawHoveringText(tooltipToDisplay, mouseX, Math.max(17, mouseY), width, height, -1);
 						GlStateManager.translate(0, 0, -100);
 					}
 				}
@@ -1121,20 +1121,20 @@ public class CalendarOverlay {
 		if (mayorStack != null) {
 			String mayor = mayorStack.getDisplayName();
 			float verticalHeight = Utils.getVerticalHeight(mayor);
-			Utils.drawStringVertical(mayor, fr, guiLeft + 8, guiTop + 96 - verticalHeight / 2,
+			Utils.drawStringVertical(mayor, guiLeft + 8, guiTop + 96 - verticalHeight / 2,
 				false, -1
 			);
 		}
 
 		String calendar = EnumChatFormatting.GREEN + "Calendar";
 		float calendarHeight = Utils.getVerticalHeight(calendar);
-		Utils.drawStringVertical(calendar, fr, guiLeft + xSize - 12, guiTop + 60 - calendarHeight / 2,
+		Utils.drawStringVertical(calendar, guiLeft + xSize - 12, guiTop + 60 - calendarHeight / 2,
 			false, -1
 		);
 
 		String rewards = EnumChatFormatting.GOLD + "Rewards";
 		float rewardsHeight = Utils.getVerticalHeight(rewards);
-		Utils.drawStringVertical(rewards, fr, guiLeft + xSize - 12, guiTop + 132 - rewardsHeight / 2,
+		Utils.drawStringVertical(rewards, guiLeft + xSize - 12, guiTop + 132 - rewardsHeight / 2,
 			false, -1
 		);
 
@@ -1349,7 +1349,7 @@ public class CalendarOverlay {
 				tooltipToDisplay.add(EnumChatFormatting.DARK_GRAY + "In order to show crop types for Jacob's Farming");
 				tooltipToDisplay.add(EnumChatFormatting.DARK_GRAY + "contest, visit the full SkyBlock calendar and go all");
 				tooltipToDisplay.add(EnumChatFormatting.DARK_GRAY + "the way to the end of the SkyBlock year");
-				Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
+				Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1);
 				tooltipToDisplay = null;
 			}
 		}
@@ -1415,7 +1415,7 @@ public class CalendarOverlay {
 			}
 			GlStateManager.translate(0, 0, -20);
 		} else if (tooltipToDisplay != null) {
-			Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1, fr);
+			Utils.drawHoveringText(tooltipToDisplay, mouseX, mouseY, width, height, -1);
 		}
 
 		GlStateManager.translate(0, 0, -10);
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 6f190ada..6d219999 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
@@ -36,6 +36,7 @@ import io.github.moulberry.notenoughupdates.util.ItemUtils;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -146,7 +147,8 @@ public class GuiCustomEnchant extends Gui {
 
 						if (costs.size() >= 1) {
 							if (useMaxLevelForCost) {
-								int cost = (maxLevel != null && maxLevel.has(this.enchId) ? maxLevel.get(this.enchId).getAsInt() : costs.size());
+								int cost =
+									(maxLevel != null && maxLevel.has(this.enchId) ? maxLevel.get(this.enchId).getAsInt() : costs.size());
 								this.xpCost = costs.get(cost - 1).getAsInt();
 							} else if (level - 1 < costs.size()) {
 								this.xpCost = costs.get(level - 1).getAsInt();
@@ -600,16 +602,15 @@ public class GuiCustomEnchant extends Gui {
 			0, X_SIZE / 512f, 0, Y_SIZE / 512f, GL11.GL_NEAREST
 		);
 
-		Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
-		Minecraft.getMinecraft().fontRendererObj.drawString("Removable", guiLeft + 247, guiTop + 7, 0x404040, false);
+		FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
+		fr.drawString("Applicable", guiLeft + 7, guiTop + 7, 0x404040, false);
+		fr.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
-			);
+			int pageStrLen = fr.getStringWidth(pageStr);
+			Utils.drawStringCentered(pageStr, guiLeft + X_SIZE / 2, guiTop + 14, false, 0x404040);
 
 			//Page Arrows
 			Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
@@ -727,12 +728,8 @@ public class GuiCustomEnchant extends Gui {
 		//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
-			);
+			Utils.drawStringCentered("This item can't", guiLeft + X_SIZE / 2, guiTop + 88, true, 0xffff5555);
+			Utils.drawStringCentered("be enchanted", guiLeft + X_SIZE / 2, guiTop + 98, true, 0xffff5555);
 			GlStateManager.enableDepth();
 		}
 
@@ -755,52 +752,24 @@ public class GuiCustomEnchant extends Gui {
 		//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
-				);
+				Utils.drawStringCentered("Can't find that", guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555);
+				Utils.drawStringCentered("enchant, perhaps", guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555);
+				Utils.drawStringCentered("it is on", guiLeft + 8 + 48, guiTop + 48, true, 0xffff5555);
+				Utils.drawStringCentered("another page?", 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
-				);
+				Utils.drawStringCentered("No applicable", guiLeft + 8 + 48, guiTop + 28, true, 0xffff5555);
+				Utils.drawStringCentered("enchants on", guiLeft + 8 + 48, guiTop + 38, true, 0xffff5555);
+				Utils.drawStringCentered("this page...", 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
-				);
+				Utils.drawStringCentered("Can't find that", guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555);
+				Utils.drawStringCentered("enchant, perhaps", guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555);
+				Utils.drawStringCentered("it is on", guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555);
+				Utils.drawStringCentered("another page?", 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
-				);
+				Utils.drawStringCentered("No removable", guiLeft + 248 + 48, guiTop + 28, true, 0xffff5555);
+				Utils.drawStringCentered("enchants on", guiLeft + 248 + 48, guiTop + 38, true, 0xffff5555);
+				Utils.drawStringCentered("this page...", guiLeft + 248 + 48, guiTop + 48, true, 0xffff5555);
 			}
 		}
 		//Available enchants (left)
@@ -836,50 +805,14 @@ public class GuiCustomEnchant extends Gui {
 				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
-			);
+			int levelWidth = fr.getStringWidth(levelStr);
+			fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+			fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+			fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+			fr.drawString(levelStr, guiLeft + 16 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+			fr.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
-			);
+			fr.drawString(ench.enchantName, guiLeft + 8 + 16 + 2 + textOffset, top + 4 + textOffset, 0xffffffdd, true);
 		}
 		GlScissorStack.pop(scaledResolution);
 
@@ -916,53 +849,26 @@ public class GuiCustomEnchant extends Gui {
 				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(
+			int levelWidth = fr.getStringWidth(levelStr);
+			fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+			fr.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
-			);
+			fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+			fr.drawString(levelStr, guiLeft + 256 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+			fr.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
-			);
+			fr.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(),
+		fr.drawString(
+			Minecraft.getMinecraft().thePlayer.inventory.getDisplayName().getUnformattedText(),
 			guiLeft + 102, guiTop + Y_SIZE - 96 + 2, 0x404040
 		);
 		int inventoryStartIndex = cc.getLowerChestInventory().getSizeInventory();
@@ -1003,7 +909,7 @@ public class GuiCustomEnchant extends Gui {
 				searchField.setPrependText("\u00a77Search...");
 			} else {
 				if (searchField.getFocus()) {
-					int len = Minecraft.getMinecraft().fontRendererObj.getStringWidth(searchField.getTextDisplay()) + 10;
+					int len = fr.getStringWidth(searchField.getTextDisplay()) + 10;
 					searchField.setSize(Math.max(90, len), 14);
 				} else {
 					searchField.setSize(90, 14);
@@ -1041,36 +947,12 @@ public class GuiCustomEnchant extends Gui {
 				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);
+			int levelWidth = fr.getStringWidth(levelStr);
+			fr.drawString(levelStr, left + 8 - levelWidth / 2 - 1, top + 4, 0x2d2102, false);
+			fr.drawString(levelStr, left + 8 - levelWidth / 2 + 1, top + 4, 0x2d2102, false);
+			fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4 - 1, 0x2d2102, false);
+			fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4 + 1, 0x2d2102, false);
+			fr.drawString(levelStr, left + 8 - levelWidth / 2, top + 4, colour, false);
 
 			//Enchant name
 			String name = WordUtils.capitalizeFully(ItemUtils
@@ -1085,14 +967,7 @@ public class GuiCustomEnchant extends Gui {
 			} else if (name.equalsIgnoreCase("Luck of the Sea")) {
 				name = "Luck of Sea";
 			}
-			Utils.drawStringCentered(
-				name,
-				Minecraft.getMinecraft().fontRendererObj,
-				guiLeft + X_SIZE / 2,
-				top + 8,
-				true,
-				0xffffffdd
-			);
+			Utils.drawStringCentered(name, guiLeft + X_SIZE / 2, top + 8, true, 0xffffffdd);
 
 			if (isChangingEnchLevel) {
 				Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
@@ -1105,42 +980,12 @@ public class GuiCustomEnchant extends Gui {
 			//Enchant level
 			levelStr = "" + enchanterCurrentEnch.level;
 			if (enchanterCurrentEnch.xpCost < 0) levelStr = "?";
-			levelWid