PRE30

76 files changed, 616 insertions, 123 deletions

diff --git a/README.md b/README.md
index d8ced796..beab2116 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,79 @@
+<!-- markdownlint-disable-file MD033 -->
+<h1 align="center"> NotEnoughUpdates </h1>
 
-# NotEnoughUpdates Fork by DoKM
+<p align="center">
+    <!-- release -->
+    <a href="https://github.com/Moulberry/NotEnoughUpdates-REPO/releases/latest" target="_blank">
+        <img src="https://img.shields.io/github/v/release/Moulberry/NotEnoughUpdates-REPO?color=informational&include_prereleases&label=release&logo=github&logoColor=white" alt="release">
+    </a>
+    <!-- downloads -->
+    <!-- <a href="https://github.com/Moulberry/NotEnoughUpdates/releases" target="_blank">
+        <img src="https://img.shields.io/github/downloads/Moulberry/NotEnoughUpdates/total?logo=GitHub&color=informational" alt="downloads">
+    </a> -->
+    <!-- lines -->
+    <a href="https://github.com/Moulberry/NotEnoughUpdates/graphs/code-frequency" target="_blank">
+        <img src="https://img.shields.io/tokei/lines/github/Moulberry/NotEnoughUpdates?label=lines&color=informational&logo=GitHub" alt="lines">
+    </a>
+    <!-- license -->
+    <a href="https://github.com/Moulberry/NotEnoughUpdates-REPO/blob/master/LICENSE" target="_blank">
+        <img src="https://img.shields.io/badge/license-CC%20BY--NC%203.0-informational" alt="license">
+    </a>
+    <!-- contributors -->
+    <a href="https://github.com/Moulberry/NotEnoughUpdates/graphs/contributors" target="_blank">
+        <img src="https://img.shields.io/github/contributors/Moulberry/NotEnoughUpdates?color=informational&logo=GitHub" alt="contributors">
+    </a>
+    <!-- discord -->
+    <a href="https://discord.gg/moulberry" target="_blank">
+        <img src="https://img.shields.io/discord/516977525906341928?label=discord&color=informational&logo=Discord&logoColor=FFFFFF" alt="discord">
+    </a>
+    <!-- patreon -->
+    <a href="https://www.patreon.com/moulberry" target="_blank">
+        <img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dmoulberry%26type%3Dpatrons&logoColor=FFFFFF&color=informational" alt="patreon">
+    </a>
+</p>
 
-### Currently if you get a array out of bounds exception this is due to the todolist update
-Please go into .minecraft/config/notenoughupdates and then open the configNew.json in a text editor.
-In that file go to the "miscOverlays" section and find "todoText" and clear it.
+NotEnoughUpdates (NEU) is a feature rich 1.8.9 Minecraft forge mod for Hypixel Skyblock.
 
-This is a fork that I will try to keep updated with the original NEU repo while also adding features/fixing bugs etc.
+## Getting Started
 
-**Currently the added features are:**
+<u>**Installing Forge:**</u>
 
-1. More options for the Todo list
-2. Added the voidgloom slayer stats to the /pv
-3. Added Dungeon accesories to the accesory bag upgrade view
-4. Added Dungeon items to the itemlist categories (for example armors now include dungeon armors and weapons include dungeon weapons)
-5. Added check to see if titanium that spawned atleast touches 1 air block (toggleable)
-6. Added check so titanium alert doesnt happen if titanium commision is set to "DONE"
-7. Added Storage to PV (with correct sizes)
-8. Added Personal Vault to PV
+1. Run normal Minecraft 1.8.9 and once it reaches the title screen wait about 5 seconds and close it.
+2. Install Minecraft **1.8.9** forge from the [forge website](http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html)
+   - Once you click on the installer you'd like to download, a window will pop up. **Do not click on anything in the middle of your screen**; instead, click on the `skip ad` button towards the top right
+3. Open the installer, select install client, and click install
+4. When forge is installed, open the Minecraft launcher, go under the `installations tab`, click `new installation`, select the version release `1.8.9-forge1.8.9-11.15.1.xxxx` (it will usually be all the way towards the bottom).
+5. Once you are done, run this new installation that you just created. Once it reaches the title screen, wait about 5 seconds and close it.
 
-**Currently the fixed features are:**
+<u>**Installing the NotEnoughUpdates mod:**</u>
 
-1. Todo list
-	1. Fixed fetchur display
-	2. Fixed godpot timer
-	
-2. PV's wardrobe view not showing second page bottom row (not fully fixed could be better by dividing on every 4 and drawing per column instead of row but right now its always a full page)
-3. Made dwarven overlay work in crystal hollows
-4. Added Gemstone powder to dwarven overlay
-5. Made smooth aote work with aotv (thanks to 8k for letting me test his aotv)
-
-**Currently the fixed bugs are:**
-
-1. Arrow Key backpack option under storage gui not doing anything
-2. Fixed pets gui going away if you open /pets
+1. Download the latest mod [release](https://github.com/Moulberry/NotEnoughUpdates/releases). If it says `this file may harm your computer`, click `allow anyways` as all java files will be flagged by Chrome.
+2. Add the NEU mod:
+   - If you have java installed, double click the file, click `install`
+   - If not, press the windows key + R; type `%appdata%`; click on the folder called `.minecraft`; click on the folder called `mods` and drag the mods file in here.
+3. Open the Minecraft launcher and run your forge installation you set up earlier.
+4. Then, hop onto Skyblock and run the command `/api new`. Your api key is automatically filled out and all features should work.
+5. Type `/neu`. If you see the NotEnoughUpdates menu, you have done this correctly!
 
+*If you need further assistance feel free to join the [discord](https://discord.gg/moulberry) and ask for help in [#neu-support-1](discord://discord.com/channels/516977525906341928/714332750156660756)*
 
+## Features
 
+- An [item list](https://github.com/Moulberry/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]`.
+- Fully customizable enchant colors accessed with `/neuec [player]`.
+- Fairy soul waypoints accessed with `/neusouls`.
+- Customizable inventory command buttons accessed with `/neubuttons`.
+- The ability to change the line color of fishing rods.
+- Onscreen overlays for: Farming, Dwarven Mines, Pets, and the Accessory bag.
+- A custom auction house accessed with `/neuah`.
+- Solvers for: Enchanting and The Puzzler.
+- A custom Action House Search GUI.
+- A custom storage GUI.
+- A custom enchanting table GUI.
+- Slot Locking
+- Fishing Particle customization & alerts.
+- And much, much, more.
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4687f10d..780d1d02 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx2G
+org.gradle.java.home=C:/Program Files/Java/jdk1.8.0_181
\ No newline at end of file
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index 7fa81a59..c3cb4a73 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -270,7 +270,6 @@ public class NEUEventListener {
             FairySouls.tick();
             XPInformation.getInstance().tick();
             ProfileApiSyncer.getInstance().tick();
-            DamageCommas.tick();
             ItemCustomizeManager.tick();
             BackgroundBlur.markDirty();
             NPCRetexturing.getInstance().tick();
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 4f2e8a93..cfab28e0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -1052,7 +1052,7 @@ public class NotEnoughUpdates {
         }
     });
 
-    SimpleCommand customizeCommand = new SimpleCommand("neucustomize", new SimpleCommand.ProcessCommandRunnable() {
+    SimpleCommand.ProcessCommandRunnable customizeRunnable = new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             ItemStack held = Minecraft.getMinecraft().thePlayer.getHeldItem();
 
@@ -1070,7 +1070,10 @@ public class NotEnoughUpdates {
 
             openGui = new GuiItemCustomize(held, heldUUID);
         }
-    });
+    };
+
+    SimpleCommand customizeCommand = new SimpleCommand("neucustomize", customizeRunnable);
+    SimpleCommand customizeCommand2 = new SimpleCommand("neurename", customizeRunnable);
 
     SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
@@ -1195,6 +1198,7 @@ public class NotEnoughUpdates {
         ClientCommandHandler.instance.registerCommand(dhCommand);
         ClientCommandHandler.instance.registerCommand(dnCommand);
         ClientCommandHandler.instance.registerCommand(customizeCommand);
+        ClientCommandHandler.instance.registerCommand(customizeCommand2);
         ClientCommandHandler.instance.registerCommand(devTestCommand);
         ClientCommandHandler.instance.registerCommand(packDevCommand);
         if(!Loader.isModLoaded("skyblockextras")) ClientCommandHandler.instance.registerCommand(viewCataCommand);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
index 560cdf51..1ebf9937 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
@@ -14,6 +14,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.potion.Potion;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.client.event.RenderWorldEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
@@ -49,17 +50,84 @@ public class CapeManager {
 
     public JsonObject lastJsonSync = null;
 
-    private String[] capes = new String[]{"patreon1", "patreon2", "fade", "contrib", "nullzee",
+    public static class CapeData {
+        public String capeName;
+        public boolean special;
+        public boolean hidden;
+
+        public boolean canShow() {
+            return !special && !hidden;
+        }
+
+        public CapeData(String capeName, boolean special, boolean hidden) {
+            this.capeName = capeName;
+            this.special = special;
+            this.hidden = hidden;
+        }
+    }
+
+    public CapeData[] capes = new CapeData[]{
+            //Content Creator
+        new CapeData("jakethybro", false, true),
+        new CapeData("krusty", false, true),
+        new CapeData("krusty_day", false, true),
+        new CapeData("krusty_sunset", false, true),
+        new CapeData("krusty_night", false, true),
+        new CapeData("zera", false, true),
+        new CapeData("soldier", false, true),
+        new CapeData("alexxoffi", false, false),
+
+            //Patreon
+        new CapeData("patreon1", false, false),
+        new CapeData("patreon2", false, false),
+        new CapeData("fade", false, false),
+        new CapeData("space", false, false),
+        new CapeData("mcworld", false, false),
+        new CapeData("negative", false, false),
+        new CapeData("void", false, false),
+        new CapeData("lava", false, false),
+        new CapeData("tunnel", false, false),
+        new CapeData("planets", false, false),
+
+            //Admins
+        new CapeData("nullzee", true, false),
+        new CapeData("ironmoon", true, false),
+        new CapeData("gravy", true, false),
+
+            //Partner
+        new CapeData("thebakery", true, false),
+        new CapeData("furf", true, false),
+        new CapeData("dsm", true, false),
+        new CapeData("skyclient", true, false),
+        new CapeData("subreddit_dark", true, false),
+        new CapeData("subreddit_light", true, false),
+        new CapeData("packshq", true, false),
+        new CapeData("skytils", true, false),
+
+            //Special Other
+        new CapeData("contrib", true, false),
+        new CapeData("mbstaff", true, false)
+    };
+
+    /*private String[] capes = new String[]{"patreon1", "patreon2", "fade", "contrib", "nullzee",
             "gravy", "space", "mcworld", "lava", "packshq", "mbstaff", "thebakery", "negative",
             "void", "ironmoon", "krusty", "furf", "soldier", "dsm", "zera", "tunnel", "alexxoffi", "parallax", "jakethybro", "planets", "skytils" };
-    public Boolean[] specialCapes = new Boolean[]{ true, true, false, true, true,
+    public Boolean[] specialCapes = new Boolean[] {true, true, false, true, true,
             true, false, false, false, true, true, true, false,
-            false, true, false, true, true, true, true, false, true, true, true, true, true };
+            false, true, false, true, true, true, true, false, true, true, true, true, true };*/
 
     public static CapeManager getInstance() {
         return INSTANCE;
     }
 
+    public void tryUnlockCape(String unlock) {
+        for(CapeData data : capes) {
+            if(data.capeName.equalsIgnoreCase(unlock)) {
+                data.hidden = false;
+            }
+        }
+    }
+
     public void tick() {
         long currentTime = System.currentTimeMillis();
         if(currentTime - lastCapeUpdate > 60*1000) {
@@ -227,7 +295,7 @@ public class CapeManager {
             }
             if(uuid.equals(clientUuid) && localCape != null && localCape.getRight() != null && !localCape.getRight().equals("null")) {
                 localCape.getLeft().onRenderPlayer(e);
-            } else if(capeMap.containsKey(uuid)) {
+            } else if(!Minecraft.getMinecraft().thePlayer.isPotionActive(Potion.blindness) && capeMap.containsKey(uuid)) {
                 capeMap.get(uuid).getLeft().onRenderPlayer(e);
             }
         } catch(Exception ignored) {}
@@ -301,7 +369,7 @@ public class CapeManager {
         }
     }
 
-    public String[] getCapes() {
+    public CapeData[] getCapes() {
         return capes;
     }
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/GuiCosmetics.java b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/GuiCosmetics.java
index 164dfeb8..31eaccb1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/GuiCosmetics.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates