aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-06-17 21:58:01 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2023-06-18 13:12:06 -0400
commit1f15c252969c6c09de7b4b11110b12eccf5e90da (patch)
tree35da0ad6f1938bef9284a399830dd91334b4df40 /src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget
parentcafe56cd21b5ebc3cd17b52ee86a81ec469795a5 (diff)
downloadSkyblocker-1f15c252969c6c09de7b4b11110b12eccf5e90da.tar.gz
Skyblocker-1f15c252969c6c09de7b4b11110b12eccf5e90da.tar.bz2
Skyblocker-1f15c252969c6c09de7b4b11110b12eccf5e90da.zip
Improve Crimson Isle Tab HUD
Fixed the reputation widget showing "Max -> Reputation" when you're at max reputation The faction quests text now retains its formatting to be more informative about whether you've not started, started or completed a quest
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java14
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java3
2 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java
index 5c89964e..d13513e4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java
@@ -1,6 +1,7 @@
package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
import me.xmrvizzy.skyblocker.skyblock.tabhud.util.Ico;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr;
import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent;
import net.minecraft.text.MutableText;
@@ -13,12 +14,23 @@ public class QuestWidget extends Widget {
private static final MutableText TITLE = Text.literal("Faction Quests").formatted(Formatting.AQUA,
Formatting.BOLD);
+
+ /**
+ * @return the entry at idx with it's formatting preserved
+ */
+ public static Text passthroughEntryText(int idx) {
+ Text txt = PlayerListMgr.textAt4FactionQuests(idx);
+ if(txt == null) {
+ return null;
+ }
+ return txt;
+ }
public QuestWidget() {
super(TITLE, Formatting.AQUA.getColorValue());
for (int i = 51; i < 56; i++) {
- Text q = Widget.plainEntryText(i);
+ Text q = passthroughEntryText(i);
IcoTextComponent itc = new IcoTextComponent(Ico.BOOK, q);
this.addComponent(itc);
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java
index c0379623..3685e0ca 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java
@@ -54,8 +54,9 @@ public class ReputationWidget extends Widget {
this.addComponent(new ProgressComponent());
} else {
float pcnt = Float.parseFloat(prog.group("prog"));
+ Text reputationText = state.group("from").equals("Max") ? Text.literal("Max Reputation") : Text.literal(state.group("from") + " -> " + state.group("to"));
ProgressComponent pc = new ProgressComponent(Ico.LANTERN,
- Text.of(state.group("from") + " -> " + state.group("to")), rep, pcnt,
+ reputationText, rep, pcnt,
Formatting.AQUA.getColorValue());
this.addComponent(pc);
}