aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-17 12:11:44 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2025-06-17 12:11:44 -0400
commit7d0b1a3156903e614ab353e0744eff6089527092 (patch)
tree151a3834d3bab0e37e92eaab51285be57fc488d6 /src/main/java
parent494d9d7e30def0509e9037178b262fcb82bc6603 (diff)
downloadSkyblocker-7d0b1a3156903e614ab353e0744eff6089527092.tar.gz
Skyblocker-7d0b1a3156903e614ab353e0744eff6089527092.tar.bz2
Skyblocker-7d0b1a3156903e614ab353e0744eff6089527092.zip
Avoid more set copies
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java5
6 files changed, 13 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java
index 83c8b537..f2ebab44 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/ItemPickupWidget.java
@@ -162,7 +162,7 @@ public class ItemPickupWidget extends ComponentBasedWidget {
@Override
public Set<Location> availableLocations() {
- return Set.of(Location.values());
+ return ALL_LOCATIONS;
}
@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java
index 78cc2c1f..f2ffc42b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java
@@ -25,6 +25,7 @@ public class CrystalsHudWidget extends HudWidget {
protected static final Identifier MAP_TEXTURE = Identifier.of(SkyblockerMod.NAMESPACE, "textures/gui/crystals_map.png");
private static final Identifier MAP_ICON = Identifier.ofVanilla("textures/map/decorations/player.png");
private static final List<String> SMALL_LOCATIONS = List.of("Fairy Grotto", "King Yolkar", "Corleone", "Odawa", "Key Guardian", "Unknown");
+ private static final Set<Location> AVAILABLE_LOCATIONS = Set.of(Location.CRYSTAL_HOLLOWS);
private static CrystalsHudWidget instance = null;
@@ -70,7 +71,7 @@ public class CrystalsHudWidget extends HudWidget {
@Override
public Set<Location> availableLocations() {
- return Set.of(Location.CRYSTAL_HOLLOWS);
+ return AVAILABLE_LOCATIONS;
}
@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
index 8767d580..674944d4 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/end/EndHudWidget.java
@@ -23,6 +23,7 @@ import java.util.Set;
@RegisterWidget
public class EndHudWidget extends ComponentBasedWidget {
private static final MutableText TITLE = Text.literal("The End").formatted(Formatting.LIGHT_PURPLE, Formatting.BOLD);
+ private static final Set<Location> AVAILABLE_LOCATIONS = Set.of(Location.THE_END);
private static EndHudWidget instance = null;
@@ -52,7 +53,7 @@ public class EndHudWidget extends ComponentBasedWidget {
@Override
public Set<Location> availableLocations() {
- return Set.of(Location.THE_END);
+ return AVAILABLE_LOCATIONS;
}
@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java
index 70695270..6d404442 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java
@@ -40,7 +40,7 @@ public class FishingHudWidget extends ComponentBasedWidget {
@Override
public Set<Location> availableLocations() {
- return Set.of(Location.values());
+ return ALL_LOCATIONS;
}
@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index 532ba879..0cabbef7 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -25,6 +25,7 @@ import java.util.Set;
@RegisterWidget
public class FarmingHudWidget extends ComponentBasedWidget {
private static final MutableText TITLE = Text.literal("Farming").formatted(Formatting.YELLOW, Formatting.BOLD);
+ private static final Set<Location> AVAILABLE_LOCATIONS = Set.of(Location.GARDEN);
public static final Map<String, String> FARMING_TOOLS = Map.ofEntries(
Map.entry("THEORETICAL_HOE_WHEAT_1", "WHEAT"),
Map.entry("THEORETICAL_HOE_WHEAT_2", "WHEAT"),
@@ -179,7 +180,7 @@ public class FarmingHudWidget extends ComponentBasedWidget {
@Override
public Set<Location> availableLocations() {
- return Set.of(Location.GARDEN);
+ return AVAILABLE_LOCATIONS;
}
@Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java
index 5a0a3354..1b6ac57b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/HudWidget.java
@@ -10,6 +10,11 @@ import java.util.Objects;
import java.util.Set;
public abstract class HudWidget extends AbstractWidget {
+ /**
+ * Single constant set for representing all possible locations for a {@code HudWidget} to prevent unnecessarily
+ * recreating this set many times over (not the best for efficiency).
+ */
+ protected static final Set<Location> ALL_LOCATIONS = Set.of(Location.values());
private final String internalID;