Code format tweaks

5 files changed, 31 insertions, 25 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
index 53875a7d..5c7edf99 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java
@@ -15,8 +15,7 @@ import net.minecraft.text.Text;
 import java.util.ArrayList;
 import java.util.List;
 
-public class FinderSettingsContainer extends ContainerWidget{
-
+public class FinderSettingsContainer extends ContainerWidget {
     private boolean isInitialized = false;
     private OptionDropdownWidget floorSelector;
     private OptionDropdownWidget dungeonTypeSelector;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
index daf764ef..b7fd8d9d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntry.java
@@ -33,7 +33,6 @@ import java.util.regex.Pattern;
 import org.joml.Matrix4f;
 
 public class PartyEntry extends ElementListWidget.Entry<PartyEntry> {
-
     private static final Identifier PARTY_CARD_TEXTURE = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/party_card.png");
     private static final Identifier PARTY_CARD_TEXTURE_HOVER = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/party_card_hover.png");
     protected final PartyFinderScreen screen;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java
index 66c23baf..263f5ab3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java
@@ -11,7 +11,6 @@ import java.util.Comparator;
 import java.util.List;
 
 public class PartyEntryListWidget extends ElementListWidget<PartyEntry> {
-
     protected List<PartyEntry> partyEntries;
 
     protected boolean isActive = true;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
index 372a44da..ba62515c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyFinderScreen.java
@@ -38,6 +38,7 @@ import java.util.concurrent.CompletableFuture;
 
 public class PartyFinderScreen extends Screen {
     protected static final Logger LOGGER = LoggerFactory.getLogger(PartyFinderScreen.class);
+    protected static final Identifier BACKGROUND_TEXTURE = new Identifier("social_interactions/background");
     protected static final Identifier SEARCH_ICON_TEXTURE = new Identifier("icon/search");
     protected static final Text SEARCH_TEXT = Text.translatable("gui.socialInteractions.search_hint").formatted(Formatting.ITALIC).formatted(Formatting.GRAY);
     public static boolean isInKuudraPartyFinder = false;
@@ -71,17 +72,23 @@ public class PartyFinderScreen extends Screen {
 
     private int refreshSlotId = -1;
 
-
     private TextFieldWidget searchField;
     private ButtonWidget refreshButton;
-    private ButtonWidget previousPageButton; private int prevPageSlotId = -1;
-    private ButtonWidget nextPageButton; private int nextPageSlotId = -1;
 
-    protected ButtonWidget partyFinderButton; protected int partyButtonSlotId = -1;
-    private ButtonWidget settingsButton; private int settingsButtonSlotId = -1;
-    private ButtonWidget createPartyButton; private int createPartyButtonSlotId = -1;
+    private ButtonWidget previousPageButton;
+    private int prevPageSlotId = -1;
+
+    private ButtonWidget nextPageButton;
+    private int nextPageSlotId = -1;
+
+    protected ButtonWidget partyFinderButton;
+    protected int partyButtonSlotId = -1;
 
+    private ButtonWidget settingsButton;
+    private int settingsButtonSlotId = -1;
 
+    private ButtonWidget createPartyButton;
+    private int createPartyButtonSlotId = -1;
 
     private boolean dirty = false;
     private long dirtiedTime;
@@ -97,11 +104,6 @@ public class PartyFinderScreen extends Screen {
 
     public static Map<String, String> floorIconsNormal = null;
     public static Map<String, String> floorIconsMaster = null;
-    protected static final Identifier BACKGROUND_TEXTURE = new Identifier("social_interactions/background");
-
-
-
-
 
     public static void initClass() {
         ClientLifecycleEvents.CLIENT_STARTED.register(client -> {
@@ -371,7 +373,7 @@ public class PartyFinderScreen extends Screen {
         if (currentPage != Page.FINDER) setCurrentPage(Page.FINDER);
         if (handler.slots.stream().anyMatch(slot -> slot.hasStack() && slot.getStack().isOf(Items.BEDROCK))) {
             parties.add(new PartyEntry.NoParties());
-        }else {
+        } else {
             for (Slot slot : handler.slots) {
                 if (slot.id > (handler.getRows()-1) * 9 - 1 || !slot.hasStack()) continue;
                 if (slot.getStack().isOf(Items.PLAYER_HEAD)) {
@@ -409,8 +411,8 @@ public class PartyFinderScreen extends Screen {
             }
         }
         if (tooltips != null) {
-            LOGGER.info("Your Party tooltips");
-            tooltips.forEach(text -> LOGGER.info(text.toString()));
+            //LOGGER.info("Your Party tooltips");
+            //tooltips.forEach(text -> LOGGER.info(text.toString()));
             if (deListSlotId != -1) {
                 // Such a wacky thing lol
                 tooltips.set(0, Text.literal(MinecraftClient.getInstance().getSession().getUsername() + "'s party"));
@@ -422,7 +424,12 @@ public class PartyFinderScreen extends Screen {
 
     }
 
-    private boolean aborted = false; public boolean isAborted() {return aborted;}
+    private boolean aborted = false;
+
+    public boolean isAborted() {
+        return aborted;
+    }
+
     public void abort() {
         assert this.client != null;
         if (currentPage == Page.SIGN) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java
index 85252cab..5cded2e2 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/RangedValueWidget.java
@@ -17,7 +17,6 @@ import java.util.List;
 import java.util.Objects;
 
 public class RangedValueWidget extends ContainerWidget {
-
     private final PartyFinderScreen screen;
 
     private final int slotId;
@@ -34,7 +33,6 @@ public class RangedValueWidget extends ContainerWidget {
     private final ModifiedTextFieldWidget input;
     private final ButtonWidget okButton;
 
-
     public RangedValueWidget(PartyFinderScreen screen, Text name, int x, int y, int width, int slotId) {
         super(x, y, width, 45, Text.empty());
         this.slotId = slotId;
@@ -132,8 +130,13 @@ public class RangedValueWidget extends ContainerWidget {
         }
     }
 
-    private boolean mouseOverMinButton(int mouseX, int mouseY) {return isMouseOver(mouseX, mouseY) && mouseX < getX() + (width >> 1) - 5 && mouseY < getY() + 25 && mouseY > getY() + 10;}
-    private boolean mouseOverMaxButton(int mouseX, int mouseY) {return isMouseOver(mouseX, mouseY) && mouseX > getX() + (width >> 1) + 5 && mouseY < getY() + 25 && mouseY > getY() + 10;}
+    private boolean mouseOverMinButton(int mouseX, int mouseY) {
+        return isMouseOver(mouseX, mouseY) && mouseX < getX() + (width >> 1) - 5 && mouseY < getY() + 25 && mouseY > getY() + 10;
+    }
+
+    private boolean mouseOverMaxButton(int mouseX, int mouseY) {
+        return isMouseOver(mouseX, mouseY) && mouseX > getX() + (width >> 1) + 5 && mouseY < getY() + 25 && mouseY > getY() + 10;
+    }
 
     public void setState(State state) {
         this.state = state;
@@ -240,8 +243,6 @@ public class RangedValueWidget extends ContainerWidget {
         MODIFYING_MAX;
     }
     protected class ModifiedTextFieldWidget extends TextFieldWidget {
-
-
         private boolean isGood = false;
 
         public ModifiedTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, Text text) {
@@ -263,6 +264,7 @@ public class RangedValueWidget extends ContainerWidget {
         }
 
     }
+
     @Override
     protected void appendClickableNarrations(NarrationMessageBuilder builder) {}
 }