Make code style in screen classes more consistent

18 files changed, 57 insertions, 33 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
index 07162834..efc64a70 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/EmptyScreen.java
@@ -8,7 +8,7 @@ import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.text.Text;
 
 public class EmptyScreen extends Screen {
-    
+
     public EmptyScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
         EmptyWidget ew = new EmptyWidget(ple);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
index 639bc135..f24fb82a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GardenInfoScreen.java
@@ -29,8 +29,8 @@ public class GardenInfoScreen extends Screen {
 
         JacobsContestWidget jcw = new JacobsContestWidget(ple);
         CookieWidget cw = new CookieWidget(f);
-        
-        // goofy ahh layout code incoming
+
+        // layout code incoming
         this.stackWidgetsH(gsw, evw, uw);
         this.stackWidgetsH(pw, efw);
         this.stackWidgetsH(jcw, cw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
index dda4b401..764397ae 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericInfoScreen.java
@@ -30,8 +30,7 @@ public class GenericInfoScreen extends Screen {
 
         ElectionWidget elw = new ElectionWidget(ple);
         CookieWidget cw = new CookieWidget(f);
-        
-        // goofy ahh layout code incoming
+
         this.stackWidgetsH(sw, evw, uw);
         this.stackWidgetsH(pw, efw);
         this.stackWidgetsH(elw, cw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
index 182f6897..7e6e03af 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/CrimsonIsleScreen.java
@@ -14,10 +14,12 @@ public class CrimsonIsleScreen extends Screen {
 
     public CrimsonIsleScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(ple);
         ReputationWidget rw = new ReputationWidget(ple);
         QuestWidget qw = new QuestWidget(ple);
         VolcanoWidget vw = new VolcanoWidget(ple);
+
         this.stackWidgetsH(sw, rw, vw);
         this.offCenterL(sw);
         this.offCenterL(rw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonHubScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonHubScreen.java
index 5279f196..4f721dfc 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonHubScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonHubScreen.java
@@ -13,11 +13,13 @@ public class DungeonHubScreen extends Screen{
 
     public DungeonHubScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(list);
         EssenceWidget ew = new EssenceWidget(list);
-        centerW(sw);
-        centerW(ew);
-        stackWidgetsH(sw, ew);
+
+        this.centerW(sw);
+        this.centerW(ew);
+        this.stackWidgetsH(sw, ew);
         this.addWidget(ew);
         this.addWidget(sw);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonScreen.java
index ed8160cb..35383f1b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/DungeonScreen.java
@@ -22,16 +22,16 @@ public class DungeonScreen extends Screen {
         DungeonServerWidget dsrw = new DungeonServerWidget(ple);
         DungeonPuzzleWidget dpuw = new DungeonPuzzleWidget(ple);
 
-        offCenterL(ddow);
-        offCenterL(ddew);
-        offCenterL(dscw);
-        offCenterR(dsrw);
-        offCenterR(dpuw);
+        this.offCenterL(ddow);
+        this.offCenterL(ddew);
+        this.offCenterL(dscw);
+        this.offCenterR(dsrw);
+        this.offCenterR(dpuw);
 
-        stackWidgetsH(ddow, ddew, dscw);
-        stackWidgetsH(dsrw, dpuw);
+        this.stackWidgetsH(ddow, ddew, dscw);
+        this.stackWidgetsH(dsrw, dpuw);
 
-        addWidgets(ddow, ddew, dscw, dsrw, dpuw);
+        this.addWidgets(ddow, ddew, dscw, dsrw, dpuw);
 
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/FarmingServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/FarmingServerScreen.java
index ea374c6d..206af26c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/FarmingServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/FarmingServerScreen.java
@@ -13,11 +13,13 @@ public class FarmingServerScreen extends Screen{
 
     public FarmingServerScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(list);
         TrapperWidget tw = new TrapperWidget(list);
-        centerW(sw);
-        centerW(tw);
-        stackWidgetsH(sw, tw);
+
+        this.centerW(sw);
+        this.centerW(tw);
+        this.stackWidgetsH(sw, tw);
         this.addWidgets(tw, sw);
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
index 4ea11109..3debf905 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GardenScreen.java
@@ -12,6 +12,7 @@ public class GardenScreen extends Screen{
 
     public GardenScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         GardenServerWidget gsw = new GardenServerWidget(ple);
         ComposterWidget cw = new ComposterWidget(ple);
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GenericServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GenericServerScreen.java
index c8cc60a6..8afdcac5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GenericServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GenericServerScreen.java
@@ -12,7 +12,9 @@ public class GenericServerScreen extends Screen {
 
     public GenericServerScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(ple);
+
         this.center(sw);
         this.addWidget(sw);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GuestServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GuestServerScreen.java
index 6a583c38..b6388be9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GuestServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/GuestServerScreen.java
@@ -12,7 +12,9 @@ public class GuestServerScreen extends Screen{
 
     public GuestServerScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         GuestServerWidget gsw = new GuestServerWidget(list);
+
         this.center(gsw);
         this.addWidget(gsw);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HomeServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HomeServerScreen.java
index 3c2b8fac..9ce8ee0e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HomeServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HomeServerScreen.java
@@ -16,6 +16,7 @@ public class HomeServerScreen extends Screen {
 
         IslandServerWidget isw = new IslandServerWidget(list);
         MinionWidget mw = new MinionWidget(list);
+
         this.centerH(isw);
         this.centerH(mw);
         this.stackWidgetsW(isw, mw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HubServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HubServerScreen.java
index 0a488d1d..3ba8fc47 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HubServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/HubServerScreen.java
@@ -13,8 +13,10 @@ public class HubServerScreen extends Screen {
 
     public HubServerScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(ple);
         FireSaleWidget fsw = new FireSaleWidget(ple);
+
         this.centerW(sw);
         this.centerW(fsw);
         this.stackWidgetsH(sw, fsw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/MineServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/MineServerScreen.java
index 0fe408bc..f0dd6e0a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/MineServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/MineServerScreen.java
@@ -15,16 +15,18 @@ public class MineServerScreen extends Screen{
 
     public MineServerScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         ServerWidget sw = new ServerWidget(list);
         PowderWidget pw = new PowderWidget(list);
         CommsWidget cw = new CommsWidget(list);
         ForgeWidget fw = new ForgeWidget(list);
-        stackWidgetsH(sw, pw, cw);
-        centerH(fw);
-        offCenterL(sw);
-        offCenterL(pw);
-        offCenterL(cw);
-        offCenterR(fw);
+
+        this.stackWidgetsH(sw, pw, cw);
+        this.centerH(fw);
+        this.offCenterL(sw);
+        this.offCenterL(pw);
+        this.offCenterL(cw);
+        this.offCenterR(fw);
         this.addWidgets(fw, cw, pw, sw);
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/ParkServerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/ParkServerScreen.java
index 90ab9edb..c1d09f6c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/ParkServerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/ParkServerScreen.java
@@ -12,7 +12,9 @@ public class ParkServerScreen extends Screen{
 
     public ParkServerScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         ParkServerWidget sw = new ParkServerWidget(ple);
+
         this.center(sw);
         this.addWidget(sw);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/DungeonPlayerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/DungeonPlayerScreen.java
index a7aa970d..aba19c56 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/DungeonPlayerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/DungeonPlayerScreen.java
@@ -12,20 +12,21 @@ public class DungeonPlayerScreen extends Screen {
 
     public DungeonPlayerScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         DungeonPlayerWidget dpw1 = new DungeonPlayerWidget(ple, 1);
         DungeonPlayerWidget dpw2 = new DungeonPlayerWidget(ple, 2);
         DungeonPlayerWidget dpw3 = new DungeonPlayerWidget(ple, 3);
         DungeonPlayerWidget dpw4 = new DungeonPlayerWidget(ple, 4);
         DungeonPlayerWidget dpw5 = new DungeonPlayerWidget(ple, 5);
 
-        offCenterL(dpw1);
-        offCenterL(dpw2);
-        offCenterL(dpw3);
-        offCenterR(dpw4);
-        offCenterR(dpw5);
-        stackWidgetsH(dpw1, dpw2, dpw3);
-        stackWidgetsH(dpw4, dpw5);
-        addWidgets(dpw1, dpw2, dpw3, dpw4, dpw5);
+        this.offCenterL(dpw1);
+        this.offCenterL(dpw2);
+        this.offCenterL(dpw3);
+        this.offCenterR(dpw4);
+        this.offCenterR(dpw5);
+        this.stackWidgetsH(dpw1, dpw2, dpw3);
+        this.stackWidgetsH(dpw4, dpw5);
+        this.addWidgets(dpw1, dpw2, dpw3, dpw4, dpw5);
     }
 
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/GuestPlayerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/GuestPlayerScreen.java
index 30c3a4ba..f8210443 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/GuestPlayerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/GuestPlayerScreen.java
@@ -13,8 +13,10 @@ public class GuestPlayerScreen extends Screen{
 
     public GuestPlayerScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         IslandGuestsWidget igw = new IslandGuestsWidget(list);
         IslandOwnersWidget iow = new IslandOwnersWidget(list);
+
         this.centerH(iow);
         this.centerH(igw);
         this.stackWidgetsW(igw, iow);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/HomePlayerScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/HomePlayerScreen.java
index 08f44d8f..d89f6d6a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/HomePlayerScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/HomePlayerScreen.java
@@ -13,8 +13,10 @@ public class HomePlayerScreen extends Screen {
 
     public HomePlayerScreen(int w, int h, List<PlayerListEntry> list, Text footer) {
         super(w, h);
+
         IslandSelfWidget isw = new IslandSelfWidget(list);
         IslandGuestsWidget igw = new IslandGuestsWidget(list);
+
         this.centerH(isw);
         this.centerH(igw);
         this.stackWidgetsW(isw, igw);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/PlayerListScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/PlayerListScreen.java
index d40353b8..eca2e4aa 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/PlayerListScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/playerList/PlayerListScreen.java
@@ -12,7 +12,9 @@ public class PlayerListScreen extends Screen {
 
     public PlayerListScreen(int w, int h, List<PlayerListEntry> ple, Text footer) {
         super(w, h);
+
         PlayerListWidget plw = new PlayerListWidget(ple);
+
         this.center(plw);
         this.addWidget(plw);
     }