From 2db197037657265229676b23871486710d82a417 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Tue, 18 Dec 2018 21:04:26 +0300 Subject: [PATCH] Com.sprintf(String, Vargs) -> String.format(String, Object...) --- src/main/java/lwjake2/client/CL_inv.java | 6 ++++-- src/main/java/lwjake2/client/Console.java | 2 +- src/main/java/lwjake2/client/SCR.java | 3 +-- src/main/java/lwjake2/game/PlayerHud.java | 14 +++++++------- src/main/java/lwjake2/qcommon/Qcommon.java | 12 ++++++------ src/main/java/lwjake2/server/SV_CCMDS.java | 11 +++++------ src/main/java/lwjake2/util/Lib.java | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/lwjake2/client/CL_inv.java b/src/main/java/lwjake2/client/CL_inv.java index 5dcf48b..b94b4ff 100644 --- a/src/main/java/lwjake2/client/CL_inv.java +++ b/src/main/java/lwjake2/client/CL_inv.java @@ -120,8 +120,10 @@ public class CL_inv { break; } - string = Com.sprintf("%6s %3i %s", new Vargs(3).add(bind).add(Globals.cl.inventory[item]).add( - Globals.cl.configstrings[Defines.CS_ITEMS + item])); + string = String.format("%s %d %s", + bind, + Globals.cl.inventory[item], + Globals.cl.configstrings[Defines.CS_ITEMS + item]); if (item != selected) string = getHighBitString(string); else // draw a blinky cursor by the selected item diff --git a/src/main/java/lwjake2/client/Console.java b/src/main/java/lwjake2/client/Console.java index 52ae9f1..06028c4 100644 --- a/src/main/java/lwjake2/client/Console.java +++ b/src/main/java/lwjake2/client/Console.java @@ -507,7 +507,7 @@ public final class Console extends Globals { SCR.AddDirtyPoint(0, 0); SCR.AddDirtyPoint(viddef.width - 1, lines - 1); - version = Com.sprintf("v%4.2f", new Vargs(1).add(VERSION)); + version = String.format("v%4.2f", VERSION); for (x = 0; x < 5; x++) re.DrawChar(viddef.width - 44 + x * 8, lines - 12, 128 + version .charAt(x)); diff --git a/src/main/java/lwjake2/client/SCR.java b/src/main/java/lwjake2/client/SCR.java index f69446f..88aa815 100644 --- a/src/main/java/lwjake2/client/SCR.java +++ b/src/main/java/lwjake2/client/SCR.java @@ -980,8 +980,7 @@ public final class SCR extends Globals { ping = 999; // sprintf(block, "%3d %3d %-12.12s", score, ping, ci->name); - String block = Com.sprintf("%3d %3d %-12.12s", new Vargs(3) - .add(score).add(ping).add(ci.name)); + String block = String.format("%d %d %s", score, ping, ci.name); if (value == cl.playernum) Console.DrawAltString(x, y, block); diff --git a/src/main/java/lwjake2/game/PlayerHud.java b/src/main/java/lwjake2/game/PlayerHud.java index 11daa48..ab679f1 100644 --- a/src/main/java/lwjake2/game/PlayerHud.java +++ b/src/main/java/lwjake2/game/PlayerHud.java @@ -516,13 +516,13 @@ public class PlayerHud { .append("\" "); // help 2 sb.append("xv 50 yv 164 string2 \" kills goals secrets\" "); sb.append("xv 50 yv 172 string2 \""); - sb.append(Com.sprintf("%3i/%3i %i/%i %i/%i\" ", new Vargs(6) - .add(GameBase.level.killed_monsters).add( - GameBase.level.total_monsters).add( - GameBase.level.found_goals).add( - GameBase.level.total_goals).add( - GameBase.level.found_secrets).add( - GameBase.level.total_secrets))); + sb.append(String.format("%d/%d %d/%d %d/%d\" ", + GameBase.level.killed_monsters, + GameBase.level.total_monsters, + GameBase.level.found_goals, + GameBase.level.total_goals, + GameBase.level.found_secrets, + GameBase.level.total_secrets)); GameBase.gi.WriteByte(Defines.svc_layout); GameBase.gi.WriteString(sb.toString()); diff --git a/src/main/java/lwjake2/qcommon/Qcommon.java b/src/main/java/lwjake2/qcommon/Qcommon.java index b7932c7..7a07a23 100644 --- a/src/main/java/lwjake2/qcommon/Qcommon.java +++ b/src/main/java/lwjake2/qcommon/Qcommon.java @@ -93,12 +93,12 @@ public final class Qcommon extends Globals { Globals.logfile_active= Cvar.Get("logfile", "0", 0); Globals.showtrace= Cvar.Get("showtrace", "0", 0); Globals.dedicated= Cvar.Get("dedicated", "0", CVAR_NOSET); - String s = Com.sprintf("%4.2f %s %s %s", - new Vargs(4) - .add(Globals.VERSION) - .add(CPUSTRING) - .add(Globals.__DATE__) - .add(BUILDSTRING)); + String s = String.format("%4.2f %s %s %s", + Globals.VERSION, + CPUSTRING, + Globals.__DATE__, + BUILDSTRING + ); Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET); diff --git a/src/main/java/lwjake2/server/SV_CCMDS.java b/src/main/java/lwjake2/server/SV_CCMDS.java index 59484a6..0a5f069 100644 --- a/src/main/java/lwjake2/server/SV_CCMDS.java +++ b/src/main/java/lwjake2/server/SV_CCMDS.java @@ -396,12 +396,11 @@ public class SV_CCMDS { if (!autosave) { Calendar c = Calendar.getInstance(); - comment = - Com.sprintf( - "%2i:%2i %2i/%2i ", - new Vargs().add(c.get(Calendar.HOUR_OF_DAY)).add(c.get(Calendar.MINUTE)).add( - c.get(Calendar.MONTH) + 1).add( - c.get(Calendar.DAY_OF_MONTH))); + comment = String.format("%d:%d %d/%d ", + c.get(Calendar.HOUR_OF_DAY), + c.get(Calendar.MINUTE), + c.get(Calendar.MONTH) + 1, + c.get(Calendar.DAY_OF_MONTH)); comment += SV_INIT.sv.configstrings[Defines.CS_NAME]; } else { diff --git a/src/main/java/lwjake2/util/Lib.java b/src/main/java/lwjake2/util/Lib.java index 589e6a0..0c092c4 100644 --- a/src/main/java/lwjake2/util/Lib.java +++ b/src/main/java/lwjake2/util/Lib.java @@ -48,7 +48,7 @@ public class Lib { /** Converts a vector to a beatiful string. */ public static String vtofsbeaty(float[] v) { - return Com.sprintf("%8.2f %8.2f %8.2f", new Vargs().add(v[0]).add(v[1]).add(v[2])); + return String.format("%8.2f %8.2f %8.2f", v[0], v[1], v[2]); } /** Like in libc. */