aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/tabhud
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/tabhud')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java
index 8168d1ce..24dcc229 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java
@@ -10,8 +10,12 @@ import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
+import static java.util.Map.entry;
+
// this widget shows info about the current jacob's contest (garden only)
public class JacobsContestWidget extends Widget {
@@ -22,21 +26,18 @@ public class JacobsContestWidget extends Widget {
//TODO Properly match the contest placement and display it
private static final Pattern CROP_PATTERN = Pattern.compile("(?<fortune>[☘○]) (?<crop>[A-Za-z ]+).*");
- private static final HashMap<String, ItemStack> FARM_DATA = new HashMap<>();
-
- // again, there HAS to be a better way to do this
- static {
- FARM_DATA.put("Wheat", new ItemStack(Items.WHEAT));
- FARM_DATA.put("Sugar Cane", new ItemStack(Items.SUGAR_CANE));
- FARM_DATA.put("Carrot", new ItemStack(Items.CARROT));
- FARM_DATA.put("Potato", new ItemStack(Items.POTATO));
- FARM_DATA.put("Melon", new ItemStack(Items.MELON_SLICE));
- FARM_DATA.put("Pumpkin", new ItemStack(Items.PUMPKIN));
- FARM_DATA.put("Cocoa Beans", new ItemStack(Items.COCOA_BEANS));
- FARM_DATA.put("Nether Wart", new ItemStack(Items.NETHER_WART));
- FARM_DATA.put("Cactus", new ItemStack(Items.CACTUS));
- FARM_DATA.put("Mushroom", new ItemStack(Items.RED_MUSHROOM));
- }
+ private static final Map<String, ItemStack> FARM_DATA = Map.ofEntries(
+ entry("Wheat", new ItemStack(Items.WHEAT)),
+ entry("Sugar Cane", new ItemStack(Items.SUGAR_CANE)),
+ entry("Carrot", new ItemStack(Items.CARROT)),
+ entry("Potato", new ItemStack(Items.POTATO)),
+ entry("Melon", new ItemStack(Items.MELON_SLICE)),
+ entry("Pumpkin", new ItemStack(Items.PUMPKIN)),
+ entry("Cocoa Beans", new ItemStack(Items.COCOA_BEANS)),
+ entry("Nether Wart", new ItemStack(Items.NETHER_WART)),
+ entry("Cactus", new ItemStack(Items.CACTUS)),
+ entry("Mushroom", new ItemStack(Items.RED_MUSHROOM))
+ );
public JacobsContestWidget() {
super(TITLE, Formatting.YELLOW.getColorValue());
@@ -52,7 +53,7 @@ public class JacobsContestWidget extends Widget {
this.addSimpleIcoText(Ico.CLOCK, "Starts in:", Formatting.GOLD, 76);
}
- TableComponent tc = new TableComponent(1, 3, Formatting.YELLOW .getColorValue());
+ TableComponent tc = new TableComponent(1, 3, Formatting.YELLOW.getColorValue());
for (int i = 77; i < 80; i++) {
Matcher item = PlayerListMgr.regexAt(i, CROP_PATTERN);