tweaks and apply to all modes button

3 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java
index 74943e23..9785f982 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/config/WidgetsOrderingTab.java
@@ -130,9 +130,12 @@ public class WidgetsOrderingTab implements Tab {
         widgetsElementList.setScrollAmount(widgetsElementList.getScrollAmount());
         previousPage.visible = handler.getRows() == 6 && handler.getSlot(45).getStack().isOf(Items.ARROW);
         nextPage.visible = handler.getRows() == 6 && handler.getSlot(53).getStack().isOf(Items.ARROW);
-        thirdColumnButton.visible = handler.getRows() == 6 && handler.getSlot(50).getStack().isOf(Items.BOOKSHELF);
+        thirdColumnButton.visible = handler.getRows() == 6 && (handler.getSlot(50).getStack().isOf(Items.BOOKSHELF) || handler.getSlot(50).getStack().isOf(Items.STONE_BUTTON));
         if (thirdColumnButton.visible) {
-            if (ItemUtils.getLoreLineIf(handler.getSlot(50).getStack(), s -> s.contains("DISABLED")) == null)
+            ItemStack stack = handler.getSlot(50).getStack();
+            if (stack.isOf(Items.STONE_BUTTON))
+                thirdColumnButton.setMessage(Text.literal("Apply to all locations"));
+            else if (ItemUtils.getLoreLineIf(stack, s -> s.contains("DISABLED")) == null)
                 thirdColumnButton.setMessage(Text.literal("3rd Column: ").append(WidgetsListEntry.ENABLED_TEXT));
             else
                 thirdColumnButton.setMessage(Text.literal("3rd Column: ").append(WidgetsListEntry.DISABLED_TEXT));
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
index c967b8e8..298ead3c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
@@ -6,7 +6,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import de.hysky.skyblocker.skyblock.tabhud.util.Ico;
-import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.ProgressComponent;
@@ -87,7 +86,7 @@ public class ElectionWidget extends TabHudWidget {
 
         } else {
             // election is going on
-            this.addSimpleIcoText(Ico.CLOCK, "End in:", Formatting.GOLD, lines.getFirst().getString().trim());
+            this.addSimpleIcoText(Ico.CLOCK, "End in: ", Formatting.GOLD, lines.getFirst().getString().trim());
 
             for (int i = 1; i < lines.size(); i++) {
                 String string = lines.get(i).getString();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/MinionWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/MinionWidget.java
index 99f45832..0af122df 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/MinionWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/MinionWidget.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
 import de.hysky.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 
@@ -98,6 +97,7 @@ public class MinionWidget extends TabHudWidget {
 
     @Override
     public void updateContent(List<Text> lines) {
+        addComponent(new PlainTextComponent(lines.getFirst().copy().append(Text.literal(" minions"))));
         for (int i = 1; i < lines.size(); i++) {
             String string = lines.get(i).getString();
             if (string.toLowerCase().contains("... and")) this.addComponent(new PlainTextComponent(lines.get(i)));