aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorCow <cow@volloeko.de>2021-04-13 16:12:34 +0200
committerCow <cow@volloeko.de>2021-04-13 16:12:34 +0200
commitdf60b3607577ae6f839b158f419e4a65ab43a34e (patch)
tree12d83f4a206f74f673f825160badf5007aa309d7 /src/main/java
parent0c8a6a70e065e9176d617ff33a9b23774c1b19db (diff)
downloadCowlection-df60b3607577ae6f839b158f419e4a65ab43a34e.tar.gz
Cowlection-df60b3607577ae6f839b158f419e4a65ab43a34e.tar.bz2
Cowlection-df60b3607577ae6f839b158f419e4a65ab43a34e.zip
Made colored overlay in Dungeon Party Finder disableable
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/cowtipper/cowlection/config/MooConfig.java6
-rw-r--r--src/main/java/de/cowtipper/cowlection/config/gui/MooConfigCategoryScrolling.java4
-rw-r--r--src/main/java/de/cowtipper/cowlection/listener/skyblock/DungeonsListener.java5
3 files changed, 13 insertions, 2 deletions
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());