Refactor code

11 files changed, 41 insertions, 41 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
index e565bd8f..2ba0c0cc 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java
@@ -45,7 +45,7 @@ public class DungeonPlayerWidget extends Widget {
         MSGS.add("More is better!");
     }
 
-    private int player;
+    private final int player;
 
     // title needs to be changeable here
     public DungeonPlayerWidget(int player) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
index b3563f1b..7d07ad75 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java
@@ -11,7 +11,7 @@ import net.minecraft.util.Formatting;
 public class EventWidget extends Widget {
     private static final MutableText TITLE = Text.literal("Event Info").formatted(Formatting.YELLOW, Formatting.BOLD);
 
-    private boolean isInGarden;
+    private final boolean isInGarden;
 
     public EventWidget(boolean isInGarden) {
         super(TITLE, Formatting.YELLOW.getColorValue());
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java
index 96b85fef..ed87d496 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java
@@ -48,22 +48,22 @@ public class ForgeWidget extends Widget {
             Text l1, l2;
 
             switch (fstr.substring(3)) {
-                case "LOCKED":
+                case "LOCKED" -> {
                     l1 = Text.literal("Locked").formatted(Formatting.RED);
                     l2 = switch (slot) {
                         case 3 -> Text.literal("Needs HotM 3").formatted(Formatting.GRAY);
                         case 4 -> Text.literal("Needs HotM 4").formatted(Formatting.GRAY);
                         case 5 -> Text.literal("Needs PotM 2").formatted(Formatting.GRAY);
                         default ->
-                            Text.literal("This message should not appear").formatted(Formatting.RED, Formatting.BOLD);
+                                Text.literal("This message should not appear").formatted(Formatting.RED, Formatting.BOLD);
                     };
                     c = new IcoFatTextComponent(Ico.BARRIER, l1, l2);
-                    break;
-                case "EMPTY":
+                }
+                case "EMPTY" -> {
                     l1 = Text.literal("Empty").formatted(Formatting.GRAY);
                     c = new IcoTextComponent(Ico.FURNACE, l1);
-                    break;
-                default:
+                }
+                default -> {
                     String[] parts = fstr.split(": ");
                     if (parts.length != 2) {
                         c = new IcoFatTextComponent();
@@ -72,7 +72,7 @@ public class ForgeWidget extends Widget {
                         l2 = Text.literal("Done in: ").formatted(Formatting.GRAY).append(Text.literal(parts[1]).formatted(Formatting.WHITE));
                         c = new IcoFatTextComponent(Ico.FIRE, l1, l2);
                     }
-                    break;
+                }
             }
             this.addComponent(c);
         }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
index a978654f..2e8e2c40 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
@@ -37,8 +37,8 @@ public class IslandOwnersWidget extends Widget {
                 break;
             }
 
-            String name = null, lastseen = null;
-            Formatting format = null;
+            String name, lastseen;
+            Formatting format;
             if (m.group("nameA") != null) {
                 name = m.group("nameA");
                 lastseen = m.group("lastseen");
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java
index d0e01590..90f947ba 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java
@@ -22,21 +22,21 @@ public class VolcanoWidget extends Widget {
 
     static {
         BOOM_TYPE.put("INACTIVE",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.BARRIER), Formatting.DARK_GRAY));
+                new Pair<>(new ItemStack(Items.BARRIER), Formatting.DARK_GRAY));
         BOOM_TYPE.put("CHILL",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.ICE), Formatting.AQUA));
+                new Pair<>(new ItemStack(Items.ICE), Formatting.AQUA));
         BOOM_TYPE.put("LOW",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.FLINT_AND_STEEL), Formatting.GRAY));
+                new Pair<>(new ItemStack(Items.FLINT_AND_STEEL), Formatting.GRAY));
         BOOM_TYPE.put("DISRUPTIVE",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.CAMPFIRE), Formatting.WHITE));
+                new Pair<>(new ItemStack(Items.CAMPFIRE), Formatting.WHITE));
         BOOM_TYPE.put("MEDIUM",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.LAVA_BUCKET), Formatting.YELLOW));
+                new Pair<>(new ItemStack(Items.LAVA_BUCKET), Formatting.YELLOW));
         BOOM_TYPE.put("HIGH",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.FIRE_CHARGE), Formatting.GOLD));
+                new Pair<>(new ItemStack(Items.FIRE_CHARGE), Formatting.GOLD));
         BOOM_TYPE.put("EXPLOSIVE",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.TNT), Formatting.RED));
+                new Pair<>(new ItemStack(Items.TNT), Formatting.RED));
         BOOM_TYPE.put("CATACLYSMIC",
-                new Pair<ItemStack, Formatting>(new ItemStack(Items.SKELETON_SKULL), Formatting.DARK_RED));
+                new Pair<>(new ItemStack(Items.SKELETON_SKULL), Formatting.DARK_RED));
     }
 
     public VolcanoWidget() {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
index 3e037256..bca67b70 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
@@ -25,13 +25,13 @@ import net.minecraft.util.Formatting;
  */
 public abstract class Widget {
 
-    private ArrayList<Component> components = new ArrayList<>();
+    private final ArrayList<Component> components = new ArrayList<>();
     private int w = 0, h = 0;
     private int x = 0, y = 0;
-    private int color;
-    private Text title;
+    private final int color;
+    private final Text title;
 
-    private static TextRenderer txtRend = MinecraftClient.getInstance().textRenderer;
+    private static final TextRenderer txtRend = MinecraftClient.getInstance().textRenderer;
 
     static final int BORDER_SZE_N = txtRend.fontHeight + 4;
     static final int BORDER_SZE_S = 4;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/Component.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/Component.java
index 57e26ab2..118d3cfe 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/Component.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/Component.java
@@ -13,7 +13,7 @@ public abstract class Component {
     public static final int PAD_S = 2;
     public static final int PAD_L = 4;
 
-    static TextRenderer txtRend = MinecraftClient.getInstance().textRenderer;
+    static final TextRenderer txtRend = MinecraftClient.getInstance().textRenderer;
 
     // these should always be the content dimensions without any padding.
     int width, height;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java
index a7cc8d12..90e210e9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java
@@ -19,25 +19,25 @@ public class ProgressComponent extends Component {
     private static final int ICO_OFFS = 4;
     private static final int COL_BG_BAR = 0xf0101010;
 
-    private ItemStack ico;
-    private Text desc, bar;
-    private float pcnt;
-    private int color;
-    private int barW;
+    private final ItemStack ico;
+    private final Text desc, bar;
+    private final float pcnt;
+    private final int color;
+    private final int barW;
 
     public ProgressComponent(ItemStack ico, Text d, Text b, float pcnt, int color) {
-        this.ico = (ico == null) ? Ico.BARRIER : ico;
-        this.desc = d;
-        this.bar = b;
-        this.color = 0xff000000 | color;
-        this.pcnt = pcnt;
-
         if (d == null || b == null) {
             this.ico = Ico.BARRIER;
             this.desc = Text.literal("No data").formatted(Formatting.GRAY);
             this.bar = Text.literal("---").formatted(Formatting.GRAY);
             this.pcnt = 100f;
             this.color = 0xff000000 | Formatting.DARK_GRAY.getColorValue();
+        } else {
+            this.ico = (ico == null) ? Ico.BARRIER : ico;
+            this.desc = d;
+            this.bar = b;
+            this.pcnt = pcnt;
+            this.color = 0xff000000 | color;
         }
 
         this.barW = BAR_WIDTH;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java
index 30287dc0..850bbb0d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java
@@ -8,9 +8,9 @@ import net.minecraft.client.gui.DrawContext;
  */
 public class TableComponent extends Component {
 
-    private Component[][] comps;
-    private int color;
-    private int cols, rows;
+    private final Component[][] comps;
+    private final int color;
+    private final int cols, rows;
     private int cellW, cellH;
 
     public TableComponent(int w, int h, int col) {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
index ab8546cc..88d40891 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/hud/HudCommsWidget.java
@@ -29,8 +29,8 @@ public class HudCommsWidget extends Widget {
     // the ctor eventually tries to get the font's height, which doesn't work
     //   when called before the client window is created (roughly).
     // the rebdering god 2 from the fabricord explained that detail, thanks!
-    public static HudCommsWidget INSTANCE = new HudCommsWidget();
-    public static HudCommsWidget INSTANCE_CFG = new HudCommsWidget();
+    public static final HudCommsWidget INSTANCE = new HudCommsWidget();
+    public static final HudCommsWidget INSTANCE_CFG = new HudCommsWidget();
 
     // another repulsive hack to make this widget-like hud element work with the new widget class
     // DON'T USE WITH THE WIDGET SYSTEM, ONLY USE FOR DWARVENHUD!
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java
index ea67a309..375a41b9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java
@@ -36,7 +36,7 @@ public class RiftProgressWidget extends Widget {
 
 		boolean hasTimecharms = false;
 		boolean hasEnigmaSouls = false;
-		int montezumaPos = 0;
+		int montezumaPos;
 
 		// Check each position to see what is or isn't there so we don't try adding
 		// invalid components