Skip to content

Commit 6ea6e17

Browse files
committed
Game#sendText strings can also be formatted
1 parent aa10bea commit 6ea6e17

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/bwapi/Game.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,8 +1524,8 @@ public void printf(final String string, final Text... colors) {
15241524
* @param string String to send.
15251525
* @see #sendTextEx
15261526
*/
1527-
public void sendText(final String string) {
1528-
addCommand(SendText, client.addString(string), 0);
1527+
public void sendText(final String string, final Text... colors) {
1528+
sendTextEx(false, string, colors);
15291529
}
15301530

15311531
/**
@@ -1536,8 +1536,9 @@ public void sendText(final String string) {
15361536
* @param string String to send.
15371537
* @see #sendText
15381538
*/
1539-
public void sendTextEx(final boolean toAllies, final String string) {
1540-
addCommand(SendText, client.addString(string), toAllies ? 1 : 0);
1539+
public void sendTextEx(final boolean toAllies, final String string, final Text... colors) {
1540+
final String formatted = formatString(string, colors);
1541+
addCommand(SendText, client.addString(formatted), toAllies ? 1 : 0);
15411542
}
15421543

15431544
/**
@@ -1764,7 +1765,6 @@ public void drawTextMouse(final int x, final int y, final String string, final T
17641765

17651766
public void drawTextMouse(final Position p, final String string, final Text... colors) {
17661767
drawTextMouse(p.x, p.y, string, colors);
1767-
17681768
}
17691769

17701770
public void drawTextScreen(final int x, final int y, final String string, final Text... colors) {
@@ -1893,7 +1893,6 @@ public void drawTriangleMouse(Position a, Position b, Position c, Color color) {
18931893

18941894
public void drawTriangleMouse(Position a, Position b, Position c, Color color, boolean isSolid) {
18951895
drawTriangle(CoordinateType.Mouse, a.x, a.y, b.x, b.y, c.x, c.y, color, isSolid);
1896-
18971896
}
18981897

18991898
public void drawTriangleScreen(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
@@ -2105,12 +2104,10 @@ public void drawLineMap(Position a, Position b, Color color) {
21052104

21062105
public void drawLineMouse(int x1, int y1, int x2, int y2, Color color) {
21072106
drawLine(CoordinateType.Mouse, x1, y1, x2, y2, color);
2108-
21092107
}
21102108

21112109
public void drawLineMouse(Position a, Position b, Color color) {
21122110
drawLine(CoordinateType.Mouse, a.x, a.y, b.x, b.y, color);
2113-
21142111
}
21152112

21162113
public void drawLineScreen(int x1, int y1, int x2, int y2, Color color) {

0 commit comments

Comments
 (0)