diff options
| author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-14 07:57:59 +0300 |
|---|---|---|
| committer | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-05-14 07:57:59 +0300 |
| commit | b0adf838051c98bfe01ba1b0c4bca95e8f078345 (patch) | |
| tree | 109a03f837060f881d1a3aaa5fdf496943c7053d /src | |
| parent | fb2ce0bb3097ef1f5c5b747b0b8783d228ecce9a (diff) | |
| download | Skyblocker-b0adf838051c98bfe01ba1b0c4bca95e8f078345.tar.gz Skyblocker-b0adf838051c98bfe01ba1b0c4bca95e8f078345.tar.bz2 Skyblocker-b0adf838051c98bfe01ba1b0c4bca95e8f078345.zip | |
Actually preserve damage color if it doesn't match the criteria
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java b/src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java index b7726c17..b25a8c63 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java @@ -31,7 +31,13 @@ public class CompactDamage { String dmg = text.getString().replace(",", ""); if (!NumberUtils.isParsable(dmg)) return; //Sanity check String prettifiedDmg = prettifyDamageNumber(Long.parseLong(dmg)); - prettierCustomName = Text.literal("").append(Text.literal(prettifiedDmg).withColor(text.getStyle().getColor() == TextColor.fromFormatting(Formatting.GRAY) ? SkyblockerConfigManager.get().uiAndVisuals.compactDamage.normalDamageColor.getRGB() & 0x00FFFFFF : Formatting.GRAY.getColorValue())).setStyle(customName.getStyle()); + int color; + if (text.getStyle().getColor() != null) { + if (text.getStyle().getColor() == TextColor.fromFormatting(Formatting.GRAY)) { + color = SkyblockerConfigManager.get().uiAndVisuals.compactDamage.normalDamageColor.getRGB(); + } else color = text.getStyle().getColor().getRgb(); + } else color = SkyblockerConfigManager.get().uiAndVisuals.compactDamage.normalDamageColor.getRGB(); + prettierCustomName = Text.literal("").append(Text.literal(prettifiedDmg).withColor(color).setStyle(customName.getStyle())); } else { //Crit damage String dmg = siblings.subList(1, siblings.size() - 1) //First and last sibling are the crit symbols .stream() |