reduce redundant lines

Sewer56 · Oct 20, 2024 · 1e3a759 · 1e3a759
1 parent bb2ec52
commit 1e3a759
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 30 deletions.
diff --git a/Persona.Merger.Common/Patching/Tbl/FieldResolvers/Generic/GenericPatcher.cs b/Persona.Merger.Common/Patching/Tbl/FieldResolvers/Generic/GenericPatcher.cs
@@ -72,9 +72,7 @@ public unsafe byte[] ApplyGeneric(List<TblPatch> patches)
             using var memoryStream = new ExtendedMemoryStream(result, true);
             foreach (var segment in segments)
             {
-                // memoryStream.WriteBigEndianPrimitive(segment.Length);
                 memoryStream.Write(segment.Span);
-                // memoryStream.AddPadding(P5RTblSegmentFinder.TblSegmentAlignment);
             }
 
             return result;

diff --git a/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs b/p5rpc.modloader/Merging/Tbl/P3PTblMerger.cs
@@ -179,8 +179,7 @@ await Task.Run(async () =>
             }
 
             // Then we merge
-            byte[] patched;
-            patched = await PatchAny(extractedTbl.Value.ToArray(), candidates, ResolverSize);
+            var patched = await PatchAny(extractedTbl.Value.ToArray(), candidates, ResolverSize);
 
             // Then we store in cache.
             var item = await _mergedFileCache.AddAsync(cacheKey, sources, patched);
@@ -196,8 +195,7 @@ private static async Task<byte[]> PatchTable(TblType type, byte[] extractedTable
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, type);
-        return patched;
+        return patcher.Apply(patches, type);
     }
 
     private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> candidates)
@@ -216,8 +214,7 @@ private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> can
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, TblType.Message, bmds);
-        return patched;
+        return patcher.Apply(patches, TblType.Message, bmds);
     }
 
     private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candidates)
@@ -240,8 +237,7 @@ private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candi
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, TblType.AiCalc, bfs);
-        return patched;
+        return patcher.Apply(patches, TblType.AiCalc, bfs);
     }
 
     private static async Task<byte[]> PatchAny(byte[] extractedTable,
@@ -252,7 +248,6 @@ private static async Task<byte[]> PatchAny(byte[] extractedTable,
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatchGeneric(await File.ReadAllBytesAsync(candidates[x]), ResolverSize));
 
-        var patched = patcher.ApplyGeneric(patches);
-        return patched;
+        return patcher.ApplyGeneric(patches);
     }
 }
diff --git a/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs b/p5rpc.modloader/Merging/Tbl/P4GTblMerger.cs
@@ -223,8 +223,7 @@ await Task.Run(async () =>
             }
 
             // Then we merge
-            byte[] patched;
-            patched = await PatchAny(extractedTbl.Value.ToArray(), candidates, ResolverSize);
+            var patched = await PatchAny(extractedTbl.Value.ToArray(), candidates, ResolverSize);
 
             // Then we store in cache.
             var item = await _mergedFileCache.AddAsync(cacheKey, sources, patched);
@@ -240,8 +239,7 @@ private async Task<byte[]> PatchTable(TblType type, byte[] extractedTable, List<
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, type);
-        return patched;
+        return patcher.Apply(patches, type);
     }
 
     private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> candidates)
@@ -260,8 +258,7 @@ private async Task<byte[]> PatchMsgTable(byte[] extractedTable, List<string> can
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, TblType.Message, bmds);
-        return patched;
+        return patcher.Apply(patches, TblType.Message, bmds);
     }
 
     private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candidates)
@@ -284,8 +281,7 @@ private async Task<byte[]> PatchAiCalc(byte[] extractedTable, List<string> candi
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x])));
 
-        var patched = patcher.Apply(patches, TblType.AiCalc, bfs);
-        return patched;
+        return patcher.Apply(patches, TblType.AiCalc, bfs);
     }
 
     private static async Task<byte[]> PatchAny(byte[] extractedTable, List<string> candidates, int ResolverSize)
@@ -295,8 +291,7 @@ private static async Task<byte[]> PatchAny(byte[] extractedTable, List<string> c
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatchGeneric(await File.ReadAllBytesAsync(candidates[x]), ResolverSize));
 
-        var patched = patcher.ApplyGeneric(patches);
-        return patched;
+        return patcher.ApplyGeneric(patches);
     }
     private static async Task<byte[]> PatchAny(byte[] extractedTable, List<ICriFsRedirectorApi.BindFileInfo> candidates, int ResolverSize)
     {
@@ -305,7 +300,6 @@ private static async Task<byte[]> PatchAny(byte[] extractedTable, List<ICriFsRed
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatchGeneric(await File.ReadAllBytesAsync(candidates[x].FullPath), ResolverSize));
 
-        var patched = patcher.ApplyGeneric(patches);
-        return patched;
+        return patcher.ApplyGeneric(patches);
     }
 }
diff --git a/p5rpc.modloader/Merging/Tbl/P5RTblMerger.cs b/p5rpc.modloader/Merging/Tbl/P5RTblMerger.cs
@@ -127,8 +127,7 @@ private static async Task<byte[]> PatchTable(TblType type, ArrayRental extracted
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatch(await File.ReadAllBytesAsync(candidates[x].FullPath)));
 
-        var patched = patcher.Apply(patches);
-        return patched;
+        return patcher.Apply(patches);
     }
 
     private async ValueTask PatchAnyFile(Dictionary<string, List<ICriFsRedirectorApi.BindFileInfo>> pathToFileMap,
@@ -164,8 +163,7 @@ await Task.Run(async () =>
             using var extractedTable = reader.ExtractFile(cpkEntry.Files[fileIndex].File);
 
             // Then we merge
-            byte[] patched;
-            patched = await PatchAny(extractedTable, candidates, ResolverSize);
+            var patched = await PatchAny(extractedTable, candidates, ResolverSize);
 
             // Then we store in cache.
             var item = await _mergedFileCache.AddAsync(cacheKey, sources, patched);
@@ -183,7 +181,6 @@ private static async Task<byte[]> PatchAny(ArrayRental extractedTable,
         for (var x = 0; x < candidates.Count; x++)
             patches.Add(patcher.GeneratePatchGeneric(await File.ReadAllBytesAsync(candidates[x].FullPath), ResolverSize));
 
-        var patched = patcher.ApplyGeneric(patches);
-        return patched;
+        return patcher.ApplyGeneric(patches);
     }
 }