init minion stuff

52 files changed, 2134 insertions, 272 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 6bf6d86b..2d457ee6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -60,6 +60,12 @@ import io.github.moulberry.notenoughupdates.miscgui.CalendarOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.InventoryStorageSelector;
 import io.github.moulberry.notenoughupdates.miscgui.SignCalculator;
 import io.github.moulberry.notenoughupdates.miscgui.TrophyRewardOverlay;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.MinionHelperManager;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.loaders.MinionHelperApiLoader;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.loaders.MinionHelperInventoryLoader;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.MinionHelperOverlay;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.loaders.MinionHelperRepoLoader;
+import io.github.moulberry.notenoughupdates.miscgui.minionhelper.MinionHelperTooltips;
 import io.github.moulberry.notenoughupdates.mixins.AccessorMinecraft;
 import io.github.moulberry.notenoughupdates.options.NEUConfig;
 import io.github.moulberry.notenoughupdates.overlays.FuelBar;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
index 7cca9d3b..faed1984 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/DevTestCommand.java
@@ -28,6 +28,7 @@ import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.Locati
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.SpecialBlockZone;
 import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.command.CommandException;
@@ -105,8 +106,7 @@ public class DevTestCommand extends ClientCommandBase {
 				Minecraft.getMinecraft().getNetHandler().getNetworkManager().closeChannel(component);
 				return;
 			}
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED +
-				DEV_FAIL_STRINGS[devFailIndex++]));
+			Utils.addChatMessage(EnumChatFormatting.RED + DEV_FAIL_STRINGS[devFailIndex++]);
 			return;
 		}
 		if (args.length >= 1 && args[0].equalsIgnoreCase("profileinfo")) {
@@ -159,18 +159,16 @@ public class DevTestCommand extends ClientCommandBase {
 		}
 		if (args.length == 1 && args[0].equalsIgnoreCase("searchmode")) {
 			NotEnoughUpdates.INSTANCE.config.hidden.firstTimeSearchFocus = true;
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA +
-				"I would never search"));
+			Utils.addChatMessage(EnumChatFormatting.AQUA + "I would never search");
 			return;
 		}
 		if (args.length == 2 && args[0].equalsIgnoreCase("openGui")) {
 			try {
 				NotEnoughUpdates.INSTANCE.openGui = (GuiScreen) Class.forName(args[1]).newInstance();
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-					"Opening gui: " + NotEnoughUpdates.INSTANCE.openGui));
+				Utils.addChatMessage("Opening gui: " + NotEnoughUpdates.INSTANCE.openGui);
 			} catch (InstantiationException | IllegalAccessException | ClassNotFoundException | ClassCastException e) {
 				e.printStackTrace();
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Failed to open this gui."));
+				Utils.addChatMessage("Failed to open this gui.");
 			}
 		}
 		if (args.length == 1 && args[0].equalsIgnoreCase("center")) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.java
index e1504472..1d30a15f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/PackDevCommand.java
@@ -22,6 +22,7 @@ package io.github.moulberry.notenoughupdates.commands.dev;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
 import io.github.moulberry.notenoughupdates.core.util.MiscUtils;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.command.CommandException;
@@ -290,11 +291,10 @@ public class PackDevCommand extends ClientCommandBase {
 			}
 
 			if ((single && closest == null) || (!single && result.length() == 0)) {
-				mc.thePlayer.addChatMessage(new ChatComponentText(
-					EnumChatFormatting.RED + "No " + typeFriendlyName + "s found within " + dist + " blocks."));
+				Utils.addChatMessage(EnumChatFormatting.RED + "No " + typeFriendlyName + "s found within " + dist + " blocks.");
 			} else {
-				mc.thePlayer.addChatMessage(new ChatComponentText(
-					EnumChatFormatting.GREEN + "Copied " + typeFriendlyName + " data to clipboard"));
+				Utils.addChatMessage(
+					EnumChatFormatting.GREEN + "Copied " + typeFriendlyName + " data to clipboard");
 				return single ? livingBaseDataBuilder(closest, clazz) : result;
 			}
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
index 756afc88..b03e7f05 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dev/StatsCommand.java
@@ -24,11 +24,11 @@ import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
 import io.github.moulberry.notenoughupdates.util.DiscordMarkdownBuilder;
 import io.github.moulberry.notenoughupdates.util.HastebinUploader;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.BlockPos;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.fml.common.Loader;
@@ -118,10 +118,8 @@ public class StatsCommand extends ClientCommandBase {
 	}
 
 	private static void modPrefixedMessage(String message) {
-		Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-			EnumChatFormatting.GOLD + "[" + EnumChatFormatting.RED + "NotEnoughUpdates" + EnumChatFormatting.GOLD + "]: " +
-				message));
-
+		Utils.addChatMessage(
+			EnumChatFormatting.GOLD + "[" + EnumChatFormatting.RED + "NotEnoughUpdates" + EnumChatFormatting.GOLD + "]: " + message);
 	}
 
 	private static String createStats() {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/DnCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/DnCommand.java
index a5a7bcca..3b697905 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/DnCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/DnCommand.java
@@ -20,10 +20,10 @@
 package io.github.moulberry.notenoughupdates.commands.dungeon;
 
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 
 public class DnCommand extends ClientCommandBase {
@@ -35,7 +35,6 @@ public class DnCommand extends ClientCommandBase {
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
 		Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp dungeon_hub");
-		Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-			EnumChatFormatting.AQUA + "Warping to:" + EnumChatFormatting.YELLOW + " Deez Nuts lmao"));
+		Utils.addChatMessage(EnumChatFormatting.AQUA + "Warping to:" + EnumChatFormatting.YELLOW + " Deez Nuts lmao");
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/JoinDungeonCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/JoinDungeonCommand.java
index d69f86f3..5916bb61 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/JoinDungeonCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/JoinDungeonCommand.java
@@ -21,10 +21,10 @@ package io.github.moulberry.notenoughupdates.commands.dungeon;
 
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.StringUtils;
 
@@ -40,19 +40,16 @@ public class JoinDungeonCommand extends ClientCommandBase {
 			Minecraft.getMinecraft().thePlayer.sendChatMessage("/join " + StringUtils.join(args, " "));
 		} else {
 			if (args.length != 1) {
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-					EnumChatFormatting.RED + "Example Usage: /join f7, /join m6 or /join 7"));
+				Utils.addChatMessage(EnumChatFormatting.RED + "Example Usage: /join f7, /join m6 or /join 7");
 			} else {
 				String cataPrefix = "catacombs";
 				if (args[0].startsWith("m")) {
 					cataPrefix = "master_catacombs";
 				}
 				String cmd = "/joindungeon " + cataPrefix + " " + args[0].charAt(args[0].length() - 1);
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-					EnumChatFormatting.YELLOW + "Running command: " + cmd));
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-					EnumChatFormatting.YELLOW +
-						"The dungeon should start soon. If it doesn't, make sure you have a party of 5 people"));
+				Utils.addChatMessage(EnumChatFormatting.YELLOW + "Running command: " + cmd);
+				Utils.addChatMessage(EnumChatFormatting.YELLOW +
+					"The dungeon should start soon. If it doesn't, make sure you have a party of 5 people");
 				Minecraft.getMinecraft().thePlayer.sendChatMessage(cmd);
 			}
 		}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
index 83db26bb..807fcc27 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
@@ -24,6 +24,7 @@ import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
 import io.github.moulberry.notenoughupdates.dungeons.GuiDungeonMapEditor;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandException;
@@ -51,8 +52,9 @@ public class MapCommand extends ClientCommandBase {
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
 		if (!NotEnoughUpdates.INSTANCE.config.hidden.dev) {
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-				EnumChatFormatting.RED + "[NEU] The map does not work right now. You can use the map from other mods, for example: SkyblockAddons, DungeonsGuide or Skytils."));
+			Utils.addChatMessage(
+				EnumChatFormatting.RED +
+					"[NEU] The map does not work right now. You can use the map from other mods, for example: SkyblockAddons, DungeonsGuide or Skytils.");
 			return;
 		}
 
@@ -133,8 +135,7 @@ public class MapCommand extends ClientCommandBase {
 					e.printStackTrace();
 				}
 
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN +
-					"Saved to file."));
+				Utils.addChatMessage(EnumChatFormatting.GREEN + "Saved to file.");
 			}
 
 			return;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/help/FeaturesCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/help/FeaturesCommand.java
index 5f709c4f..bc389ad4 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/help/FeaturesCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/help/FeaturesCommand.java
@@ -41,18 +41,9 @@ public class FeaturesCommand extends ClientCommandBase {
 
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
-		Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
+		Utils.addChatMessage("");
 		if (Constants.MISC == null || !Constants.MISC.has("featureslist")) {
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-				"" + EnumChatFormatting.DARK_RED + EnumChatFormatting.BOLD + "WARNING: " + EnumChatFormatting.RESET +
-					EnumChatFormatting.RED + "Could not load URL from repo."));
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-				"" + EnumChatFormatting.RED + "Please run " + EnumChatFormatting.BOLD + "/neuresetrepo" +
-					EnumChatFormatting.RESET + EnumChatFormatting.RED + " and " + EnumChatFormatting.BOLD + "restart your game" +
-					EnumChatFormatting.RESET + EnumChatFormatting.RED + " in order to fix. " + EnumChatFormatting.DARK_RED +
-					EnumChatFormatting.BOLD + "If that doesn't fix it" + EnumChatFormatting.RESET + EnumChatFormatting.RED +
-					", please join discord.gg/moulberry and post in #neu-support"));
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
+			Utils.showOutdatedRepoNotification();
 			return;
 		}
 		String url = Constants.MISC.get("featureslist").getAsString();
@@ -60,9 +51,8 @@ public class FeaturesCommand extends ClientCommandBase {
 		Desktop desk = Desktop.getDesktop();
 		try {
 			desk.browse(new URI(url));
-			Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(
-				EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.BOLD + "NEU" + EnumChatFormatting.RESET +
-					EnumChatFormatting.GOLD + "> Opening Feature List in browser."));
+			Utils.addChatMessage(				EnumChatFormatting.DARK_PURPLE + "" + EnumChatFormatting.BOLD + "NEU" + EnumChatFormatting.RESET +
+				EnumChatFormatting.GOLD + "> Opening Feature List in browser.");
 		} catch (URISyntaxException | IOException ignored) {
 
 			ChatComponentText clickTextFeatures = new ChatComponentText(
@@ -72,6 +62,6 @@ public class FeaturesCommand extends ClientCommandBase {
 			Minecraft.getMinecraft().thePlayer.addChatMessage(clickTextFeatures);
 
 		}
-		Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(""));
+		Utils.addChatMessage("");
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.java
index 7655f561..86699b79 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/help/HelpCommand.java
@@ -22,9 +22,8 @@ package io.github.moulberry.notenoughupdates.commands.help;
 import com.google.common.collect.Lists;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.commands.ClientCommandBase;
-import net.minecraft.client.Minecraft