Merge branch 'master' into autoupdateautoupdate

69 files changed, 8574 insertions, 5882 deletions

diff --git a/.gitignore b/.gitignore
index 030ecff7..e02d8fc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ run
 .vscode
 infer-out/
 ciwork/
+.DS_STORE
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 77726499..c478982f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,6 +24,7 @@
 - Run the `gen<IntelliJ/Eclipse>Runs` gradle task. In IntelliJ that can be done in the gradle tab on the right side of your IDE.
 - Optionally, run the `genSources` gradle task.
 - Run the `Minecraft Client` to make sure that everything works.
+  - Note: if you are using OSX, remove the `XstartOnFirstThread` JVM option
 
 ## Logging into Hypixel in a development environment
 
diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 00000000..346beb63
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,34 @@
+# FAQ For NEU
+
+## What is this feature?
+
+### Equipment Overlay
+![Equipment Overlay](https://cdn.discordapp.com/attachments/756532125443817594/1006792213432389752/unknown.png)
+
+This overlay shows the current equipment of the player
+#### It doesn't fit in with my texture pack !!!!!
+[If you go to /neu equipment you can change the style of the overlay](https://cdn.discordapp.com/attachments/756532125443817594/1006796222415245413/unknown.png)
+This also applies to the pet inventory overlay
+
+
+## What does this mean?
+
+### Missing Repo Data
+![Missing Repo Data](https://cdn.discordapp.com/attachments/756532125443817594/1006805696639143987/unknown.png)
+
+If you get this popup you need to update your repo data.
+As the popup says, you can try `/neuresetrepo` but if that doesn't resolve the issue go to [#neu-support](https://discord.gg/moulberry) and ask for help
+
+## How do I?
+
+### Turn on fairy soul waypoints
+You can either [run `/neusouls`](https://cdn.discordapp.com/attachments/756532125443817594/1006808649471103046/unknown.png) for the help menu or [turn on the option in the first page of `/neu`](https://cdn.discordapp.com/attachments/756532125443817594/1006808594743840778/unknown.png)
+
+### Help I accidentally turned off the custom storage gui
+![enable storage gui](https://cdn.discordapp.com/attachments/756532125443817594/1006810880794710046/unknown.png)
+
+Simply go to `/neu storage` and turn on the first option
+
+### Move a GUI element 
+![Edit gui](https://cdn.discordapp.com/attachments/756532125443817594/1006811543356317797/unknown.png)
+Go to the second tab of `/neu` and here you will have all the gui elements you can move
diff --git a/README.md b/README.md
index 1dc49f19..4249abc8 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ NotEnoughUpdates (NEU) is a feature rich 1.8.9 Minecraft forge mod for Hypixel S
 ## Features
 
 - An [item list](https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO) containing information and recipes about every item in skyblock.
+- A dungeons minimap.
 - Dungeon loot profit checker.
 - Item overlays for Treecapitator, Builder's Wand, Block Zapper, and Bonemerang.
 - An in-game skyblock profile viewer accessed with `/pv [player]`.
diff --git a/Update Notes/2.1.md b/Update Notes/2.1.md
index 0b068ab3..c41b9ccb 100644
--- a/Update Notes/2.1.md
+++ b/Update Notes/2.1.md
@@ -34,6 +34,7 @@
   - Added total xp to catacombs level - efefury
   - Fixed minion tiers crafted by coop members not showing up in /pv - Lulonaut
   - Fixed crash in /pv when the player had a pet that is not saved in the repo - Lulonaut
+  - Added senither and lily weight - CrypticPlasma
 
 ### **Minor Changes:**
 
@@ -102,6 +103,8 @@
 - Added Trophy Reward Overlay - hannibal2
 - Add Auto-Updater (linux and scu only) - nea89
 - Added power stone feature - hannibal2
+- Added abiphone warning - hannibal2
+- Added blur limit at 100 - nopo
 
 
 ### **Bug Fixes:**
diff --git a/build.gradle.kts b/build.gradle.kts
index 3a2eb76c..581816e2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -171,6 +171,13 @@ tasks.shadowJar {
 
 tasks.assemble.get().dependsOn(remapJar)
 
+tasks.remapJar{
+
+		doLast{
+				println("Jar name :" + archiveFileName.get())
+		}
+}
+
 tasks.processResources {
 		filesMatching("mcmod.info") {
 				expand(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java
index 06321b53..3911396f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java
@@ -110,11 +110,11 @@ public class CustomItems {
 	 * SHAAAAAAAAAAAAAAAAAAME
 	 */
 
-	private static JsonObject create(String internalname, String itemid, String displayname, String... lore) {
+	private static JsonObject create(String internalname, String itemid, String displayName, String... lore) {
 		JsonObject json = new JsonObject();
 		json.addProperty("itemid", itemid);
 		json.addProperty("internalname", internalname);
-		json.addProperty("displayname", EnumChatFormatting.RED + displayname);
+		json.addProperty("displayname", EnumChatFormatting.RED + displayName);
 		JsonArray jsonlore = new JsonArray();
 		for (String line : lore) {
 			jsonlore.add(new JsonPrimitive(EnumChatFormatting.GRAY + line));
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index fddb56d6..4e5c5b7d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -207,7 +207,7 @@ public class NEUManager {
 	}
 
 	public CompletableFuture<Boolean> fetchRepository() {
-		return CompletableFuture.<Boolean>supplyAsync(() -> {
+		return CompletableFuture.supplyAsync(() -> {
 			try {
 				JsonObject currentCommitJSON = getJsonFromFile(new File(configLocation, "currentCommit.json"));
 
@@ -782,14 +782,14 @@ public class NEUManager {
 		if (itemMc != null) {
 			itemid = itemMc.getRegistryName();
 		}
-		String displayname = display.getString("Name");
+		String displayName = display.getString("Name");
 		String[] info = new String[0];
 		String clickcommand = "";
 
 		JsonObject item = new JsonObject();
 		item.addProperty("internalname", internalname);
 		item.addProperty("itemid", itemid);
-		item.addProperty("displayname", displayname);
+		item.addProperty("displayname", displayName);
 
 		if (tag != null && tag.hasKey("ExtraAttributes", 10)) {
 			NBTTagCompound ea = tag.getCompoundTag("ExtraAttributes");
@@ -1110,7 +1110,7 @@ public class NEUManager {
 	 * json files representing skyblock item data.
 	 */
 	public JsonObject createItemJson(
-		String internalname, String itemid, String displayname, String[] lore,
+		String internalname, String itemid, String displayName, String[] lore,
 		String crafttext, String infoType, String[] info,
 		String clickcommand, int damage, NBTTagCompound nbttag
 	) {
@@ -1118,7 +1118,7 @@ public class NEUManager {
 			new JsonObject(),
 			internalname,
 			itemid,
-			displayname,
+			displayName,
 			lore,
 			crafttext,
 			infoType,
@@ -1130,7 +1130,7 @@ public class NEUManager {
 	}
 
 	public JsonObject createItemJson(
-		JsonObject base, String internalname, String itemid, String displayname, String[] lore,
+		JsonObject base, String internalname, String itemid, String displayName, String[] lore,
 		String crafttext, String infoType, String[] info,
 		String clickcommand, int damage, NBTTagCompound nbttag
 	) {
@@ -1141,7 +1141,7 @@ public class NEUManager {
 		JsonObject json = gson.fromJson(gson.toJson(base, JsonObject.class), JsonObject.class);
 		json.addProperty("internalname", internalname);
 		json.addProperty("itemid", itemid);
-		json.addProperty("displayname", displayname);
+		json.addProperty("displayname", displayName);
 		json.addProperty("crafttext", crafttext);
 		json.addProperty("clickcommand", clickcommand);
 		json.addProperty("damage", damage);
@@ -1167,14 +1167,14 @@ public class NEUManager {
 	}
 
 	public boolean writeItemJson(
-		String internalname, String itemid, String displayname, String[] lore, String crafttext,
+		String internalname, String itemid, String displayName, String[] lore, String crafttext,
 		String infoType, String[] info, String clickcommand, int damage, NBTTagCompound nbttag
 	) {
 		return writeItemJson(
 			new JsonObject(),
 			internalname,
 			itemid,
-			displayname,
+			displayName,
 			lore,
 			crafttext,
 			infoType,
@@ -1186,14 +1186,14 @@ public class NEUManager {
 	}
 
 	public boolean writeItemJson(
-		JsonObject base, String internalname, String itemid, String displayname, String[] lore,
+		JsonObject base, String internalname, String itemid, String displayName, String[] lore,
 		String crafttext, String infoType, String[] info, String clickcommand, int damage, NBTTagCompound nbttag
 	) {
 		JsonObject json = createItemJson(
 			base,
 			internalname,
 			itemid,
-			displayname,
+			displayName,
 			lore,
 			crafttext,
 			infoType,
@@ -1486,11 +1486,11 @@ public class NEUManager {
 			if (useReplacements) {
 				replacements = getLoreReplacements(stack.getTagCompound(), -1);
 
-				String displayname = json.get("displayname").getAsString();
+				String displayName = json.get("displayname").getAsString();
 				for (Map.Entry<String, String> entry : replacements.entrySet()) {
-					displayname = displayname.replace("{" + entry.getKey() + "}", entry.getValue());
+					displayName = displayName.replace("{" + entry.getKey() + "}", entry.getValue());
 				}
-				stack.setStackDisplayName(displayname);
+				stack.setStackDisplayName(displayName);
 			}
 
 			if (json.has("lore")) {
@@ -1519,7 +1519,7 @@ public class NEUManager {
 		return NotEnoughUpdates.INSTANCE.manager
 			.fetchRepository()
 			.thenCompose(ignored -> NotEnoughUpdates.INSTANCE.manager.reloadRepository())
-			.<List<String>>thenApply(ignored -> {
+			.thenApply(ignored -> {
 				String newCommitHash = NotEnoughUpdates.INSTANCE.manager.latestRepoCommit;
 				String newCommitShortHash = (newCommitHash == null ? "MISSING" : newCommitHash.substring(0, 7));
 				return Arrays.asList(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 377cf7d3..19f5a780 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -36,9 +36,11 @@ import io.github.moulberry.notenoughupdates.mbgui.MBAnchorPoint;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiElement;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupAligned;
 import io.github.moulberry.notenoughupdates.mbgui.MBGuiGroupFloating;
+import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers;
 import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.SunTzu;
 import io.github.moulberry.notenoughupdates.miscgui.GuiPriceGraph;
+import io.github.moulberry.notenoughupdates.miscgui.NeuSearchCalculator;
 import io.github.moulberry.notenoughupdates.options.NEUConfigEditor;
 import io.github.moulberry.notenoughupdates.util.Constants;
 import io.github.moulberry.notenoughupdates.util.GuiTextures;
@@ -377,7 +379,7 @@ public class NEUOverlay extends Gui {
 				}
 
 				//Search bar text
-				fr.drawString(textField.getText(), (int) x + 5,
+				fr.drawString(NeuSearchCalculator.format(textField.getText()), (int) x + 5,
 					(int) y - 4 + getHeight() / 2, Color.WHITE.getRGB()
 				);
 
@@ -548,6 +550,7 @@ public class NEUOverlay extends Gui {
 			@Override
 			public void mouseClick(float x, float y, int mouseX, int mouseY) {
 				if (!NotEnoughUpdates.