Added blocking clicks back to the enchanting minigames (#19)

* idk where im commiting to

* idk where im commiting to

* made tita overlay and waypoints work with dwarven overlay off
"fixed" divan rarity in neuah
made eitherwarp block overlay turn off able

* Added change notes

* i stopped being pepega and worked out how neu config works

* Added mining skill overlay

* fixed mining overlay

* add option to hide Mining waypoints in Dwarven mines when at location

* better check location

* Make cata xp in /pv be calculated on how many runs you have

* Added master cata xp rates

* Make gitignore not show as changed

* Added warnings to some things in /neu

* maybe fix hiding waypoints

* Added a fishing skill overlay
its kinda scuffed because of the interp stuff

* Hopefully fix Rampart's quarry (for real now)

* Moul said i could
no one leak in general or smth

* Cache itemstacks in miningoverlay and crystalhollows overlay (untested)

* Fix preinit crash due to manager not existing yet

* Make tab do the same as down button while in tab completion mode

* remove debug print

* Added pitch to farming overlay

* Changed the panoramas back to the old one because ery is scuffed

* isnt finished but should work for ery

* Made it so if ur mining 60 it just says maxed level instead of b u g

* Made skills not show int limit when at max level in skill overlays

* wh :omegalul: made neu

* sad you cant type that long in search bar

* Hello don't mind me just improving your workflow

* æ

* Oh also this

* Added the cata xp scaling(idk if m3 and 4 values are right)

* Added Expertise Progress

* Fix farming overlay

* Added cult/crops to next cult level

* Go to the other end of the tab-completion List when hitting the end

* remove debug prints

* added combat skill overlay and some changes to the others (combat doesnt work rn could someone look into it :prayge:)

* Added cooldown to god pot showing in todo overlay

* comment

* Added option to remove enchant glint in storage gui

* Added option to remove enchant glint in storage gui

* please fix

* please fix

* Fixed the placement of help.png

* Added fairy soul waypoints to misc

* unclear not clear

* Added dg partner cape

* fix space cape

* Fix space cape

* Make it so you can hold down keys in sign GUIs

* Added a button in storage menu to open the settings
Added an option to change the click names for /pv to /ah

* Made it so ur config doesnt reset

* Added bhop (shhh dont tell anyone)

* Added a help menu to /neuec

* changed fisgifis overlay button no work

* make working fishing tiemr

* jani can you test this out for us

* Added a gui locations tab

* very important feature

* Fixed wart hoe overlay if not alch 50

* Make it so the ding time is customizable

* Added coins/m to farming overlay

* Basic mining tab in pv

* Just for jani

* Just for jani v2

* works ig

* my balls

* hotm pv is mostly done missing some perks

* hotm pv done

* message goes here

* push so i can pr jani

* Final hotm pv texture + fix m3 and m4 cata xp

* edit: didnt work

* fixed up stuff dokm said

* added image for hotm pv

* Fixed previews for furf and dg capes

* removed combat overlay from location gui menu in /neu

* Start of a custom pv page

* Removed custom pv because -2 people would use it

Removed neubhop (found out bhop is bannable)

* update build gradle

* - Made it so treecap shows foraging xp instead of farming xp on the farming overlay
- Made it so a jungle axe with cult will show the "farming" overlay

* Added entrance + made blur limit at 100

* Added blocking clicks back to the enchanting minigames

* update patch notes

* Fixed rounding issue

* let you use screenshot in et overlay

* Added /neurepomode to toggle item editing and dev mode

* Changed "NEUAH is DISABLED! Enable in /neusettings." to /neu

* Changed misc overlays tab to todo overlays

* Added config option for npc retexture (idk if it works i dont have a pack to test it with)

* update patch note

* Fixed api key autofill with dg copy chat feature

* Fixed api key autofill with dg copy chat feature v2

* Made missing enchants not show on an item if its not missing any enchants

* remove todo because pepega

* Added a config option for dirt wand overlay
Added a config option for hoe of tilling

* patch notes

* Fix pet getlorereplacements crash (im guessing) (#21)

* Added an option to use short numbers (1.5mil) for price tooltips

* Added warning to slotlocking + short prices default to off

* make it not dungeon map

* Fixed pet overlay not updating when going into /pets

* Dokm after not making his own patch notes

* Fixed capital letter

* Refactor miscoverlays to todooverlays

* idk man make the short number prices use like 5 less lines

* Added an option to show next click in chronomatron

* added bz price to farming overlay coins/m (only wart rn)

* added bz price to farming overlay coins/m

* me when cactus price was divided by 1296 :pepela:

* unrefactor todo overlay because it resets the config

* Fixed fetchur for the 765754465th time

* Fixed time that experiment table resets + Made prevent missclicks off by default

Co-authored-by: Lulonaut <lulonaut@tutanota.de>
Co-authored-by: Lulonaut <67191924+Lulonaut@users.noreply.github.com>
Co-authored-by: DoKM <mcazzyman@gmail.com>
Co-authored-by: TymanWasTaken <tyman@tyman.tech>
Co-authored-by: MicrocontrollersDev <microcontrollersyt@gmail.com>
Co-authored-by: jani270 <jani270@gmx.de>
Co-authored-by: DoKM <54663875+DoKM@users.noreply.github.com>
Co-authored-by: IRONM00N <64110067+IRONM00N@users.noreply.github.com>

24 files changed, 512 insertions, 346 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
index 0aa80126..8fbb7c40 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java
@@ -4,6 +4,7 @@ import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.auction.APIManager;
 import io.github.moulberry.notenoughupdates.core.config.KeybindHelper;
 import io.github.moulberry.notenoughupdates.util.Constants;
+import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
@@ -37,6 +38,7 @@ public class ItemPriceInformation {
         boolean bazaarItem = bazaarInfo != null;
 
         NumberFormat format = NumberFormat.getInstance(Locale.US);
+        boolean shortNumber = NotEnoughUpdates.INSTANCE.config.tooltipTweaks.shortNumberFormatPrices;
 
         if (bazaarItem) {
             List<Integer> lines = NotEnoughUpdates.INSTANCE.config.tooltipTweaks.priceInfoBaz;
@@ -64,7 +66,7 @@ public class ItemPriceInformation {
                             }
                             int bazaarBuyPrice = (int) bazaarInfo.get("avg_buy").getAsFloat() * stackMultiplier;
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Buy: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarBuyPrice) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && bazaarBuyPrice > 1000 ? Utils.shortNumberFormat(bazaarBuyPrice, 0) : format.format(bazaarBuyPrice)) + " coins");
                         }
                         break;
                     case 1:
@@ -77,7 +79,7 @@ public class ItemPriceInformation {
                             }
                             int bazaarSellPrice = (int) bazaarInfo.get("avg_sell").getAsFloat() * stackMultiplier;
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Sell: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarSellPrice) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && bazaarSellPrice > 1000 ? Utils.shortNumberFormat(bazaarSellPrice, 0) : format.format(bazaarSellPrice)) + " coins");
                         }
                         break;
                     case 2:
@@ -90,7 +92,7 @@ public class ItemPriceInformation {
                             }
                             int bazaarInstantBuyPrice = (int) bazaarInfo.get("curr_buy").getAsFloat() * stackMultiplier;
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Insta-Buy: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarInstantBuyPrice) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && bazaarInstantBuyPrice > 1000 ? Utils.shortNumberFormat(bazaarInstantBuyPrice, 0) : format.format(bazaarInstantBuyPrice)) + " coins");
                         }
                         break;
                     case 3:
@@ -103,7 +105,7 @@ public class ItemPriceInformation {
                             }
                             int bazaarInstantSellPrice = (int) bazaarInfo.get("curr_sell").getAsFloat() * stackMultiplier;
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Bazaar Insta-Sell: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(bazaarInstantSellPrice) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && bazaarInstantSellPrice > 1000 ? Utils.shortNumberFormat(bazaarInstantSellPrice, 0) : format.format(bazaarInstantSellPrice)) + " coins");
                         }
                         break;
                     case 4:
@@ -115,8 +117,8 @@ public class ItemPriceInformation {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format((int) craftCost.craftCost) + " coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                    (shortNumber && craftCost.craftCost > 1000 ? Utils.shortNumberFormat(craftCost.craftCost, 0) : format.format((int) craftCost.craftCost)) + " coins");
                         }
                         break;
                 }
@@ -137,7 +139,7 @@ public class ItemPriceInformation {
                                 added = true;
                             }
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Lowest BIN: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(lowestBin) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + (shortNumber && lowestBin > 1000 ? Utils.shortNumberFormat(lowestBin, 0) : format.format(lowestBin)) + " coins");
                         }
                         break;
                     case 1:
@@ -148,13 +150,13 @@ public class ItemPriceInformation {
                             }
 
                             if (auctionInfo.has("clean_price")) {
-                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price (Clean): " + EnumChatFormatting.GOLD +
-                                        EnumChatFormatting.BOLD +
-                                        format.format((int) auctionInfo.get("clean_price").getAsFloat()) + " coins");
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price (Clean): " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                        (shortNumber && auctionInfo.get("clean_price").getAsFloat() > 1000 ? Utils.shortNumberFormat(auctionInfo.get("clean_price").getAsFloat(), 0) : format.format((int) auctionInfo.get("clean_price").getAsFloat())
+                                         + " coins"));
                             } else {
                                 int auctionPrice = (int) (auctionInfo.get("price").getAsFloat() / auctionInfo.get("count").getAsFloat());
-                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price: " + EnumChatFormatting.GOLD +
-                                        EnumChatFormatting.BOLD + format.format(auctionPrice) + " coins");
+                                tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Price: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                        (shortNumber && auctionPrice > 1000 ? Utils.shortNumberFormat(auctionPrice, 0) : format.format(auctionPrice)) + " coins");
                             }
 
                         }
@@ -168,11 +170,13 @@ public class ItemPriceInformation {
                             if (auctionInfo.has("clean_price")) {
                                 tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Sales (Clean): " +
                                         EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
-                                        format.format(auctionInfo.get("clean_sales").getAsFloat()) + " sales/day");
+                                        (auctionInfo.get("clean_sales").getAsFloat() < 2 ? format.format(auctionInfo.get("clean_sales").getAsFloat()) + " sale/day"
+                                                : format.format(auctionInfo.get("clean_sales").getAsFloat()) + " sales/day"));
                             } else {
                                 tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AH Sales: " +
                                         EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
-                                        format.format(auctionInfo.get("sales").getAsFloat()) + " sales/day");
+                                        (auctionInfo.get("sales").getAsFloat() < 2 ? format.format(auctionInfo.get("sales").getAsFloat()) + " sale/day"
+                                                : format.format(auctionInfo.get("sales").getAsFloat()) + " sales/day"));
                             }
                         }
                         break;
@@ -185,8 +189,8 @@ public class ItemPriceInformation {
                                 tooltip.add("");
                                 added = true;
                             }
-                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format((int) craftCost.craftCost) + " coins");
+                            tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "Raw Craft Cost: " + EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                    (shortNumber && craftCost.craftCost > 1000 ? Utils.shortNumberFormat(craftCost.craftCost, 0) : format.format((int) craftCost.craftCost)) + " coins");
                         }
                         break;
                     case 4:
@@ -196,7 +200,8 @@ public class ItemPriceInformation {
                                 added = true;
                             }
                             tooltip.add(EnumChatFormatting.YELLOW.toString() + EnumChatFormatting.BOLD + "AVG Lowest BIN: " +
-                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD + format.format(lowestBinAvg) + " coins");
+                                    EnumChatFormatting.GOLD + EnumChatFormatting.BOLD +
+                                    (shortNumber && lowestBinAvg > 1000 ? Utils.shortNumberFormat(lowestBinAvg, 0) : format.format(lowestBinAvg)) + " coins");
                         }
                         break;
                     case 5:
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
index aca9a8c5..6ba3c244 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java
@@ -838,6 +838,7 @@ public class NEUEventListener {
             NotEnoughUpdates.INSTANCE.config.apiKey.apiKey = unformatted.substring("Your new API key is ".length());
             Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.YELLOW +
                     "[NEU] API Key automatically configured"));
+            NotEnoughUpdates.INSTANCE.config.apiKey.apiKey = NotEnoughUpdates.INSTANCE.config.apiKey.apiKey.substring(0, 36);
         }
         if (e.message.getFormattedText().equals(EnumChatFormatting.RESET.toString() +
                 EnumChatFormatting.RED + "You haven't unlocked this recipe!" + EnumChatFormatting.RESET)) {
@@ -2005,23 +2006,25 @@ public class NEUEventListener {
                                         missing.add(enchId);
                                     }
                                 }
-                                newTooltip.add("");
-                                StringBuilder currentLine = new StringBuilder(EnumChatFormatting.RED + "Missing: " + EnumChatFormatting.GRAY);
-                                for (int i = 0; i < missing.size(); i++) {
-                                    String enchName = WordUtils.capitalizeFully(missing.get(i).replace("_", " "));
-                                    if (currentLine.length() != 0 && (Utils.cleanColour(currentLine.toString()).length() + enchName.length()) > 40) {
-                                        newTooltip.add(currentLine.toString());
-                                        currentLine = new StringBuilder();
+                                if (!missing.isEmpty()) {
+                                    newTooltip.add("");
+                                    StringBuilder currentLine = new StringBuilder(EnumChatFormatting.RED + "Missing: " + EnumChatFormatting.GRAY);
+                                    for (int i = 0; i < missing.size(); i++) {
+                                        String enchName = WordUtils.capitalizeFully(missing.get(i).replace("_", " "));
+                                        if (currentLine.length() != 0 && (Utils.cleanColour(currentLine.toString()).length() + enchName.length()) > 40) {
+                                            newTooltip.add(currentLine.toString());
+                                            currentLine = new StringBuilder();
+                                        }
+                                        if (currentLine.length() != 0 && i != 0) {
+                                            currentLine.append(", ").append(enchName);
+                                        } else {
+                                            currentLine.append(EnumChatFormatting.GRAY).append(enchName);
+                                        }
                                     }
-                                    if (currentLine.length() != 0 && i != 0) {
-                                        currentLine.append(", ").append(enchName);
-                                    } else {
-                                        currentLine.append(EnumChatFormatting.GRAY).append(enchName);
+                                    if (currentLine.length() != 0) {
+                                        newTooltip.add(currentLine.toString());
                                     }
                                 }
-                                if (currentLine.length() != 0) {
-                                    newTooltip.add(currentLine.toString());
-                                }
                             }
                             passedEnchants = true;
                         }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
index 59332f23..f9c5b01b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java
@@ -1219,7 +1219,7 @@ public class NEUManager {
 
         HashMap<String, String> replacements = new HashMap<>();
         if (level < 1) {
-            if (Constants.PETS.has("custom_pet_leveling") && Constants.PETS.getAsJsonObject("custom_pet_leveling").has(petname) && Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(petname).has("max_level")) {
+            if (Constants.PETS != null && Constants.PETS.has("custom_pet_leveling") && Constants.PETS.getAsJsonObject("custom_pet_leveling").has(petname) && Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(petname).has("max_level")) {
                 int maxLvl = Constants.PETS.getAsJsonObject("custom_pet_leveling").getAsJsonObject(petname).get("max_level").getAsInt();
                 replacements.put("LVL", "1\u27A1" + maxLvl);
             } else {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java
index 75af7de1..a408100d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java
@@ -915,7 +915,7 @@ public class CustomAH extends Gui {
                 256 - (scrollClicked ? 12 : 24), 0, 12, 15);
 
         if (!NotEnoughUpdates.INSTANCE.config.neuAuctionHouse.enableNeuAuctionHouse) {
-            Utils.drawStringCentered(EnumChatFormatting.RED + "NEUAH is DISABLED! Enable in /neusettings.",
+            Utils.drawStringCentered(EnumChatFormatting.RED + "NEUAH is DISABLED! Enable in /neu.",
                     Minecraft.getMinecraft().fontRendererObj, guiLeft + getXSize() / 2, guiTop + getYSize() / 2 - 5, true, 0);
         }
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
index 591d7053..7d1ef905 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java
@@ -95,6 +95,7 @@ public class Commands {
         ClientCommandHandler.instance.registerCommand(new FairySouls.FairySoulsCommandAlt());
         ClientCommandHandler.instance.registerCommand(neuHelp);
         ClientCommandHandler.instance.registerCommand(neuFeatures);
+        ClientCommandHandler.instance.registerCommand(neuRepoMode);
     }
 
     SimpleCommand.ProcessCommandRunnable collectionLogRun = new SimpleCommand.ProcessCommandRunnable() {
@@ -336,6 +337,14 @@ public class Commands {
         }
     });
 
+    SimpleCommand neuRepoMode = new SimpleCommand("neurepomode", new SimpleCommand.ProcessCommandRunnable() {
+        public void processCommand(ICommandSender sender, String[] args) {
+            NotEnoughUpdates.INSTANCE.config.hidden.dev = !NotEnoughUpdates.INSTANCE.config.hidden.dev;
+            NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing = !NotEnoughUpdates.INSTANCE.config.hidden.enableItemEditing;
+            Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("\u00a75Toggled NEU repo dev mode."));
+        }
+    });
+
     SimpleCommand dungeonWinTest = new SimpleCommand("neudungeonwintest", new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             if (args.length > 0) {
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
index 6f42ab10..c3dc3244 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
@@ -507,7 +507,7 @@ public class DungeonMap {
                     GlStateManager.translate(centerX - mapSizeX / 2, centerY - mapSizeY / 2, 100);
                 }
 
-                if (NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur > 0.1) {
+                if (NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur > 0.1 && NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur < 100 && NotEnoughUpdates.INSTANCE.config.dungeonMap.dmEnable) {
                     GlStateManager.translate(-centerX + mapSizeX / 2, -centerY + mapSizeY / 2, 0);
                     BackgroundBlur.renderBlurredBackground(NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur,
                             scaledResolution.getScaledWidth(), scaledResolution.getScaledHeight(),
@@ -518,7 +518,7 @@ public class DungeonMap {
 
                 GlStateManager.translate(mapCenterX, mapCenterY, 10);
 
-                if (!useFb || NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur > 0.1) {
+                if (!useFb || NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur > 0.1 && NotEnoughUpdates.INSTANCE.config.dungeonMap.dmBackgroundBlur < 100) {
                     GlStateManager.enableBlend();
                     GL14.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
                 }
@@ -1050,7 +1050,7 @@ public class DungeonMap {
                 String line = ScorePlayerTeam.formatPlayerName(scoreplayerteam1, score.getPlayerName());
                 line = Utils.cleanColour(line);
 
-                if (line.contains("(F1)") || line.contains("(E)") || line.contains("(M1)")) {
+                if (line.contains("(F1)") || line.contains("(E0)") || line.contains("(M1)")) {
                     isFloorOne = true;
                     break;
                 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
index 34b444c6..78777538 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/CustomItemEffects.java
@@ -784,7 +784,7 @@ public class CustomItemEffects {
                             }
                         }
                     }
-                } else if (heldInternal.equals("INFINIDIRT_WAND") && event.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
+                } else if (heldInternal.equals("INFINIDIRT_WAND") && event.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && NotEnoughUpdates.INSTANCE.config.itemOverlays.enableDirtWandOverlay) {
                     BlockPos hover = event.target.getBlockPos().offset(event.target.sideHit, 1);
                     IBlockState hoverState = Minecraft.getMinecraft().theWorld.getBlockState(event.target.getBlockPos().offset(event.target.sideHit, 1));
                     if (hoverState.getBlock() == Blocks.air) {
@@ -889,7 +889,7 @@ public class CustomItemEffects {
                     GlStateManager.depthMask(true);
                     GlStateManager.enableTexture2D();
                     GlStateManager.disableBlend();
-                } else if ((heldInternal.equals("HOE_OF_GREAT_TILLING") || heldInternal.equals("HOE_OF_GREATER_TILLING") && onPrivateIsland) &&
+                } else if ((heldInternal.equals("HOE_OF_GREAT_TILLING") || heldInternal.equals("HOE_OF_GREATER_TILLING") && NotEnoughUpdates.INSTANCE.config.itemOverlays.enableHoeOverlay && onPrivateIsland) &&
                         event.target.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
                     BlockPos target = event.target.getBlockPos();
                     IBlockState targetState = Minecraft.getMinecraft().theWorld.getBlockState(target);
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
index 6e7dfc20..15eb7102 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/EnchantingSolvers.java
@@ -32,7 +32,6 @@ public class EnchantingSolvers {
     }
 
     private static final NBTTagCompound enchTag = new NBTTagCompound();
-
     static {
         enchTag.setTag("ench", new NBTTagList());
     }
@@ -143,7 +142,7 @@ public class EnchantingSolvers {
                                         return retStack;
                                     }
                                 } else {
-                                    if (chronomatronReplayIndex + 1 < chronomatronOrder.size()) {
+                                    if (chronomatronReplayIndex + 1 < chronomatronOrder.size() && NotEnoughUpdates.INSTANCE.config.enchantingSolvers.showNextClick) {
                                         String chronomatronNext = chronomatronOrder.get(chronomatronReplayIndex + 1);
                                         if (chronomatronNext.equals(displayName)) {
                                             ItemStack retStack = new ItemStack(Item.getItemFromBlock(Blocks.stained_glass), 1, stack.getItemDamage());
@@ -309,19 +308,19 @@ public class EnchantingSolvers {
 
                         if (chronomatronReplayIndex < chronomatronOrder.size()) {
                             String chronomatronCurrent = chronomatronOrder.get(chronomatronReplayIndex);
-                            /*if(!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks ||
+                            if(!NotEnoughUpdates.INSTANCE.config.enchantingSolvers.preventMisclicks1 ||
                                     chronomatronCurrent.equals(displayName)) {
                                 chronomatronReplayIndex++;
                                 Minecraft.getMinecraft().playerController.windowClick(windowId, slotId,
                                         2, mode, Minecraft.getMinecraft().thePlayer);
                                 millisLastClick = currentTime;
-                            }*/
-                            if (chronomatronCurrent.equals(displayName)) {
+                            }
+                            /*if (chronomatronCurrent.equals(displayName)) {
                                 chronomatronReplayIndex++;
                             }