From 160d4bebf8a455e08311e869326a84f6d600ead1 Mon Sep 17 00:00:00 2001
From: nopo <nopotheemail@gmail.com>
Date: Sun, 12 Mar 2023 11:01:24 +1100
Subject: fix merge conflict

---
 .../moulberry/notenoughupdates/util/Utils.java     | 35 ----------------------
 1 file changed, 35 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
index fed05473..e3d52fe7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Utils.java
@@ -1522,20 +1522,6 @@ public class Utils {
 			Minecraft.getMinecraft().fontRendererObj
 		);
 	}
-
-	@Deprecated
-	public static void drawHoveringText(
-		List<String> textLines,
-		final int mouseX,
-		final int mouseY,
-		final int screenWidth,
-		final int screenHeight,
-		final int maxTextWidth,
-		FontRenderer font
-	) {
-		drawHoveringText(textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, font, true);
-	}
-
 	public static JsonObject getConstant(String constant, Gson gson) {
 		return getConstant(constant, gson, JsonObject.class);
 	}
@@ -1669,27 +1655,6 @@ public class Utils {
 		scrollY.resetTimer();
 	}
 
-	public static void drawHoveringText(
-		List<String> textLines,
-		final int mouseX,
-		final int mouseY,
-		final int screenWidth,
-		final int screenHeight,
-		final int maxTextWidth,
-		boolean coloured
-	) {
-		drawHoveringText(
-			textLines,
-			mouseX,
-			mouseY,
-			screenWidth,
-			screenHeight,
-			maxTextWidth,
-			Minecraft.getMinecraft().fontRendererObj,
-			coloured
-		);
-	}
-
 	@Deprecated
 	public static void drawHoveringText(
 		List<String> textLines,
-- 
cgit