Sort + Colourize Blessings

1 files changed, 30 insertions, 3 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
index 6ad5268e..56529e55 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
@@ -1,5 +1,8 @@
 package me.xmrvizzy.skyblocker.skyblock.tabhud.widget;
 
+import java.util.Arrays;
+import java.util.Comparator;
+
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -30,15 +33,39 @@ public class DungeonBuffWidget extends Widget {
             this.pack();
             return;
         }
+        
+        //Filter out text unrelated to blessings
+        lines = Arrays.stream(lines).filter(s -> s.contains("Blessing")).toArray(String[]::new);
+        
+        //Alphabetically sort the blessings
+        Arrays.sort(lines, new Comparator<String>() {
+        	@Override
+        	public int compare(String o1, String o2) {
+        		return o1.toLowerCase().compareTo(o2.toLowerCase());
+        	}
+        });
 
-        for (int i = 1; i < lines.length; i++) {
+        for (int i = 0; i < lines.length; i++) {
             if (lines[i].length() < 3) { // empty line is §s
                 break;
             }
-            this.addComponent(new PlainTextComponent(Text.of(lines[i])));
+            
+            int color = getBlessingColor(lines[i]);
+            
+            this.addComponent(new PlainTextComponent(Text.literal(lines[i]).styled(style -> style.withColor(color))));
         }
 
         this.pack();
     }
+    
+    public int getBlessingColor(String blessing) {
+    	if (blessing.contains("Life")) return Formatting.LIGHT_PURPLE.getColorValue().intValue();
+    	if (blessing.contains("Power")) return Formatting.RED.getColorValue().intValue();
+    	if (blessing.contains("Stone")) return Formatting.GREEN.getColorValue().intValue();
+    	if (blessing.contains("Time")) return 0xafb8c1;
+    	if (blessing.contains("Wisdom")) return Formatting.AQUA.getColorValue().intValue();
+    	
+    	return 0xffffff;
+    }
 
-}
+}
\ No newline at end of file