diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index b3e8cd530e..51e28f069c 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -180,7 +180,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra } if(Core.settings.getBool("playerchat") && ((textFadeTime > 0 && lastText != null) || typing)){ - String text = textFadeTime <= 0 || lastText == null ? "[LIGHT_GRAY]" + Strings.animated(Time.time(), 4, 15f, ".") : lastText; + String text = textFadeTime <= 0 || lastText == null ? "[lightgray]" + Strings.animated(Time.time(), 4, 15f, ".") : lastText; float width = 100f; float visualFadeTime = 1f - Mathf.curve(1f - textFadeTime, 0.9f); font.setColor(1f, 1f, 1f, textFadeTime <= 0 || lastText == null ? 1f : visualFadeTime); diff --git a/core/src/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java index 50f29c5b11..d654aecab1 100644 --- a/core/src/mindustry/ui/ContentDisplay.java +++ b/core/src/mindustry/ui/ContentDisplay.java @@ -48,7 +48,7 @@ public class ContentDisplay{ for(BlockStat stat : map.keys()){ table.table(inset -> { inset.left(); - inset.add("[LIGHT_GRAY]" + stat.localized() + ":[] ").left(); + inset.add("[lightgray]" + stat.localized() + ":[] ").left(); Array arr = map.get(stat); for(StatValue value : arr){ value.display(inset); diff --git a/core/src/mindustry/ui/dialogs/AdminsDialog.java b/core/src/mindustry/ui/dialogs/AdminsDialog.java index dad00e9967..29f5410091 100644 --- a/core/src/mindustry/ui/dialogs/AdminsDialog.java +++ b/core/src/mindustry/ui/dialogs/AdminsDialog.java @@ -36,7 +36,7 @@ public class AdminsDialog extends FloatingDialog{ Table res = new Table(Tex.button); res.margin(14f); - res.labelWrap("[LIGHT_GRAY]" + info.lastName).width(w - h - 24f); + res.labelWrap("[lightgray]" + info.lastName).width(w - h - 24f); res.add().growX(); res.button(Icon.cancel, () -> { ui.showConfirm("$confirm", "$confirmunadmin", () -> { diff --git a/core/src/mindustry/ui/dialogs/BansDialog.java b/core/src/mindustry/ui/dialogs/BansDialog.java index 790a7aed58..98a65de6e9 100644 --- a/core/src/mindustry/ui/dialogs/BansDialog.java +++ b/core/src/mindustry/ui/dialogs/BansDialog.java @@ -37,7 +37,7 @@ public class BansDialog extends FloatingDialog{ Table res = new Table(Tex.button); res.margin(14f); - res.labelWrap("IP: [LIGHT_GRAY]" + info.lastIP + "\n[]Name: [LIGHT_GRAY]" + info.lastName).width(w - h - 24f); + res.labelWrap("IP: [lightgray]" + info.lastIP + "\n[]Name: [lightgray]" + info.lastName).width(w - h - 24f); res.add().growX(); res.button(Icon.cancel, () -> { ui.showConfirm("$confirm", "$confirmunban", () -> { diff --git a/core/src/mindustry/ui/dialogs/GameOverDialog.java b/core/src/mindustry/ui/dialogs/GameOverDialog.java index 3a03d43480..9dea740a88 100644 --- a/core/src/mindustry/ui/dialogs/GameOverDialog.java +++ b/core/src/mindustry/ui/dialogs/GameOverDialog.java @@ -70,7 +70,7 @@ public class GameOverDialog extends FloatingDialog{ for(Item item : content.items()){ if(state.stats.itemsDelivered.get(item, 0) > 0){ t.table(items -> { - items.add(" [LIGHT_GRAY]" + state.stats.itemsDelivered.get(item, 0)); + items.add(" [lightgray]" + state.stats.itemsDelivered.get(item, 0)); items.image(item.icon(Cicon.small)).size(8 * 3).pad(4); }).left(); t.row(); diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 30a2ce5002..54b493a2c9 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -138,7 +138,7 @@ public class ServerControl implements ApplicationListener{ nextMapOverride = null; if(map != null){ Call.onInfoMessage((state.rules.pvp - ? "[YELLOW]The " + event.winner.name + " team is victorious![]" : "[SCARLET]Game over![]") + ? "[yellow]The " + event.winner.name + " team is victorious![]" : "[scarlet]Game over![]") + "\nNext selected map:[accent] " + map.name() + "[]" + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[white]" : "") + "." + "\nNew game begins in " + roundExtraTime + " seconds.");