finish enchant gui

17 files changed, 333 insertions, 155 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index 766c5a2f..e0a36686 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -966,21 +966,6 @@ public class NEUEventListener {
             GuiChest eventGui = (GuiChest) guiScreen;
             ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
             containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-            if(containerName.contains(" Profile") && cc.inventorySlots.size() >= 54){
-                if(cc.inventorySlots.get(22).getStack() != null && cc.inventorySlots.get(22).getStack().getTagCompound() != null){
-                    NBTTagCompound tag = eventGui.inventorySlots.inventorySlots.get(22).getStack().getTagCompound();
-                    if(tag.hasKey("SkullOwner") && tag.getCompoundTag("SkullOwner").hasKey("Name")){
-                        String tagName = tag.getCompoundTag("SkullOwner").getString("Name");
-                        String displayname = Utils.cleanColour(cc.inventorySlots.get(22).getStack().getDisplayName());
-                        if(tagName.equals(displayname.substring(displayname.length()-tagName.length()))){
-                            Slot slot = new Slot(cc.getLowerChestInventory(), 42, cc.inventorySlots.get(42).xDisplayPosition, cc.inventorySlots.get(42).yDisplayPosition);
-                            slot.putStack(Utils.createItemStack(Item.getItemFromBlock(Blocks.command_block), EnumChatFormatting.GREEN + "Profile Viewer",
-                                    EnumChatFormatting.YELLOW + "Click to open NEU profile viewer!"));
-                            cc.inventorySlots.set(42, slot);
-                        }
-                    }
-                }
-            }
         }
 
         if(GuiCustomEnchant.getInstance().shouldOverride(containerName)) {
@@ -1444,8 +1429,8 @@ public class NEUEventListener {
             GuiChest eventGui = (GuiChest) guiScreen;
             ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
             containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
-            if(containerName.contains(" Profile") && eventGui.getSlotUnderMouse() != null &&
-                    eventGui.getSlotUnderMouse().getSlotIndex() == 42 && Mouse.getEventButton() >= 0) {
+            if(containerName.contains(" Profile") && eventGui.isMouseOverSlot(cc.inventorySlots.get(42), mouseX, mouseY)
+                    && Mouse.getEventButton() >= 0) {
                 event.setCanceled(true);
                 if(Mouse.getEventButtonState() && eventGui.inventorySlots.inventorySlots.get(22).getStack() != null &&
                         eventGui.inventorySlots.inventorySlots.get(22).getStack().getTagCompound() != null){
@@ -1862,7 +1847,6 @@ public class NEUEventListener {
         int index = 0;
         List<String> newTooltip = new ArrayList<>();
 
-
         for(String line : event.toolTip) {
             if(line.endsWith(EnumChatFormatting.DARK_GRAY+"Reforge Stone") && NotEnoughUpdates.INSTANCE.config.tooltipTweaks.showReforgeStats) {
                 JsonObject reforgeStones = Constants.REFORGESTONES;
@@ -2410,7 +2394,6 @@ public class NEUEventListener {
 
     private void onItemToolTipInternalNameNull(ItemTooltipEvent event){
         petToolTipXPExtendPetMenu(event);
-
     }
 
     private List<String> petToolTipXPExtend(ItemTooltipEvent event) {
@@ -2423,7 +2406,6 @@ public class NEUEventListener {
             }
             //7 is just a random number i chose, prob no pets with less lines than 7
             if (event.toolTip.size() > 7) {
-
                 if (Utils.cleanColour(event.toolTip.get(1)).matches("((Farming)|(Combat)|(Fishing)|(Mining)|(Foraging)|(Enchanting)|(Alchemy)) ((Mount)|(Pet)).*")) {
 
                     GuiProfileViewer.PetLevel petlevel = null;
@@ -2443,8 +2425,6 @@ public class NEUEventListener {
                         }
                     }
 
-
-
                     if (petlevel != null) {
                         tooltipText.add("");
                         if(petlevel.totalXp > petlevel.maxXP) {
@@ -2453,7 +2433,8 @@ public class NEUEventListener {
                             tooltipText.add(EnumChatFormatting.GRAY+"Progress to Level "+(int)Math.floor(petlevel.level+1)+": "+EnumChatFormatting.YELLOW+Utils.round(petlevel.levelPercentage*100, 1)+"%");
                             int levelpercentage = Math.round(petlevel.levelPercentage*20);
                             tooltipText.add(EnumChatFormatting.DARK_GREEN+String.join("", Collections.nCopies(levelpercentage, "-"))+EnumChatFormatting.WHITE+String.join("", Collections.nCopies(20-levelpercentage, "-")));
-                            tooltipText.add(EnumChatFormatting.YELLOW + "" + myFormatter.format(petlevel.levelXp) + "/" + myFormatter.format(petlevel.currentLevelRequirement) + " EXP");
+                            tooltipText.add(EnumChatFormatting.GRAY + "EXP: " + EnumChatFormatting.YELLOW  + myFormatter.format(petlevel.levelXp) +
+                                    EnumChatFormatting.GOLD + "/" + EnumChatFormatting.YELLOW + myFormatter.format(petlevel.currentLevelRequirement) + " EXP");
                         }
                     }
                 }
@@ -2462,9 +2443,7 @@ public class NEUEventListener {
         return tooltipText;
     }
 
-
     private void petToolTipXPExtendPetMenu(ItemTooltipEvent event) {
-
         if (NotEnoughUpdates.INSTANCE.config.tooltipTweaks.petExtendExp) {
             //7 is just a random number i chose, prob no pets with less lines than 7
             if (event.toolTip.size() > 7) {
@@ -2493,7 +2472,8 @@ public class NEUEventListener {
                         return;
                     }
 
-                    event.toolTip.add(xpLine+1, EnumChatFormatting.YELLOW + "" + myFormatter.format(petlevel.levelXp) + "/" + myFormatter.format(petlevel.currentLevelRequirement) + " EXP");
+                    event.toolTip.add(xpLine+1, EnumChatFormatting.GRAY + "EXP: " + EnumChatFormatting.YELLOW + myFormatter.format(petlevel.levelXp) +
+                            EnumChatFormatting.GOLD + "/" + EnumChatFormatting.YELLOW + myFormatter.format(petlevel.currentLevelRequirement));
 
                 }
             }
@@ -2502,9 +2482,6 @@ public class NEUEventListener {
 
     DecimalFormat myFormatter = new DecimalFormat("###,###.###");
 
-
-
-
     /**
      * This makes it so that holding LCONTROL while hovering over an item with NBT will show the NBT of the item.
      * @param event
@@ -2512,14 +2489,14 @@ public class NEUEventListener {
     @SubscribeEvent
     public void onItemTooltip(ItemTooltipEvent event) {
         if(!neu.isOnSkyblock()) return;
-        if(NotEnoughUpdates.INSTANCE.config.improvedSBMenu.hideEmptyPanes &&
+        /*if(NotEnoughUpdates.INSTANCE.config.improvedSBMenu.hideEmptyPanes &&
                 event.itemStack.getItem().equals(Item.getItemFromBlock(Blocks.stained_glass_pane))) {
             String first = Utils.cleanColour(event.toolTip.get(0));
             first = first.replaceAll("\\(.*\\)", "").trim();
             if(first.length() == 0) {
                 event.toolTip.clear();
             }
-        }
+        }*/
         //AH prices
         /*if(Minecraft.getMinecraft().currentScreen != null) {
             if(Minecraft.getMinecraft().currentScreen instanceof GuiChest) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
index 1c6ae7f7..080353a7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java
@@ -329,7 +329,7 @@ public class NEUOverlay extends Gui {
                     return;
                 }
                 if(Mouse.getEventButtonState()) {
-                    NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config));
+                    NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(NEUConfigEditor.editor);
                 }
             }
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 38c46415..5eb0f861 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -1157,7 +1157,7 @@ public class NotEnoughUpdates {
             if(args.length > 0) {
                 openGui = new GuiScreenElementWrapper(new NEUConfigEditor(config, StringUtils.join(args, " ")));
             } else {
-                openGui = new GuiScreenElementWrapper(new NEUConfigEditor(config));
+                openGui = new GuiScreenElementWrapper(NEUConfigEditor.editor);
             }
         }
     };
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionBINWarning.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionBINWarning.java
index 4ba3bb73..fc2eaf61 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionBINWarning.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionBINWarning.java
@@ -39,7 +39,7 @@ public class AuctionBINWarning extends GuiElement {
     private int lowestPrice;
 
     private boolean shouldPerformCheck() {
-        if(!NotEnoughUpdates.INSTANCE.config.auctionHouseBINWarning.enableBINWarning ||
+        if(!NotEnoughUpdates.INSTANCE.config.ahTweaks.enableBINWarning ||
                 !NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) {
             sellingTooltip = null;
             showWarning = false;
@@ -105,7 +105,7 @@ public class AuctionBINWarning extends GuiElement {
 
             //TODO: Add option for warning if lowest price does not exist
 
-            float factor = 1 - NotEnoughUpdates.INSTANCE.config.auctionHouseBINWarning.warningThreshold/100;
+            float factor = 1 - NotEnoughUpdates.INSTANCE.config.ahTweaks.warningThreshold/100;
             if(factor < 0) factor = 0;
             if(factor > 1) factor = 1;
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionSortModeWarning.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionSortModeWarning.java
index c9e8c33c..3002bce0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionSortModeWarning.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/AuctionSortModeWarning.java
@@ -1,5 +1,6 @@
 package io.github.moulberry.notenoughupdates.miscfeatures;
 
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.util.render.RenderUtils;
 import io.github.moulberry.notenoughupdates.core.util.render.TextRenderUtils;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
@@ -20,8 +21,10 @@ public class AuctionSortModeWarning {
     }
 
     private boolean isAuctionBrowser() {
-        return Minecraft.getMinecraft().currentScreen instanceof GuiChest &&
-                SBInfo.getInstance().lastOpenContainerName.startsWith("Auctions Browser");
+        return NotEnoughUpdates.INSTANCE.config.ahTweaks.enableSortWarning &&
+                Minecraft.getMinecraft().currentScreen instanceof GuiChest &&
+                (SBInfo.getInstance().lastOpenContainerName.startsWith("Auctions Browser") ||
+                        SBInfo.getInstance().lastOpenContainerName.startsWith("Auctions: \""));
     }
 
     public void onPostGuiRender() {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
index 0aa5e84d..65ccd73f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/BetterContainers.java
@@ -3,6 +3,7 @@ package io.github.moulberry.notenoughupdates.miscfeatures;
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NEUEventListener;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.SBInfo;
 import io.github.moulberry.notenoughupdates.util.TexLoc;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
@@ -119,17 +120,29 @@ public class BetterContainers {
         return isChestOpen() && ((loaded && texture != null) || System.currentTimeMillis() - lastRenderMillis < 200) && !isBlacklistedInventory();
     }
 
-    public static boolean isBlankStack(ItemStack stack) {
+    public static boolean isBlankStack(int index, ItemStack stack) {
+        if(index == 42 && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() &&
+                (SBInfo.getInstance().lastOpenContainerName.contains("'s Profile") ||
+                        SBInfo.getInstance().lastOpenContainerName.contains("s' Profile"))) {
+            return false;
+        }
+
         return stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.stained_glass_pane) &&
                 stack.getItemDamage() == 15 &&
                 stack.getDisplayName() != null && stack.getDisplayName().trim().isEmpty();
     }
 
-    public static boolean shouldRenderStack(ItemStack stack) {
-        return !isBlankStack(stack) && !isToggleOff(stack) && !isToggleOn(stack);
+    public static boolean shouldRenderStack(int index, ItemStack stack) {
+        return !isBlankStack(index, stack) && !isToggleOff(stack) && !isToggleOn(stack);
     }
 
-    public static boolean isButtonStack(ItemStack stack) {
+    public static boolean isButtonStack(int index, ItemStack stack) {
+        if(index == 42 && NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() &&
+                (SBInfo.getInstance().lastOpenContainerName.contains("'s Profile") ||
+                        SBInfo.getInstance().lastOpenContainerName.contains("s' Profile"))) {
+            return true;
+        }
+
         return stack != null && stack.getItem() != Item.getItemFromBlock(Blocks.stained_glass_pane)
                 && NotEnoughUpdates.INSTANCE.manager.getInternalNameForItem(stack) == null && !isToggleOn(stack) && !isToggleOff(stack);
     }
@@ -220,7 +233,7 @@ public class BetterContainers {
                         !lower.getDisplayName().getUnformattedText().contains("Stakes");
                 for (int index = 0; index < size; index++) {
                     ItemStack stack = getStackCached(lower, index);
-                    buttons[index%9][index/9] = isButtonStack(stack);
+                    buttons[index%9][index/9] = isButtonStack(index, stack);
 
                     if(ultrasequencer && stack.getItem() == Items.dye) {
                         buttons[index%9][index/9] = false;
@@ -234,7 +247,7 @@ public class BetterContainers {
                         //buttons[index%9][index/9] = false;
                         //slots[index%9][index/9] = true;
                     } else {
-                        slots[index%9][index/9] = !isBlankStack(stack) && !buttons[index%9][index/9];
+                        slots[index%9][index/9] = !isBlankStack(index, stack) && !buttons[index%9][index/9];
                     }
                 }
                 for (int index = 0; index < size; index++) {
@@ -351,7 +364,7 @@ public class BetterContainers {
             IInventory lower = ((ContainerChest)container).getLowerChestInventory();
             int size = lower.getSizeInventory();
             for(int index=0; index<size; index++) {
-                if(isBlankStack(getStackCached(lower, index))) return true;
+                if(isBlankStack(index, getStackCached(lower, index))) return true;
             }
         }
         return false;
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
index 1b07ebdc..0fbf9406 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiCustomEnchant.java
@@ -29,6 +29,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.play.client.C0EPacketClickWindow;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import org.apache.commons.lang3.text.WordUtils;
@@ -199,12 +200,6 @@ public class GuiCustomEnchant extends Gui {
     }
 
     public boolean shouldOverride(String containerName) {
-        
-        if(!NotEnoughUpdates.INSTANCE.config.hidden.dev) {
-            shouldOverrideFast = false;
-            return false;
-        }
-
         shouldOverrideFast = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI &&
                 containerName != null &&
                 NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard() &&
@@ -509,6 +504,25 @@ public class GuiCustomEnchant extends Gui {
         this.pageOpen += this.pageOpenVelocity;
     }
 
+
+    private List<String> createTooltip(String title, int selectedOption, String... options) {
+        String selPrefix = EnumChatFormatting.DARK_AQUA + " \u25b6 ";
+        String unselPrefix = EnumChatFormatting.GRAY.toString();
+
+        for(int i=0; i<options.length; i++) {
+            if(i == selectedOption) {
+                options[i] = selPrefix + options[i];
+            } else {
+                options[i] = unselPrefix + options[i];
+            }
+        }
+
+        List list = Lists.newArrayList(options);
+        list.add(0, "");
+        list.add(0, EnumChatFormatting.GREEN+title);
+        return list;
+    }
+
     public void render(float partialTicks) {
         if(!(Minecraft.getMinecraft().currentScreen instanceof GuiContainer)) return;
 
@@ -549,12 +563,14 @@ public class GuiCustomEnchant extends Gui {
         Minecraft.getMinecraft().fontRendererObj.drawString("Applicable", guiLeft+7, guiTop+7, 0x404040, false);
         Minecraft.getMinecraft().fontRendererObj.drawString("Removable", guiLeft+247, guiTop+7, 0x404040, false);
 
+        //Page Text
         if(currentState == EnchantState.HAS_ITEM || currentState == EnchantState.ADDING_ENCHANT) {
             String pageStr = "Page: "+currentPage+"/"+expectedMaxPage;
             int pageStrLen = Minecraft.getMinecraft().fontRendererObj.getStringWidth(pageStr);
             Utils.drawStringCentered(pageStr, Minecraft.getMinecraft().fontRendererObj,
                     guiLeft+X_SIZE/2, guiTop+14, false, 0x404040);
 
+            //Page Arrows
             Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
             GlStateManager.color(1, 1, 1, 1);
             Utils.drawTexturedRect(guiLeft+X_SIZE/2-pageStrLen/2-2-15, guiTop+6, 15, 15,
@@ -563,6 +579,57 @@ public class GuiCustomEnchant extends Gui {
                     15/512f, 30/512f, 372/512f, 387/512f, GL11.GL_NEAREST);
         }
 
+        //Settings Buttons
+        Minecraft.getMinecraft().getTextureManager().bindTexture(TEXTURE);
+        GlStateManager.color(1, 1, 1, 1);
+        //On Settings Button
+        Utils.drawTexturedRect(guiLeft+295, guiTop+147, 16, 16,
+                0, 16/512f, 387/512f, (387+16)/512f, GL11.GL_NEAREST);
+        //Incompatible Settings Button
+        float incompatibleMinU = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.incompatibleEnchants*16/512f;
+        Utils.drawTexturedRect(guiLeft+295+18, guiTop+147, 16, 16,
+                incompatibleMinU, incompatibleMinU+16/512f, 403/512f, (403+16)/512f, GL11.GL_NEAREST);
+        //Sorting Settings Button
+        float sortingMinU = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting*16/512f;
+        Utils.drawTexturedRect(guiLeft+295, guiTop+147+18, 16, 16,
+                sortingMinU, sortingMinU+16/512f, 419/512f, (419+16)/512f, GL11.GL_NEAREST);
+        //Ordering Settings Button
+        float orderingMinU = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering*16/512f;
+        Utils.drawTexturedRect(guiLeft+295+18, guiTop+147+18, 16, 16,
+                orderingMinU, orderingMinU+16/512f, 435/512f, (435+16)/512f, GL11.GL_NEAREST);
+
+        if(mouseX >= guiLeft+294 && mouseX < guiLeft+294+36 &&
+                mouseY >= guiTop+146 && mouseY < guiTop+146+36) {
+            int index = (mouseX-(guiLeft+295))/18 + (mouseY-(guiTop+147))/18*2;
+            switch (index) {
+                case 0:
+                    Gui.drawRect(guiLeft+295, guiTop+147, guiLeft+295+16, guiTop+147+16, 0x80ffffff);
+                    tooltipToDisplay = createTooltip("Enable GUI", 0, "On", "Off");
+                    break;
+                case 1:
+                    Gui.drawRect(guiLeft+295+18, guiTop+147, guiLeft+295+16+18, guiTop+147+16, 0x80ffffff);
+                    tooltipToDisplay = createTooltip("Incompatible Enchants",
+                            NotEnoughUpdates.INSTANCE.config.enchantingSolvers.incompatibleEnchants,
+                            "Highlight", "Hide");
+                    tooltipToDisplay.add(1, EnumChatFormatting.GRAY+"How to display enchants that are");
+                    tooltipToDisplay.add(2, EnumChatFormatting.GRAY+"incompatible with your current item,");
+                    tooltipToDisplay.add(3, EnumChatFormatting.GRAY+"eg. Smite on a sword with Sharpness");
+                    break;
+                case 2:
+                    Gui.drawRect(guiLeft+295, guiTop+147+18, guiLeft+295+16, guiTop+147+16+18, 0x80ffffff);
+                    tooltipToDisplay = createTooltip("Sort enchants...",
+                            NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting,
+                            "By Cost", "Alphabetically");
+                    break;
+                case 3:
+                    Gui.drawRect(guiLeft+295+18, guiTop+147+18, guiLeft+295+16+18, guiTop+147+16+18, 0x80ffffff);
+                    tooltipToDisplay = createTooltip("Order enchants...",
+                            NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering,
+                            "Ascending", "Descending");
+                    break;
+            }
+        }
+
         //Left scroll bar
         {
             int offset;
@@ -1355,6 +1422,48 @@ public class GuiCustomEnchant extends Gui {
                 lerpingInteger.setValue(newScroll);
             }
         }
+
+        //Config options
+        if(Mouse.getEventButtonState()) {
+            if(mouseX >= guiLeft+294 && mouseX < guiLeft+294+36 &&
+                    mouseY >= guiTop+146 && mouseY < guiTop+146+36) {
+                int index = (mouseX-(guiLeft+295))/18 + (mouseY-(guiTop+147))/18*2;
+
+                int direction = Mouse.getEventButton() == 0 ? 1 : -1;
+
+                switch (index) {
+                    case 0: {
+                        NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enableTableGUI = false;
+                        break;
+                    }
+                    case 1: {
+                        int val = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.incompatibleEnchants;
+                        val += direction;
+                        if (val < 0) val = 1;
+                        if (val > 1) val = 0;
+                        NotEnoughUpdates.INSTANCE.config.enchantingSolvers.incompatibleEnchants = val;
+                        break;
+                    }
+                    case 2: {
+                        int val = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting;
+                        val += direction;
+                        if (val < 0) val = 1;
+                        if (val > 1) val = 0;
+                        NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantSorting = val;
+                        break;
+                    }
+                    case 3: {
+                        int val = NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering;
+                        val += direction;
+                        if (val < 0) val = 1;
+                        if (val > 1) val = 0;
+                        NotEnoughUpdates.INSTANCE.config.enchantingSolvers.enchantOrdering = val;
+                        break;
+                    }
+                }
+            }
+        }
+
         if(Mouse.getEventButton() == 0) {
             if(Mouse.getEventButtonState()) {
                 if(mouseX > guiLeft+104 && mouseX < guiLeft+104+12) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
index 3f559f48..89d97dfa 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java
@@ -14,11 +14,15 @@ import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.init.Blocks;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -34,6 +38,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
 @Mixin(GuiContainer.class)
 public abstract class MixinGuiContainer extends GuiScreen {
 
+    private static boolean hasProfileViewerStack = false;
+    private static final ItemStack profileViewerStack = Utils.createItemStack(Item.getItemFromBlock(Blocks.command_block),
+            EnumChatFormatting.GREEN + "Profile Viewer",
+                EnumChatFormatting.YELLOW + "Click to open NEU profile viewer!");
+
     @Inject(method="drawSlot", at=@At("RETURN"))
     public void drawSlotRet(Slot slotIn, CallbackInfo ci) {
         SlotLocking.getInstance().drawSlot(slotIn);
@@ -43,6 +52,41 @@ public abstract class MixinGuiContainer extends GuiScreen {
     public void drawSlot(Slot slot, CallbackInfo ci) {
         if(slot == null) return;
 
+        GuiContainer $this = (GuiContainer)(Object)this;
+
+        if(slot.slotNumber == 42 && $this instanceof GuiChest) {
+            hasProfileViewerStack = false;
+
+            GuiChest eventGui = (GuiChest) $this;
+            ContainerChest cc = (ContainerChest) eventGui.inventorySlots;
+            String containerName = cc.getLowerChestInventory().getDisplayName().getUnformattedText();
+            if(containerName.contains(" Profile") && cc.inventorySlots.size() >= 54) {
+                if(cc.inventorySlots.get(22).getStack() != null && cc.inventorySlots.get(22).getStack().getTagCompound() != null){
+                    NBTTagCompound tag = eventGui.inventorySlots.inventorySlots.get(22).getStack().getTagCompound();
+                    if(tag.hasKey("SkullOwner") && tag.getCompoundTag("SkullOwner").hasKey("Name")){
+                        String tagName = tag.getCompoundTag("SkullOwner").getString("Name");
+                        String displayname = Utils.cleanColour(cc.inventorySlots.get(22).getStack().getDisplayName());
+                        if(tagName.equals(displayname.substring(displayname.length()-tagName.length()))) {
+                            ci.cancel();
+
+                            this.zLevel = 100.0F;
+                            this.itemRender.zLevel = 100.0F;
+
+                            GlStateManager.enableDepth();
+                            this.itemRender.renderItemAndEffectIntoGUI(profileViewerStack, slot.xDisplayPosition, slot.yDisplayPosition);
+                            this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, profileViewerStack,
+                                    slot.xDisplayPosition, slot.yDisplayPosition, "");
+
+                            this.itemRender.zLevel = 0.0F;
+                            this.zLevel = 0.0F;
+
+                            hasProfileViewerStack = true;
+                        }
+                    }
+                }
+            }
+        }
+
         if(slot.getStack() == null && NotEnoughUpdates.INSTANCE.overlay.searchMode && NEUEventListener.drawingGuiScreen) {
             GlStateManager.pushMatrix();
             GlStateManager.translate(0, 0, 100 + Minecraft.getMinecraft().getRenderItem().zLevel);
@@ -53,7 +97,6 @@ public abstract class MixinGuiContainer extends GuiScreen {
             GlStateManager.popMatrix();
         }
 
-        GuiContainer $this = (GuiContainer)(Object)this;
         ItemStack stack = slot.getStack();
 
         if(stack != null) {
@@ -65,11 +108,22 @@ public abstract class MixinGuiContainer extends GuiScreen {
 
         RenderHelper.enableGUIStandardItemLighting();
 
-        if(BetterContainers.isOverriding() && !BetterContainers.shouldRenderStack(stack)) {
+        if(BetterContainers.isOverriding() && !BetterContainers.shouldRenderStack(slot.slotNumber, stack)) {
             ci.cancel();
         }
     }
 
+    @Redirect(method="drawScreen", at=@At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/client/gui/inventory/GuiContainer;renderToolTip(Lnet/minecraft/item/ItemStack;II)V"))
+    public void drawScreen_renderTooltip(GuiContainer guiContainer, ItemStack stack, int x, int y) {
+        if(hasProfileViewerStack && theSlot.slotNumber == 42) {
+            this.renderToolTip(profileViewerStack, x, y);
+        } else {
+            this.renderToolTip(stack, x, y);
+        }
+    }
+
     @Inject(method="drawScreen",
             at=@At(
                     value = "INVOKE",
@@ -112,7 +166,7 @@ public abstract class MixinGuiContainer extends GuiScreen {
         if(theSlot != null && SlotLocking.getInstance().isSlotLocked(theSlot)) {
             SlotLocking.getInstance().setRealSlot(theSlot);
             theSlot = null;
-        } else if( theSlot == null){
+        } else if(theSlot == null){
             SlotLocking.getInstance().setRealSlot(null);
         }
     }
@@ -170,11 +224,12 @@ public abstract class MixinGuiContainer extends GuiScreen {
     @Redirect(method="drawScreen", at=@At(value="INVOKE", target=TARGET_CANBEHOVERED))
     public boolean drawScreen_canBeHovered(Slot slot) {
         if(NotEnoughUpdates.INSTANCE.config.improvedSBMenu.hideEmptyPanes &&
-                BetterContainers.isOverriding() && BetterContainers.isBlankStack(slot.getStack())) {
+                BetterContainers.isOverriding() && BetterContainers.isBlankStack(slot.slotNumber, slot.getStack())) {
             return false;
         }
         return slot.canBeHovered();
     }
+
     @Inject(method="checkHotbarKeys", at=@At(value = "INVOKE", target = "Lnet/minecraft/client/gui/inventory/GuiContainer;handleMouseClick(Lnet/minecraft/inventory/Slot;III)V"), locals =  LocalCapture.CAPTURE_FAILSOFT ,cancellable = true)
     public void checkHotbarKeys_Slotlock(int keyCode, CallbackInfoReturnable<Boolean> cir, int i){
         if(SlotLocking.getInstance().isSlotIndexLocked(i)){
@@ -217,11 +272,11 @@ public abstract class MixinGuiContainer extends GuiScreen {
                         slotId, clickedButton, clickType);
             }
         }
-        if(slotIn != null && BetterContainers.isOverriding() && (BetterContainers.isBlankStack(slotIn.getStack()) ||
-                BetterContainers.isButtonStack(slotIn.getStack()))) {
+        if(slotIn != null && BetterContainers.isOverriding() && (BetterContainers.isBlankStack(slotIn.slotNumber, slotIn.getStack()) ||
+                BetterContainers.isButtonStack(slotIn.slotNumber, slotIn.getStack()))) {
             BetterContainers.clickSlot(slotIn.getSlotIndex());
 
-            if(BetterContainers.isBlankStack(slotIn.getStack())) {
+            if(BetterContainers.isBlankStack(slotIn.slotNumber, slotIn.getStack())) {
                 $this.mc.playerController.windowClick($this.inventorySlots.windowId, slotId, 2, clickType, $this.mc.thePlayer);
                 ci.cancel();
             } else {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index 16e6f8cb..a789acfd 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -35,8 +35,7 @@ public class NEUConfig extends Config {
             overlay.renderDummy();
             OverlayManager.dontRenderOverlay = overlay.getClass();
         }, () -> {
-        }, () -> NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(
-                new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config, activeConfig))
+        }, () -> NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(NEUConfigEditor.editor)
         ));
     }
 
@@ -49,7 +48,6 @@ public class NEUConfig extends Config {
                 activeConfigCategory = ((NEUConfigEditor)wrapper.element).getSelectedCategoryName();
             }
         }
-        final String activeConfigCategoryF = activeConfigCategory;
 
         switch (runnableId) {
             case 0:
@@ -63,8 +61,7 @@ public class NEUConfig extends Config {
                         NotEnoughUpdates.INSTANCE.config.mining.drillFuelBarPosition,
                         NotEnoughUpdates.INSTANCE.config.mining.drillFuelBarWidth, 12, () -> {
                 }, () -> {
-                }, () -> NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(
-                        new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config, activeConfigCategoryF))
+                }, () -> NotEnoughUpdates.INSTANCE.openGui = new GuiScreenElementWrapper(NEUConfigEditor.editor)
                 ));
                 return;
             case 3:
@@ -236,19 +233,13 @@ public class NEUConfig extends Config {
     )
     public PetOverlay petOverlay = new PetOverlay();
 
-    @Expose
-    @Category(
-            name = "AH Search GUI",
-            desc = "AH Search GUI"
-    )
-    public AuctionHouseSearch auctionHouseSearch = new AuctionHouseSearch();
 
     @Expose
     @Category(
-            name = "AH BIN Warning",
-            desc = "AH BIN Warning"
+            name = "AH Tweaks",
+            desc = "Tweaks for Hypixel's (Not NEU's) Auction House"
     )
-    public AuctionHouseBINWarning auctionHouseBINWarning = new AuctionHouseBINWarning();
+    public AHTweaks ahTweaks = new AHTweaks();
 
     @Expose
     @Category(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
index 2d89d4b4..8e5edef1 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java
@@ -33,6 +33,8 @@ import java.util.List;
 
 public class NEUConfigEditor extends GuiElement {
 
+    public static NEUConfigEditor editor = new NEUConfigEditor(NotEnoughUpdates.INSTANCE.config);
+
     private static final ResourceLocation[] socialsIco = new ResourceLocation[] {
             DISCORD,
             GITHUB,
@@ -112,6 +114,8 @@ public class NEUConfigEditor extends GuiElement {
                 }
             }
         }
+
+        editor = this;
     }
 
     private LinkedHashMap<String, ConfigProcessor.ProcessedCategory> getCurrentConfigEditing() {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java
new file mode 100644
index 00000000..3e602b08
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHTweaks.java
@@ -0,0 +1,97 @@
+package io.github.moulberry.notenoughupdates.options.seperateSections;
+
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.notenoughupdates.core.config.annotations.*;
+
+public class AHTweaks {
+
+    @ConfigOption(
+            name = "Search GUI",
+            desc = ""
+    )
+    @ConfigEditorAccordion(id = 0)
+    public boolean searchAccordion = false;
+
+    @Expose
+    @ConfigOption(
+            name = "Enable Search GUI",
+            desc = "Use the advanced search GUI with autocomplete and history instead of the normal sign GUI\n\u00a7eStar Selection Texture: Johnny#4567"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean enableSearchOverlay = true;
+
+    @Expose
+    @ConfigOption(
+            name = "Keep Previous Search",
+            desc = "Don't clear the search bar after closing the GUI"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean keepPreviousSearch = false;
+
+    @Expose
+    @ConfigOption(
+            name = "Past Searches",
+            desc = "Show past searches below the autocomplete box"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean showPastSearches = true;
+
+    @Expose
+    @ConfigOption(
+            name = "ESC to Full Close",
+            desc = "Make pressing ESCAPE close the search GUI without opening up the AH again\n" +
+                    "ENTER can still be used to search"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean escFullClose = true;
+
+    @ConfigOption(
+            name = "BIN Warning",
+            desc = ""
+    )
+    @ConfigEditorAccordion(id = 1)
+    public boolean binWarningAccordion = false;
+
+    @Expose
+    @ConfigOption(
+            name = "Enable BIN Warning",
+            desc = "Ask for confirmation when BINing an item for below X% of lowestbin"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 1)
+    public boolean enableBINWarning = true;
+
+    @Expose
+    @ConfigOption(
+            name = "Warning Threshold",
+            desc = "Threshold for BIN warning\nExample: 10% means warn if sell price is 10% lower than lowestbin"
+    )
+    @ConfigEditorSlider(
+            minValue = 0.0f,
+            maxValue = 100.0f,
+            minStep = 5f
+    )
+    @ConfigAccordionId(id = 1)
+    public float warningThreshold = 10f;
+
+    @ConfigOption(
+            name = "Sort Warning",
+            desc = ""
+    )
+    @ConfigEditorAccordion(id = 2)
+    public boolean sortWarningAccordion = false;
+
+    @Expose
+    @ConfigOption(
+            name = "Enable Sort Warning",
+            desc = "Show the sort mode when the mode is not 'Lowest Price'"
+    )
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 2)
+    public boolean enableSortWarning = true;
+
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseBINWarning.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseBINWarning.java
deleted file mode 100644
index 6c31d0c9..00000000
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseBINWarning.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.github.moulberry.notenoughupdates.options.seperateSections;

-

-import com.google.gson.annotations.Expose;

-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorBoolean;

-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorSlider;

-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;

-

-public class AuctionHouseBINWarning {

-    @Expose

-    @ConfigOption(

-            name = "Enable BIN Warning",

-            desc = "Ask for confirmation when BINing an item for below X% of lowestbin"

-    )

-    @ConfigEditorBoolean

-    public boolean enableBINWarning = true;

-

-    @Expose

-    @ConfigOption(

-            name = "Warning Threshold",

-            desc = "Threshold for BIN warning\nExample: 10% means warn if sell price is 10% lower than lowestbin"

-    )

-    @ConfigEditorSlider(

-            minValue = 0.0f,

-            maxValue = 100.0f,

-            minStep = 5f

-    )

-    public float warningThreshold = 10f;

-

-}

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseSearch.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseSearch.java
deleted file mode 100644
index 89e25222..00000000
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AuctionHouseSearch.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.github.moulberry.notenoughupdates.options.seperateSections;

-

-import com.google.gson.annotations.Expose;

-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorBoolean;

-import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;

-

-public class AuctionHouseSearch {

-    @Expose

-    @ConfigOption(

-            name = "Enable Search GUI",

-            desc = "Use the advanced search GUI with autocomplete and history instead of the normal sign GUI\n\u00a7eStar Selection Texture: Johnny#4567"

-    )

-    @ConfigEditorBoolean

-    public boolean enableSearchOverlay = true;

-

-    @Expose

-    @ConfigOption(

-            name = "Keep Previous Search",

-            desc = "Don't clear the search bar after closing the GUI"

-    )

-    @ConfigEditorBoolean

-    public boolean keepPreviousSearch = false;

-

-    @Expose

-    @ConfigOption(

-            name = "Past Searches",

-            desc = "Show past searches below the autocomplete box"

-    )

-    @ConfigEditorBoolean

-    public boolean showPastSearches = true;

-

-    @Expose

-    @ConfigOption(

-            name = "ESC to Full Close",

-            desc = "Make pressing ESCAPE close the search GUI without opening up the AH again\n" +

-                    "ENTER can still be used to search"

-    )

-    @ConfigEditorBoolean

-    public boolean escFullClose = true;

-}

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
index a505f8b7..9c4156f0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Enchanting.java
@@ -23,7 +23,7 @@ public class Enchanting {
     @Expose
     @ConfigOption(
             name = "Incompatible Enchants",
-            desc = "Handle enchants that are incompatible with your current item, eg. Smite on a sword with Sharpness"
+            desc = "How to display enchants that are incompatible with your current item, eg. Smite on a sword with Sharpness"
     )
     @ConfigEditorDropdown(
             values = {"Highlight", "Hide"}
@@ -45,7 +45,7 @@ public class Enchanting {
     @Expose
     @ConfigOption(
             name = "Enchant Ordering",
-            desc = "Change the method of ordered used by the sort"
+            desc = "Change the method of ordering used by the sort"
     )
     @ConfigEditorDropdown(
             values = {"Ascending", "Descending"}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlotLocking.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlotLocking.java
index 98358d83..df8df020 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlotLocking.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlotLocking.java
@@ -50,7 +50,7 @@ public class SlotLocking {
     public boolean lockSlotsInTrade = true;

 

     @Expose

-    @ConfigOption(

+    /*@ConfigOption(

             name = "Item Swap drop delay",

             desc = "Set the delay between swapping to another item and being able to drop it.\n"+

                     "This is to fix a bug that allowed you to drop slot locked items."

@@ -59,7 +59,7 @@ public class SlotLocking {
             minValue = 0,

             maxValue = 500,

             minStep = 5

-    )

+    )*/

     public int slotLockSwapDelay = 100;

 

     @Expose

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
index 1bdbc84a..c6266393 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/TooltipTweaks.java
@@ -101,9 +101,7 @@ public class TooltipTweaks {
             desc = "Show which the full amount of pet xp required"

     )

     @ConfigEditorBoolean

-    public boolean petExtendExp = true;

-

-

+    public boolean petExtendExp = false;

 

     @Expose

     @ConfigOption(

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/AuctionSearchOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/overlays/AuctionSearchOverlay.java
index 00a91219..816a6c63 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/AuctionSearchOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/overlays/AuctionSearchOverlay.java
@@ -69,10 +69,10 @@ public class AuctionSearchOverlay {
 
     public static boolean shouldReplace() {
         if(!NotEnoughUpdates.INSTANCE.hasSkyblockScoreboard()) return false;
-        if(!NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.enableSearchOverlay) return false;
+        if(!NotEnoughUpdates.INSTANCE.config.ahTweaks.enableSearchOverlay) return false;
 
         if(!(Minecraft.getMinecraft().currentScreen instanceof GuiEditSign)) {
-            if(!NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.keepPreviousSearch) searchString = "";
+            if(!NotEnoughUpdates.INSTANCE.config.ahTweaks.keepPreviousSearch) searchString = "";
             return false;
         }
 
@@ -100,7 +100,7 @@ public class AuctionSearchOverlay {
 
         Utils.drawGradientRect(0, 0, width, height, -1072689136, -804253680);
 
-        int h = NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.showPastSearches ? 219 : 145;
+        int h = NotEnoughUpdates.INSTANCE.config.ahTweaks.showPastSearches ? 219 : 145;
 
         int topY = height/4;
         if(scaledResolution.getScaleFactor() >= 4) {
@@ -177,7 +177,7 @@ public class AuctionSearchOverlay {
             }
         }
 
-        if(NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.showPastSearches) {
+        if(NotEnoughUpdates.INSTANCE.config.ahTweaks.showPastSearches) {
             Minecraft.getMinecraft().fontRendererObj.drawString("Past Searches:", width/2-100, topY+25+ AUTOCOMPLETE_HEIGHT +5, 0xdddddd, true);
 
             for(int i=0; i<5; i++) {
@@ -195,7 +195,7 @@ public class AuctionSearchOverlay {
     }
 
     public static void close() {
-        if(NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.keepPreviousSearch) {
+        if(NotEnoughUpdates.INSTANCE.config.ahTweaks.keepPreviousSearch) {
             search();
         } else {
             synchronized(autocompletedItems) {
@@ -328,7 +328,7 @@ public class AuctionSearchOverlay {
         if(Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) {
             searchStringExtra = "";
             close();
-            if(NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.escFullClose) {
+            if(NotEnoughUpdates.INSTANCE.config.ahTweaks.escFullClose) {
                 Minecraft.getMinecraft().thePlayer.sendQueue.addToSendQueue(new C0DPacketCloseWindow(Minecraft.getMinecraft().thePlayer.openContainer.windowId));
             }
         } else if(Keyboard.getEventKey() == Keyboard.KEY_RETURN) {
@@ -351,7 +351,7 @@ public class AuctionSearchOverlay {
         int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
         int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
 
-        int h = NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.showPastSearches ? 219 : 145;
+        int h = NotEnoughUpdates.INSTANCE.config.ahTweaks.showPastSearches ? 219 : 145;
 
         int topY = height/4;
         if(scaledResolution.getScaleFactor() >= 4) {
@@ -451,7 +451,7 @@ public class AuctionSearchOverlay {
                     }
                 }
 
-                if(NotEnoughUpdates.INSTANCE.config.auctionHouseSearch.showPastSearches) {
+                if(NotEnoughUpdates.INSTANCE.config.ahTweaks.showPastSearches) {
                     for(int i=0; i<5; i++) {
                         if(i >= NotEnoughUpdates.INSTANCE.config.hidden.previousAuctionSearches.size()) break;