Rename 'Utils' to 'LoadUtils'

FAForever · May 11, 2024 · 020955d · 020955d
1 parent 07bee25
commit 020955d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/body/ReplayBodyParser.java
@@ -1,7 +1,7 @@
 package com.faforever.commons.replay.body;
 
 import com.faforever.commons.replay.shared.LuaData;
-import com.faforever.commons.replay.shared.Utils;
+import com.faforever.commons.replay.shared.LoadUtils;
 import com.google.common.io.LittleEndianDataInputStream;
 import org.jetbrains.annotations.Contract;
 
@@ -89,10 +89,10 @@ private static Event.CommandData parseCommandData(LittleEndianDataInputStream st
 
     Event.CommandFormation commandFormation = parseCommandFormation(stream);
 
-    String blueprintId = Utils.readString(stream);
+    String blueprintId = LoadUtils.readString(stream);
     byte[] arg4 = stream.readNBytes(12);
 
-    LuaData parametersLua = Utils.parseLua(stream);
+    LuaData parametersLua = LoadUtils.parseLua(stream);
     boolean addToQueue = stream.readByte() > 0;
 
     return new Event.CommandData(
@@ -131,7 +131,7 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
 
         case CMDST_CREATE_UNIT -> {
           int playerIndex = stream.readByte();
-          String blueprintId = Utils.readString(stream);
+          String blueprintId = LoadUtils.readString(stream);
           float px = stream.readFloat();
           float pz = stream.readFloat();
           float heading = stream.readFloat();
@@ -140,7 +140,7 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
         }
 
         case CMDST_CREATE_PROP -> {
-          String blueprintId = Utils.readString(stream);
+          String blueprintId = LoadUtils.readString(stream);
           float px = stream.readFloat();
           float pz = stream.readFloat();
           float heading = stream.readFloat();
@@ -163,8 +163,8 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
 
         case CMDST_PROCESS_INFO_PAIR -> {
           int entityId = stream.readInt();
-          String arg1 = Utils.readString(stream);
-          String arg2 = Utils.readString(stream);
+          String arg1 = LoadUtils.readString(stream);
+          String arg2 = LoadUtils.readString(stream);
           yield new Event.ProcessInfoPair(entityId, arg1, arg2);
         }
 
@@ -208,7 +208,7 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
 
         case CMDST_SET_COMMAND_CELLS -> {
           int commandId = stream.readInt();
-          LuaData parametersLua = Utils.parseLua(stream);
+          LuaData parametersLua = LoadUtils.parseLua(stream);
           if (!(parametersLua instanceof LuaData.Nil)) {
             stream.readNBytes(1);
           }
@@ -227,7 +227,7 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
         }
 
         case CMDST_DEBUG_COMMAND -> {
-          String command = Utils.readString(stream);
+          String command = LoadUtils.readString(stream);
           float px = stream.readFloat();
           float py = stream.readFloat();
           float pz = stream.readFloat();
@@ -238,13 +238,13 @@ private static Event parseToken(ReplayBodyToken token) throws IOException {
         }
 
         case CMDST_EXECUTE_LUA_IN_SIM -> {
-          String luaCode = Utils.readString(stream);
+          String luaCode = LoadUtils.readString(stream);
           yield new Event.ExecuteLuaInSim(luaCode);
         }
 
         case CMDST_LUA_SIM_CALLBACK -> {
-          String func = Utils.readString(stream);
-          LuaData args = Utils.parseLua(stream);
+          String func = LoadUtils.readString(stream);
+          LuaData args = LoadUtils.parseLua(stream);
           Event.CommandUnits commandUnits = null;
 
           // suspicion that this is just flat out wrong! Whether there's a selection in the data is not related to whether there are Lua arguments

diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java
@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import static com.faforever.commons.replay.shared.Utils.parseLua;
+import static com.faforever.commons.replay.shared.LoadUtils.parseLua;
 
 public class ReplayHeaderParser {
 

diff --git a/...commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderTokenizer.java b/...commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderTokenizer.java
@@ -1,6 +1,6 @@
 package com.faforever.commons.replay.header;
 
-import com.faforever.commons.replay.shared.Utils;
+import com.faforever.commons.replay.shared.LoadUtils;
 import com.google.common.io.LittleEndianDataInputStream;
 import org.jetbrains.annotations.Contract;
 
@@ -13,13 +13,13 @@ public class ReplayHeaderTokenizer {
   @Contract(pure = true)
   public static ReplayHeaderToken tokenize(LittleEndianDataInputStream dataStream) throws IOException {
 
-    String gameVersion = Utils.readString(dataStream);
-    String arg1 = Utils.readString(dataStream); // Always \r\n
+    String gameVersion = LoadUtils.readString(dataStream);
+    String arg1 = LoadUtils.readString(dataStream); // Always \r\n
 
-    String[] replayAndScenario = Utils.readString(dataStream).split("\\r\\n");
+    String[] replayAndScenario = LoadUtils.readString(dataStream).split("\\r\\n");
     String replayVersion = replayAndScenario[0];
     String pathToScenario = replayAndScenario[1];
-    String arg2 = Utils.readString(dataStream); // always \r\n and some unknown character
+    String arg2 = LoadUtils.readString(dataStream); // always \r\n and some unknown character
 
     int sizeModsInBytes = dataStream.readInt();
     byte[] mods = dataStream.readNBytes(sizeModsInBytes);
@@ -30,7 +30,7 @@ public static ReplayHeaderToken tokenize(LittleEndianDataInputStream dataStream)
     int numberOfClients = dataStream.readUnsignedByte();
     List<Source> clients = new ArrayList<>(numberOfClients);
     for (int i = 0; i < numberOfClients; i++) {
-      String playerName = Utils.readString(dataStream);
+      String playerName = LoadUtils.readString(dataStream);
       int playerId = dataStream.readInt();
       Source source = new Source(i, playerId, playerName);
       clients.add(source);

diff --git a/...aforever/commons/replay/shared/Utils.java → ...ever/commons/replay/shared/LoadUtils.java b/...aforever/commons/replay/shared/Utils.java → ...ever/commons/replay/shared/LoadUtils.java
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class Utils {
+public class LoadUtils {
 
   @Contract(pure = true)
   private static int peek(LittleEndianDataInputStream dataStream) throws IOException {