From 62248f8da0f35e3f2eee82cd3070ac53620ac3e6 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 5 Jun 2019 23:51:44 +0300 Subject: [PATCH] fix: String --- src/main/java/lwjake2/client/CL_view.java | 2 +- src/main/java/lwjake2/client/Key.java | 8 ++++---- src/main/java/lwjake2/client/Menu.java | 4 ++-- src/main/java/lwjake2/client/client_state_t.java | 2 +- src/main/java/lwjake2/game/Cmd.java | 2 +- src/main/java/lwjake2/game/GameBase.java | 4 ---- src/main/java/lwjake2/game/GameMisc.java | 2 +- src/main/java/lwjake2/game/GameTarget.java | 4 ++-- src/main/java/lwjake2/qcommon/Cvar.java | 4 ++-- src/main/java/lwjake2/qcommon/MSG.java | 5 ++--- .../java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java | 6 +++--- src/main/java/lwjake2/util/Lib.java | 15 ++------------- src/main/java/lwjake2/util/QuakeFile.java | 2 +- 13 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/main/java/lwjake2/client/CL_view.java b/src/main/java/lwjake2/client/CL_view.java index c728577..fce3e02 100644 --- a/src/main/java/lwjake2/client/CL_view.java +++ b/src/main/java/lwjake2/client/CL_view.java @@ -76,7 +76,7 @@ public class CL_view { for (i = 1; i < Defines.MAX_MODELS && Globals.cl.configstrings[Defines.CS_MODELS + i].length() != 0; i++) { - name = new String(Globals.cl.configstrings[Defines.CS_MODELS + i]); + name = Globals.cl.configstrings[Defines.CS_MODELS + i]; if (name.length() > 37) name = name.substring(0, 36); diff --git a/src/main/java/lwjake2/client/Key.java b/src/main/java/lwjake2/client/Key.java index e91fb02..5054ca0 100644 --- a/src/main/java/lwjake2/client/Key.java +++ b/src/main/java/lwjake2/client/Key.java @@ -741,14 +741,14 @@ public class Key { } // copy the rest of the command line - String cmd = ""; // start out with a null string + StringBuilder cmd = new StringBuilder(); // start out with a null string for (int i = 2; i < c; i++) { - cmd += Cmd.Argv(i); + cmd.append(Cmd.Argv(i)); if (i != (c - 1)) - cmd += " "; + cmd.append(" "); } - SetBinding(b, cmd); + SetBinding(b, cmd.toString()); } static void SetBinding(int keynum, String binding) { diff --git a/src/main/java/lwjake2/client/Menu.java b/src/main/java/lwjake2/client/Menu.java index 01c63bc..4b69a77 100644 --- a/src/main/java/lwjake2/client/Menu.java +++ b/src/main/java/lwjake2/client/Menu.java @@ -1622,11 +1622,11 @@ public final class Menu extends Key { int n; int isdeveloper; - byte b[] = UnpackLoader.loadFile("credits"); + byte[] b = UnpackLoader.loadFile("credits"); if (b != null) { creditsBuffer = new String(b); - String line[] = creditsBuffer.split("\r\n"); + String[] line = creditsBuffer.split("\r\n"); for (n = 0; n < line.length; n++) { creditsIndex[n] = line[n]; diff --git a/src/main/java/lwjake2/client/client_state_t.java b/src/main/java/lwjake2/client/client_state_t.java index c733672..e9e1d30 100644 --- a/src/main/java/lwjake2/client/client_state_t.java +++ b/src/main/java/lwjake2/client/client_state_t.java @@ -37,7 +37,7 @@ public class client_state_t { } for (int n = 0; n < Defines.MAX_CONFIGSTRINGS; n++) - configstrings[n] = new String(); + configstrings[n] = ""; for (int n=0; n < Defines.MAX_CLIENTS; n++) clientinfo[n] = new clientinfo_t(); diff --git a/src/main/java/lwjake2/game/Cmd.java b/src/main/java/lwjake2/game/Cmd.java index 2779b8f..890c9b5 100644 --- a/src/main/java/lwjake2/game/Cmd.java +++ b/src/main/java/lwjake2/game/Cmd.java @@ -359,7 +359,7 @@ public final class Cmd { } public static String Args() { - return new String(cmd_args); + return cmd_args; } /** diff --git a/src/main/java/lwjake2/game/GameBase.java b/src/main/java/lwjake2/game/GameBase.java index 9f4f12f..4cbee0f 100644 --- a/src/main/java/lwjake2/game/GameBase.java +++ b/src/main/java/lwjake2/game/GameBase.java @@ -282,10 +282,6 @@ public class GameBase { Math3D.VectorClear(angles); } - public static String G_CopyString(String in) { - return new String(in); - } - /** * G_TouchTriggers */ diff --git a/src/main/java/lwjake2/game/GameMisc.java b/src/main/java/lwjake2/game/GameMisc.java index 0fa31f6..520b8e8 100644 --- a/src/main/java/lwjake2/game/GameMisc.java +++ b/src/main/java/lwjake2/game/GameMisc.java @@ -647,7 +647,7 @@ public class GameMisc { func_clock_reset(self); - self.message = new String(); + self.message = ""; self.think = func_clock_think; diff --git a/src/main/java/lwjake2/game/GameTarget.java b/src/main/java/lwjake2/game/GameTarget.java index 86ea181..23041ff 100644 --- a/src/main/java/lwjake2/game/GameTarget.java +++ b/src/main/java/lwjake2/game/GameTarget.java @@ -727,8 +727,8 @@ public class GameTarget { public String getID() { return "target_lightramp_think"; } public boolean think(edict_t self) { - char tmp[] = {(char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) - / Defines.FRAMETIME * self.movedir[2]))}; + char[] tmp = { (char) ('a' + (int) (self.movedir[0] + (GameBase.level.time - self.timestamp) + / Defines.FRAMETIME * self.movedir[2])) }; GameBase.gi.configstring(Defines.CS_LIGHTS + self.enemy.style, new String(tmp)); diff --git a/src/main/java/lwjake2/qcommon/Cvar.java b/src/main/java/lwjake2/qcommon/Cvar.java index 0609c5f..6825cce 100644 --- a/src/main/java/lwjake2/qcommon/Cvar.java +++ b/src/main/java/lwjake2/qcommon/Cvar.java @@ -72,8 +72,8 @@ public class Cvar { } } var = new cvar_t(); - var.name = new String(var_name); - var.string = new String(var_value); + var.name = var_name; + var.string = var_value; var.modified = true; // handles atof(var.string) try { diff --git a/src/main/java/lwjake2/qcommon/MSG.java b/src/main/java/lwjake2/qcommon/MSG.java index 52cffc9..53d8cf1 100644 --- a/src/main/java/lwjake2/qcommon/MSG.java +++ b/src/main/java/lwjake2/qcommon/MSG.java @@ -478,10 +478,9 @@ public class MSG { readbuf[l] = c; l++; } while (l < 2047); - - String ret = new String(readbuf, 0, l); + // Com.dprintln("MSG.ReadString:[" + ret + "]"); - return ret; + return new String(readbuf, 0, l); } public static String ReadStringLine(sizebuf_t msg_read) { diff --git a/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java b/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java index a5fc252..99eb817 100644 --- a/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java +++ b/src/main/java/lwjake2/sound/lwjgl/LWJGLSoundImpl.java @@ -436,7 +436,7 @@ public final class LWJGLSoundImpl implements Sound { String s; int i; - s = new String(truename); + s = truename; // find a free sfx for (i=0 ; i < num_sfx ; i++) @@ -452,7 +452,7 @@ public final class LWJGLSoundImpl implements Sound { sfx = known_sfx[i]; sfx.clear(); - sfx.name = new String(aliasname); + sfx.name = aliasname; sfx.registration_sequence = s_registration_sequence; sfx.truename = s; // set the AL bufferId @@ -541,7 +541,7 @@ public final class LWJGLSoundImpl implements Sound { i = 1; while (i < Cmd.Argc()) { - name = new String(Cmd.Argv(i)); + name = Cmd.Argv(i); if (name.indexOf('.') == -1) name += ".wav"; diff --git a/src/main/java/lwjake2/util/Lib.java b/src/main/java/lwjake2/util/Lib.java index b77a9db..fcb2d83 100644 --- a/src/main/java/lwjake2/util/Lib.java +++ b/src/main/java/lwjake2/util/Lib.java @@ -31,6 +31,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.nio.IntBuffer; +import java.nio.charset.StandardCharsets; @Slf4j public class Lib { @@ -324,19 +325,7 @@ public class Lib { * avoid new String(bytes) because it is using system specific character encoding. */ public static String bytesToString(byte[] value) { - try { - return new String(value, "ISO-8859-1"); - } catch (UnsupportedEncodingException e) { - // can't happen: Latin 1 is a standard encoding - return null; - } - } - - /** Helper method that savely handles the null termination of old C String data. */ - public static String CtoJava(String old) { - int index = old.indexOf('\0'); - if (index == 0) return ""; - return (index > 0) ? old.substring(0, index) : old; + return new String(value, StandardCharsets.ISO_8859_1); } /** Helper method that savely handles the null termination of old C String data. */ diff --git a/src/main/java/lwjake2/util/QuakeFile.java b/src/main/java/lwjake2/util/QuakeFile.java index bd8d7db..961a356 100644 --- a/src/main/java/lwjake2/util/QuakeFile.java +++ b/src/main/java/lwjake2/util/QuakeFile.java @@ -66,7 +66,7 @@ public class QuakeFile extends RandomAccessFile { if (len == 0) return ""; - byte bb[] = new byte[len]; + byte[] bb = new byte[len]; super.read(bb, 0, len);