PR Fixes

6 files changed, 34 insertions, 52 deletions

diff --git a/README.md b/README.md
index b28600a..c3478b0 100644
--- a/README.md
+++ b/README.md
@@ -120,35 +120,6 @@ Discord Server: https://discord.gg/QsEkNQS
 <details>
 <summary>Keybinds</summary>
 
-<details>
-  <summary>Warps</summary>
-### Warps
-
-Shortcut commands that save you the time of typing the whole warp command.
- - /deep - Warps you to the Deep Caverns.
- - /nether - Warps you to the Crimson Isle.
- - /isle - Warps you to the Crimson Isle.
- - /crimson - Warps you to the Crimson Isle.
- - /mines - Warps you to the Dwarven Mines.
- - /forge - Warps you to the Dwarven Forge.
- - /crystals - Warps you to the Crystal Hollows.
- - /gold - Warps you to the Gold Mine.
- - /desert - Warps you to the Desert.
- - /spider - Warps you to the Spiders Den.
- - /barn - Warps you to the Barn.
- - /end - Warps you to the End.
- - /park - Warps you to the Park.
- - /castle - Warps you to the Hub Castle.
- - /da - Warps you to the Dark Auction.
- - /crypt - Warps you to the Crypt in the Hub.
- - /nest - Warps you to the top of the Spider's Den.
- - /void - Warps you to the Void Sepulture in the End.
- - /drag - Warps you to the Dragons Nest in the End.
- - /jungle - Warps you to the Jungle.
- - /howl - Warps you to the Howling Cave in the Park.
- - /dun - Warps you to the Dungeon Hub.
-</details>
-
 ## Keybinds
 - Open Maddox menu - M by default.
 - Regular Ability - Numpad 4 by default.
@@ -156,6 +127,35 @@ Shortcut commands that save you the time of typing the whole warp command.
 </details>
 
 <details>
+<summary>Warps</summary>
+
+## Warps
+Shortcut commands that save you the time of typing the whole warp command.
+- /deep - Warps you to the Deep Caverns.
+- /nether - Warps you to the Crimson Isle.
+- /isle - Warps you to the Crimson Isle.
+- /crimson - Warps you to the Crimson Isle.
+- /mines - Warps you to the Dwarven Mines.
+- /forge - Warps you to the Dwarven Forge.
+- /crystals - Warps you to the Crystal Hollows.
+- /gold - Warps you to the Gold Mine.
+- /desert - Warps you to the Desert.
+- /spider - Warps you to the Spiders Den.
+- /barn - Warps you to the Barn.
+- /end - Warps you to the End.
+- /park - Warps you to the Park.
+- /castle - Warps you to the Hub Castle.
+- /da - Warps you to the Dark Auction.
+- /crypt - Warps you to the Crypt in the Hub.
+- /nest - Warps you to the top of the Spider's Den.
+- /void - Warps you to the Void Sepulture in the End.
+- /drag - Warps you to the Dragons Nest in the End.
+- /jungle - Warps you to the Jungle.
+- /howl - Warps you to the Howling Cave in the Park.
+- /dun - Warps you to the Dungeon Hub.
+</details>
+
+<details>
 <summary>Custom Music</summary>
 
 ## Custom Music
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 73c996b..1bbaf89 100644
--- a/src/main/java/me/Danker/DankersSkyblockMod.java
+++ b/src/main/java/me/Danker/DankersSkyblockMod.java
@@ -137,6 +137,7 @@ public class DankersSkyblockMod {
         MinecraftForge.EVENT_BUS.register(new HidePetCandy());
         MinecraftForge.EVENT_BUS.register(new HidePlayerArmour());
         MinecraftForge.EVENT_BUS.register(new HideTooltipsInExperiments());
+        MinecraftForge.EVENT_BUS.register(new HighlightCommissions());
         MinecraftForge.EVENT_BUS.register(new HighlightSkeletonMasters());
         MinecraftForge.EVENT_BUS.register(new IceWalkSolver());
         MinecraftForge.EVENT_BUS.register(new LividSolver());
@@ -167,7 +168,7 @@ public class DankersSkyblockMod {
         MinecraftForge.EVENT_BUS.register(new UpdateChecker());
         MinecraftForge.EVENT_BUS.register(new WatcherReadyAlert());
         MinecraftForge.EVENT_BUS.register(new WaterSolver());
-        MinecraftForge.EVENT_BUS.register(new HighlightCommissions());
+
         MinecraftForge.EVENT_BUS.register(new LootDisplay());
         MinecraftForge.EVENT_BUS.register(new LootTracker());
         MinecraftForge.EVENT_BUS.register(new BlazeTracker());
diff --git a/src/main/java/me/Danker/features/CustomMusic.java b/src/main/java/me/Danker/features/CustomMusic.java
index 38e4ba0..01279fd 100644
--- a/src/main/java/me/Danker/features/CustomMusic.java
+++ b/src/main/java/me/Danker/features/CustomMusic.java
@@ -2,7 +2,6 @@ package me.Danker.features;
 
 import me.Danker.DankersSkyblockMod;
 import me.Danker.commands.ToggleCommand;
-import me.Danker.events.ModInitEvent;
 import me.Danker.events.PostConfigInitEvent;
 import me.Danker.handlers.ScoreboardHandler;
 import me.Danker.utils.Utils;
diff --git a/src/main/java/me/Danker/features/HighlightCommissions.java b/src/main/java/me/Danker/features/HighlightCommissions.java
index f59951a..3bf1cb2 100644
--- a/src/main/java/me/Danker/features/HighlightCommissions.java
+++ b/src/main/java/me/Danker/features/HighlightCommissions.java
@@ -2,13 +2,12 @@ package me.Danker.features;
 
 import me.Danker.commands.ToggleCommand;
 import me.Danker.events.GuiChestBackgroundDrawnEvent;
-import me.Danker.handlers.ConfigHandler;
+import me.Danker.utils.RenderUtils;
 import me.Danker.utils.Utils;
 import net.minecraft.inventory.Slot;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.item.ItemWritableBook;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-import org.lwjgl.util.Color;
 import java.util.List;
 
 public class HighlightCommissions {
@@ -27,7 +26,7 @@ public class HighlightCommissions {
             if (slot.getStack().getItem() instanceof ItemWritableBook) {
                 for (String line : Utils.getItemLore(slot.getStack())) {
                     if (line.contains("COMPLETED")) {
-                        Utils.drawOnSlot(event.chestSize, slot.xDisplayPosition, slot.yDisplayPosition, HIGHLIGHT_COLOUR + 0xD7000000);
+                        RenderUtils.drawOnSlot(event.chestSize, slot.xDisplayPosition, slot.yDisplayPosition, HIGHLIGHT_COLOUR + 0xD7000000);
                         break;
                     }
                 }
diff --git a/src/main/java/me/Danker/gui/DankerGui.java b/src/main/java/me/Danker/gui/DankerGui.java
index 06c50d0..9a8d283 100644
--- a/src/main/java/me/Danker/gui/DankerGui.java
+++ b/src/main/java/me/Danker/gui/DankerGui.java
@@ -14,7 +14,6 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.client.gui.*;
 import net.minecraft.util.StringUtils;
 
 import java.awt.*;
diff --git a/src/main/java/me/Danker/utils/Utils.java b/src/main/java/me/Danker/utils/Utils.java
index deb5018..8791a43 100644
--- a/src/main/java/me/Danker/utils/Utils.java
+++ b/src/main/java/me/Danker/utils/Utils.java
@@ -10,8 +10,6 @@ import me.Danker.handlers.ConfigHandler;
 import me.Danker.handlers.ScoreboardHandler;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityItemFrame;
@@ -22,7 +20,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.util.*;
-import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
 import java.util.List;
@@ -509,19 +506,6 @@ public class Utils {
     	return (Math.floor(level / 2D) + 25) / 100D;
 	}
 
-	public static void drawOnSlot(int size, int xSlotPos, int ySlotPos, int colour) {
-		ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft());
-		int guiLeft = (sr.getScaledWidth() - 176) / 2;
-		int guiTop = (sr.getScaledHeight() - 222) / 2;
-		int x = guiLeft + xSlotPos;
-		int y = guiTop + ySlotPos;
-		// Move down when chest isn't 6 rows
-		if (size != 90) y += (6 - (size - 36) / 9) * 9;
-
-		GL11.glTranslated(0, 0, 1);
-		Gui.drawRect(x, y, x + 16, y + 16, colour);
-		GL11.glTranslated(0, 0, -1);
-
 	public static void desktopNotification(String name, String title, String text, TrayIcon.MessageType messageType) {
 		try {
 			final SystemTray tray = SystemTray.getSystemTray();