PRE21

58 files changed, 1655 insertions, 584 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index 710561f8..adf204d1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -169,6 +169,10 @@ public class NEUEventListener {
             } else {
                 itemPreloader.shutdown();
             }
+
+            for(TextOverlay overlay : OverlayManager.textOverlays) {
+                overlay.shouldUpdateFrequent = true;
+            }
         }
 
         boolean longUpdate = false;
@@ -183,9 +187,6 @@ public class NEUEventListener {
         DungeonWin.tick();
         FlyFix.tick();
 
-        for(TextOverlay overlay : OverlayManager.textOverlays) {
-            overlay.shouldUpdateFrequent = true;
-        }
 
         if(longUpdate) {
             /*for(Entity entity : Minecraft.getMinecraft().theWorld.loadedEntityList) {
@@ -204,11 +205,11 @@ public class NEUEventListener {
             ProfileApiSyncer.getInstance().tick();
             DamageCommas.tick();
             BackgroundBlur.markDirty();
-            if(neu.config.overlay.enablePetInfo || neu.config.treecap.enableMonkeyCheck || neu.config.notifications.showWrongPetMsg){
-                PetInfo.longTick();
-            }
-            for(TextOverlay overlay : OverlayManager.textOverlays) {
-                overlay.tick();
+
+            if(neu.hasSkyblockScoreboard()) {
+                for(TextOverlay overlay : OverlayManager.textOverlays) {
+                    overlay.tick();
+                }
             }
             if(TradeWindow.hypixelTradeWindowActive()) {
                 for(int i=0; i<16; i++) {
@@ -416,7 +417,7 @@ public class NEUEventListener {
     @SubscribeEvent
     public void onRenderGameOverlayPost(RenderGameOverlayEvent.Post event) {
         long timeRemaining = 15000 - (System.currentTimeMillis() - notificationDisplayMillis);
-        if(event.type == RenderGameOverlayEvent.ElementType.ALL) {
+        if(neu.hasSkyblockScoreboard() && event.type == RenderGameOverlayEvent.ElementType.ALL) {
             DungeonWin.render(event.partialTicks);
             for(TextOverlay overlay : OverlayManager.textOverlays) {
                 if(OverlayManager.dontRenderOverlay != null && OverlayManager.dontRenderOverlay.isAssignableFrom(overlay.getClass())) {
@@ -470,7 +471,8 @@ public class NEUEventListener {
     AtomicBoolean missingRecipe = new AtomicBoolean(false);
     @SubscribeEvent
     public void onGuiOpen(GuiOpenEvent event) {
-        if(Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper &&
+        if((Minecraft.getMinecraft().currentScreen instanceof GuiScreenElementWrapper ||
+                Minecraft.getMinecraft().currentScreen instanceof GuiItemRecipe) &&
                 event.gui == null && !(Keyboard.getEventKeyState() && Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) &&
                 System.currentTimeMillis() - NotEnoughUpdates.INSTANCE.lastOpenedGui < 500) {
             NotEnoughUpdates.INSTANCE.lastOpenedGui = 0;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 7a43235a..a87d266a 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -99,7 +99,7 @@ public class NEUOverlay extends Gui {
     private InfoPane activeInfoPane = null;
 
     private TreeSet<JsonObject> searchedItems = null;
-    private JsonObject[] searchedItemsArr = null;
+    private final List<JsonObject> searchedItemsArr = new ArrayList<>();
 
     private HashMap<String, List<String>> searchedItemsSubgroup = new HashMap<>();
 
@@ -1227,7 +1227,9 @@ public class NEUOverlay extends Gui {
             this.searchedItems = searchedItems;
             this.searchedItemsSubgroup = searchedItemsSubgroup;
 
-            this.searchedItemsArr = null;
+            synchronized(this.searchedItemsArr) {
+                this.searchedItemsArr.clear();
+            }
 
             redrawItems = true;
         });
@@ -1237,18 +1239,15 @@ public class NEUOverlay extends Gui {
      * Returns an index-able array containing the elements in searchedItems.
      * Whenever searchedItems is updated in updateSearch(), the array is recreated here.
      */
-    public JsonObject[] getSearchedItems() {
+    public List<JsonObject> getSearchedItems() {
         if(searchedItems == null) {
             updateSearch();
-            return new JsonObject[0];
+            return new ArrayList<>();
         }
 
-        if(searchedItemsArr==null) {
-            searchedItemsArr = new JsonObject[searchedItems.size()];
-            int i=0;
-            for(JsonObject item : searchedItems) {
-                searchedItemsArr[i] = item;
-                i++;
+        if(searchedItems.size() > 0 && searchedItemsArr.size() == 0) {
+            synchronized(searchedItemsArr) {
+                searchedItemsArr.addAll(searchedItems);
             }
         }
         return searchedItemsArr;
@@ -1261,8 +1260,9 @@ public class NEUOverlay extends Gui {
     public JsonObject getSearchedItemPage(int index) {
         if(index < getSlotsXSize()*getSlotsYSize()) {
             int actualIndex = index + getSlotsXSize()*getSlotsYSize()*page;
-            if(actualIndex < getSearchedItems().length) {
-                return getSearchedItems()[actualIndex];
+            List<JsonObject> searchedItems = getSearchedItems();
+            if(actualIndex < searchedItems.size()) {
+                return searchedItems.get(actualIndex);
             } else {
                 return null;
             }
@@ -1352,8 +1352,8 @@ public class NEUOverlay extends Gui {
     }
 
     public int getMaxPages() {
-        if(getSearchedItems().length == 0) return 1;
-        return (int)Math.ceil(getSearchedItems().length/(float)getSlotsYSize()/getSlotsXSize());
+        if(getSearchedItems().size() == 0) return 1;
+        return (int)Math.ceil(getSearchedItems().size()/(float)getSlotsYSize()/getSlotsXSize());
     }
 
     public int getSearchBarYSize() {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index dea4d520..55ba7756 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -25,6 +25,7 @@ import io.github.moulberry.notenoughupdates.miscgui.NEUOverlayPlacements;
 import io.github.moulberry.notenoughupdates.options.NEUConfig;
 import io.github.moulberry.notenoughupdates.options.NEUConfigEditor;
 import io.github.moulberry.notenoughupdates.overlays.FuelBar;
+import io.github.moulberry.notenoughupdates.overlays.OverlayManager;
 import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
 import io.github.moulberry.notenoughupdates.profileviewer.PlayerStats;
 import io.github.moulberry.notenoughupdates.profileviewer.ProfileViewer;
@@ -38,6 +39,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
@@ -45,7 +47,6 @@ import net.minecraft.event.ClickEvent;
 import net.minecraft.event.HoverEvent;
 import net.minecraft.item.ItemMap;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.play.client.C13PacketPlayerAbilities;
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.scoreboard.Scoreboard;
 import net.minecraft.util.*;
@@ -77,8 +78,6 @@ import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Mod(modid = NotEnoughUpdates.MODID, version = NotEnoughUpdates.VERSION, clientSideOnly = true)
 public class NotEnoughUpdates {
@@ -669,6 +668,14 @@ public class NotEnoughUpdates {
         }
     });
 
+    SimpleCommand dnCommand = new SimpleCommand("dn", new SimpleCommand.ProcessCommandRunnable() {
+        @Override
+        public void processCommand(ICommandSender sender, String[] args) {
+            Minecraft.getMinecraft().thePlayer.sendChatMessage("/warp dungeon_hub");
+            Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.AQUA+"Warping to:"+EnumChatFormatting.YELLOW+" Deez Nuts lmao"));
+        }
+    });
+
     SimpleCommand viewCataCommand = new SimpleCommand("cata", new SimpleCommand.ProcessCommandRunnable() {
         @Override
         public void processCommand(ICommandSender sender, String[] args) {
@@ -879,7 +886,10 @@ public class NotEnoughUpdates {
     public void preinit(FMLPreInitializationEvent event) {
         INSTANCE = this;
 
-        if(Minecraft.getMinecraft().getSession().getPlayerID().equalsIgnoreCase("ea9b1c5a-bf68-4fa2-9492-2d4e69693228")) throw new RuntimeException("Ding-dong, racism is wrong.");
+        String uuid = Minecraft.getMinecraft().getSession().getPlayerID();
+        if(uuid.equalsIgnoreCase("ea9b1c5a-bf68-4fa2-9492-2d4e69693228")) throw new RuntimeException("Ding-dong, racism is wrong.");
+        if(uuid.equalsIgnoreCase("1f4bc571-783a-490a-8ef6-54d18bb72c7c")) throw new RuntimeException("Oops misclicked");
+        if(uuid.equalsIgnoreCase("784747a0-3ac9-4ad6-bc75-8cf1bc9d7080")) throw new RuntimeException("Oops did it again");
 
         neuDir = new File(event.getModConfigurationDirectory(), "notenoughupdates");
         neuDir.mkdirs();
@@ -917,7 +927,11 @@ public class NotEnoughUpdates {
         MinecraftForge.EVENT_BUS.register(new DwarvenMinesWaypoints());
         MinecraftForge.EVENT_BUS.register(new FuelBar());
         MinecraftForge.EVENT_BUS.register(XPInformation.getInstance());
-        MinecraftForge.EVENT_BUS.register(new PetInfo());
+        MinecraftForge.EVENT_BUS.register(OverlayManager.petInfoOverlay);
+
+        if(Minecraft.getMinecraft().getResourceManager() instanceof IReloadableResourceManager) {
+            ((IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(CustomSkulls.getInstance());
+        }
 
         ClientCommandHandler.instance.registerCommand(collectionLogCommand);
         ClientCommandHandler.instance.registerCommand(cosmeticsCommand);
@@ -930,6 +944,7 @@ public class NotEnoughUpdates {
         ClientCommandHandler.instance.registerCommand(viewProfileCommand);
         ClientCommandHandler.instance.registerCommand(viewProfileShortCommand);
         ClientCommandHandler.instance.registerCommand(dhCommand);
+        ClientCommandHandler.instance.registerCommand(dnCommand);
         if(!Loader.isModLoaded("skyblockextras")) ClientCommandHandler.instance.registerCommand(viewCataCommand);
         ClientCommandHandler.instance.registerCommand(peekCommand);
         ClientCommandHandler.instance.registerCommand(tutorialCommand);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java b/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java
index d23df8c3..b0f0bff3 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java
@@ -80,6 +80,7 @@ public class BackgroundBlur {
             }
             remove.remove((float)NotEnoughUpdates.INSTANCE.config.itemlist.bgBlurFactor);
 
+            lastBlurUse.keySet().removeAll(remove);
             blurOutput.keySet().removeAll(remove);
 
             requestedBlurs.clear();
@@ -165,11 +166,10 @@ public class BackgroundBlur {
                 //Corrupted shader?
                 return;
             }
-            if(blurFactor != lastBgBlurFactor) {
-                blurShaderHorz.getShaderManager().getShaderUniform("Radius").set(blurFactor);
-                blurShaderVert.getShaderManager().getShaderUniform("Radius").set(blurFactor);
-                lastBgBlurFactor = blurFactor;
-            }
+
+            blurShaderHorz.getShaderManager().getShaderUniform("Radius").set(blurFactor);
+            blurShaderVert.getShaderManager().getShaderUniform("Radius").set(blurFactor);
+
             GL11.glPushMatrix();
             /*GL30.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, Minecraft.getMinecraft().getFramebuffer().framebufferObject);
             GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, blurOutputVert.framebufferObject);
@@ -192,6 +192,7 @@ public class BackgroundBlur {
      */
     public static void renderBlurredBackground(float blurStrength, int screenWidth, int screenHeight,
                                                int x, int y, int blurWidth, int blurHeight) {
+        if(blurStrength < 0.5) return;
         requestedBlurs.add(blurStrength);
 
         if(!OpenGlHelper.isFramebufferEnabled() || !OpenGlHelper.areShadersSupported()) return;
@@ -200,6 +201,7 @@ public class BackgroundBlur {
 
         Framebuffer fb = blurOutput.get(blurStrength);
         if(fb == null) {
+            System.out.println("Blur not found:"+blurStrength);
             fb = blurOutput.values().iterator().next();
         }
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java
index 56dbe77d..b2f947d6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java
@@ -90,6 +90,9 @@ public class GuiElementTextField {
         return textField.getText();
     }
 
+    public void setFocus(boolean focus) {
+        this.focus = focus;
+    }
     public boolean getFocus() {
         return fo