Made colored overlay in Dungeon Party Finder disableable

5 files changed, 18 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2544a64..fd261d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Dungeon Party Finder: Parties with specific classes can now *always* be marked as 'unideal' (additionally to the already existing option to mark a party when 2+ members use the same specific class)
 - Dungeon Performance Overlay: added an alternative text border option
 - "Copy inventories to clipboard"-feature now automatically decodes base64 data (e.g. skin details) and unix timestamps
+- Dungeon Party Finder: colored overlay is now also disable-able via config
 
 ### Fixed
 - Fixed issue with 'no dung class selected'
diff --git a/src/main/java/de/cowtipper/cowlection/config/MooConfig.java b/src/main/java/de/cowtipper/cowlection/config/MooConfig.java
index fba238b..74d9876 100644
--- a/src/main/java/de/cowtipper/cowlection/config/MooConfig.java
+++ b/src/main/java/de/cowtipper/cowlection/config/MooConfig.java
@@ -101,6 +101,7 @@ public class MooConfig {
     private static String dungPartyFinderPlayerLookup;
     public static boolean dungPartyFullLookup;
     public static boolean dungPartyFinderPartyLookup;
+    public static boolean dungPartyFinderOverlayDrawBackground;
     public static boolean dungPartiesSize;
     public static int dungDungeonReqMin;
     public static int dungClassMin;
@@ -552,6 +553,9 @@ public class MooConfig {
         Property propDungPartyFinderPartyLookup = subCat.addConfigEntry(cfg.get(configCat.getConfigName(),
                 "dungPartyFinderPartyLookup", true, "Lookup info when joining another party?"));
 
+        Property propDungPartyFinderOverlayDrawBackground = subCat.addConfigEntry(cfg.get(configCat.getConfigName(),
+                "dungPartyFinderOverlayDrawBackground", true, "Party Finder: draw colored overlay?"));
+
         Property propDungPartiesSize = subCat.addConfigEntry(cfg.get(configCat.getConfigName(),
                 "dungPartiesSize", true, "Show size of parties?"),
                 new MooConfigPreview(new MooChatComponent("Marked with: " + EnumChatFormatting.WHITE + "1 - 4").gray()));
@@ -655,6 +659,7 @@ public class MooConfig {
             dungPartyFinderPlayerLookup = propDungPartyFinderPlayerLookup.getString();
             dungPartyFullLookup = propDungPartyFullLookup.getBoolean();
             dungPartyFinderPartyLookup = propDungPartyFinderPartyLookup.getBoolean();
+            dungPartyFinderOverlayDrawBackground = propDungPartyFinderOverlayDrawBackground.getBoolean();
             dungPartiesSize = propDungPartiesSize.getBoolean();
             dungDungeonReqMin = propDungDungeonReqMin.getInt();
             dungClassMin = propDungClassMin.getInt();
@@ -732,6 +737,7 @@ public class MooConfig {
         propDungPartyFinderPlayerLookup.set(dungPartyFinderPlayerLookup);
         propDungPartyFullLookup.set(dungPartyFullLookup);
         propDungPartyFinderPartyLookup.set(dungPartyFinderPartyLookup);
+        propDungPartyFinderOverlayDrawBackground.set(dungPartyFinderOverlayDrawBackground);
         propDungPartiesSize.set(dungPartiesSize);
         propDungDungeonReqMin.set(dungDungeonReqMin);
         propDungClassMin.set(dungClassMin);
diff --git a/src/main/java/de/cowtipper/cowlection/config/gui/MooConfigCategoryScrolling.java b/src/main/java/de/cowtipper/cowlection/config/gui/MooConfigCategoryScrolling.java
index 3b18089..dedf163 100644
--- a/src/main/java/de/cowtipper/cowlection/config/gui/MooConfigCategoryScrolling.java
+++ b/src/main/java/de/cowtipper/cowlection/config/gui/MooConfigCategoryScrolling.java
@@ -211,6 +211,10 @@ public class MooConfigCategoryScrolling extends GuiListExtended {
                         if ("Other settings".equals(subCategory.getDisplayName())) {
                             if (!hasLogSearchBeenAdded && Cowlection.getInstance().getConfig().getLogSearchProperties().contains(configEntry)) {
                                 // don't add properties to main config gui, use this instead:
+                                int labelWidth = mc.fontRendererObj.getStringWidth(I18n.format("cowlection.config.gotoLogSearchConfig"));
+                                if (labelWidth > this.maxListLabelWidth) {
+                                    this.maxListLabelWidth = labelWidth;
+                                }
                                 this.listEntries.add(new GuiSwitchEntry("gotoLogSearchConfig", "Log Search", () -> mc.displayGuiScreen(new GuiSearch(Cowlection.getInstance().getConfigDirectory(), ""))));
                                 hasLogSearchBeenAdded = true;
                             } else if (hasLogSearchBeenAdded) {
diff --git a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
index 5e7036e..e2be6c4 100644
--- a/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
+++ b/src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java
@@ -418,8 +418,9 @@ public class DungeonsListener {
                 }
             }
         }
-        if (partyType != DataHelper.PartyType.CURRENT
-                || (/*partyType == PartyType.CURRENT &&*/ Minecraft.getSystemTime() % 1000 < 600)) {
+        if (MooConfig.dungPartyFinderOverlayDrawBackground &&
+                (partyType != DataHelper.PartyType.CURRENT
+                        || (/*partyType == PartyType.CURRENT &&*/ Minecraft.getSystemTime() % 1000 < 600))) {
             GlStateManager.pushMatrix();
             GlStateManager.translate(0, 0, partyType.getZIndex());
             Gui.drawRect(x, y, x + 16, y + 16, partyType.getColor());
diff --git a/src/main/resources/assets/cowlection/lang/en_US.lang b/src/main/resources/assets/cowlection/lang/en_US.lang
index 63217da..4328dbb 100644
--- a/src/main/resources/assets/cowlection/lang/en_US.lang
+++ b/src/main/resources/assets/cowlection/lang/en_US.lang
@@ -15,7 +15,7 @@ cowlection.config.tabCompletableNamesCommands.tooltip=List of commands with a us
 cowlection.config.gotoLogSearchConfig=Search through your Minecraft logs
 cowlection.config.gotoLogSearchConfig.tooltip=Settings can be accessed at the top right corner
 cowlection.config.logsDirs=Directories with Minecraft log files
-cowlection.config.logsDirs.tooltip=List of directories containing Minecraft log files
+cowlection.config.logsDirs.tooltip=List of directories containing Minecraft logs
 cowlection.config.defaultStartDate=Start date for log file search §c[see tooltip!]
 cowlection.config.defaultStartDate.tooltip=§eCan be either a §6number§e (e.g. "§63§e" means "§6start searching 3 months ago§e"),\n§eor alternatively a §6fixed date §e(§6yyyy-mm-dd§e)
 cowlection.config.gotoKeyBindings=Change key bindings
@@ -51,7 +51,7 @@ cowlection.config.tooltipItemTimestamp.tooltip=Show item creation date? Only wor
 cowlection.config.showPetExp=§7Pets: §rShow pet exp
 cowlection.config.showPetExp.tooltip=Show pet exp?\n§7§oExp for max level pets §f§odon't §7§owork inside the pets menu (but in every other GUI)!
 cowlection.config.numeralSystem=Numeral system
-cowlection.config.numeralSystem.tooltip=Use Roman or Arabic numeral system?\nThis is currently used to display numbers in the commands /moo stalkSkyBlock and /moo analyzeIsland
+cowlection.config.numeralSystem.tooltip=Use Roman or Arabic numeral system?\nThis is currently used to display numbers for...\n  ‣ §7command: §r/moo stalkSkyBlock\n  ‣ §7command: §r/moo analyzeIsland\n  ‣ Dungeon levels and floors
 cowlection.config.tooltipAuctionHousePriceEach=§7Auction house: §rprice per item
 cowlection.config.tooltipAuctionHousePriceEach.tooltip=Add price per item if multiple items are bought or sold?\nAlso add price for level 1 books for enchanted books with one single enchant.
 cowlection.config.tooltipAuctionHousePriceEachEnchantments=§7AH: §rprice per lvl 1 enchantment
@@ -96,6 +96,8 @@ cowlection.config.dungPartyFullLookup=Lookup info when party full? §d§l⚷
 cowlection.config.dungPartyFullLookup.tooltip=Lookup armor and dungeons stats of each party member when your party is full?\n§7Alternatively: §e/moo dungeon party §7or §e/m dp\n§d§l⚷ §eRequires a valid API key!
 cowlection.config.dungPartyFinderPartyLookup=Lookup info when joining another party? §d§l⚷
 cowlection.config.dungPartyFinderPartyLookup.tooltip=Lookup armor and dungeons stats of each party member when joining via party finder?\n§7Alternatively: §e/moo dungeon party §7or §e/m dp\n§d§l⚷ §eRequires a valid API key!
+cowlection.config.dungPartyFinderOverlayDrawBackground=Draw colored party background?
+cowlection.config.dungPartyFinderOverlayDrawBackground.tooltip=Draw colored background for parties...\n  ‣ you cannot join: §c⬛\n  ‣ that do not meet all your criteria: §6⬛\n  ‣ that match your criteria: §a⬛
 cowlection.config.dungPartiesSize=Show party sizes?
 cowlection.config.dungPartiesSize.tooltip=Show sizes of parties?
 cowlection.config.dungDungeonReqMin=Minimum "Dungeon level required"