Bump LUS version (#2849)

* Bump LUS version

* Removes the "now" boolean from the LUS resource bridge functions.

* Bump LUS

* More LUS bump

* Update soh/soh/resource/importer/AudioSampleFactory.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

18 files changed, 43 insertions, 43 deletions

diff --git a/ExporterTest/RoomExporter.cpp b/ExporterTest/RoomExporter.cpp
index df5290f..e77f264 100644
--- a/ExporterTest/RoomExporter.cpp
+++ b/ExporterTest/RoomExporter.cpp
@@ -1,7 +1,7 @@
 #include "RoomExporter.h"
 #include "CollisionExporter.h"
 #include "Utils/BinaryWriter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/MemoryStream.h"
 #include "ZRoom/Commands/SetCameraSettings.h"
 #include "ZRoom/Commands/SetCollisionHeader.h"
@@ -367,6 +367,6 @@ void ExporterExample_Room::Save(ZResource* res, const fs::path& outPath, BinaryW
 	}
 
 	// writer->Close();
-	// File::WriteAllBytes(StringHelper::Sprintf("%s", res->GetName().c_str()),
+	// DiskFile::WriteAllBytes(StringHelper::Sprintf("%s", res->GetName().c_str()),
 	// memStream->ToVector());
 }
diff --git a/ZAPD/GameConfig.cpp b/ZAPD/GameConfig.cpp
index ba402a8..cbc2170 100644
--- a/ZAPD/GameConfig.cpp
+++ b/ZAPD/GameConfig.cpp
@@ -5,7 +5,7 @@
 #include <unordered_map>
 
 #include "Utils/Directory.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "ZFile.h"
 #include "tinyxml2.h"
@@ -57,7 +57,7 @@ void GameConfig::ReadTexturePool(const fs::path& texturePoolXmlPath)
 
 void GameConfig::GenSymbolMap(const fs::path& symbolMapPath)
 {
-	auto symbolLines = File::ReadAllLines(symbolMapPath);
+	auto symbolLines = DiskFile::ReadAllLines(symbolMapPath);
 
 	for (std::string& symbolLine : symbolLines)
 	{
@@ -79,7 +79,7 @@ void GameConfig::ConfigFunc_ActorList(const tinyxml2::XMLElement& element)
 {
 	std::string fileName = element.Attribute("File");
 	std::vector<std::string> lines =
-		File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName);
+		DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName);
 
 	for (auto& line : lines)
 		actorList.emplace_back(std::move(line));
@@ -89,7 +89,7 @@ void GameConfig::ConfigFunc_ObjectList(const tinyxml2::XMLElement& element)
 {
 	std::string fileName = element.Attribute("File");
 	std::vector<std::string> lines =
-		File::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName);
+		DiskFile::ReadAllLines(Path::GetDirectoryName(configFilePath) / fileName);
 
 	for (auto& line : lines)
 		objectList.emplace_back(std::move(line));
diff --git a/ZAPD/Globals.cpp b/ZAPD/Globals.cpp
index 8443e4d..a6b22cf 100644
--- a/ZAPD/Globals.cpp
+++ b/ZAPD/Globals.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <string_view>
 
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "WarningHandler.h"
 #include "tinyxml2.h"
@@ -134,12 +134,12 @@ void Globals::BuildAssetTexture(const fs::path& pngFilePath, TextureType texType
 	tex.FromPNG(pngFilePath.string(), texType);
 	std::string cfgPath = StringHelper::Split(pngFilePath.string(), ".")[0] + ".cfg";
 
-	if (File::Exists(cfgPath))
-		name = File::ReadAllText(cfgPath);
+	if (DiskFile::Exists(cfgPath))
+		name = DiskFile::ReadAllText(cfgPath);
 
 	std::string src = tex.GetBodySourceCode();
 
-	File::WriteAllBytes(outPath.string(), src.c_str(), src.size());
+	DiskFile::WriteAllBytes(outPath.string(), src.c_str(), src.size());
 }
 
 std::map<std::string, ExporterSet*>& Globals::GetExporterMap()
@@ -186,7 +186,7 @@ std::vector<uint8_t> Globals::GetBaseromFile(std::string fileName)
 
 	}
 	else
-		return File::ReadAllBytes(fileName);
+		return DiskFile::ReadAllBytes(fileName);
 }
 
 bool Globals::GetSegmentedPtrName(segptr_t segAddress, ZFile* currentFile,
diff --git a/ZAPD/Main.cpp b/ZAPD/Main.cpp
index 4303cdc..a2030aa 100644
--- a/ZAPD/Main.cpp
+++ b/ZAPD/Main.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "Utils/Directory.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "WarningHandler.h"
 
@@ -578,7 +578,7 @@ void BuildAssetBackground(const fs::path& imageFilePath, const fs::path& outPath
 	ZBackground background(nullptr);
 	background.ParseBinaryFile(imageFilePath.string(), false);
 
-	File::WriteAllText(outPath.string(), background.GetBodySourceCode());
+	DiskFile::WriteAllText(outPath.string(), background.GetBodySourceCode());
 }
 
 void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath)
@@ -588,7 +588,7 @@ void BuildAssetBlob(const fs::path& blobFilePath, const fs::path& outPath)
 
 	std::string src = blob->GetBodySourceCode();
 
-	File::WriteAllText(outPath.string(), src);
+	DiskFile::WriteAllText(outPath.string(), src);
 
 	delete blob;
 }
diff --git a/ZAPD/Overlays/ZOverlay.cpp b/ZAPD/Overlays/ZOverlay.cpp
index c3e7c68..168ed23 100644
--- a/ZAPD/Overlays/ZOverlay.cpp
+++ b/ZAPD/Overlays/ZOverlay.cpp
@@ -5,7 +5,7 @@
 #include <unordered_set>
 #include "Globals.h"
 #include "Utils/Directory.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
@@ -76,7 +76,7 @@ static const std::unordered_set<std::string> sSections = {
 
 ZOverlay* ZOverlay::FromBuild(fs::path buildPath, fs::path cfgFolderPath)
 {
-	std::string cfgText = File::ReadAllText(cfgFolderPath / "overlay.cfg");
+	std::string cfgText = DiskFile::ReadAllText(cfgFolderPath / "overlay.cfg");
 	std::vector<std::string> cfgLines = StringHelper::Split(cfgText, "\n");
 
 	ZOverlay* ovl = new ZOverlay(StringHelper::Strip(cfgLines[0], "\r"));
diff --git a/ZAPD/ZAnimation.cpp b/ZAPD/ZAnimation.cpp
index e1a422a..1998514 100644
--- a/ZAPD/ZAnimation.cpp
+++ b/ZAPD/ZAnimation.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
 #include "ZFile.h"
diff --git a/ZAPD/ZAudio.cpp b/ZAPD/ZAudio.cpp
index 50bb181..9f20592 100644
--- a/ZAPD/ZAudio.cpp
+++ b/ZAPD/ZAudio.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
diff --git a/ZAPD/ZBackground.cpp b/ZAPD/ZBackground.cpp
index 94efe06..026002d 100644
--- a/ZAPD/ZBackground.cpp
+++ b/ZAPD/ZBackground.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
@@ -46,7 +46,7 @@ void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutNam
 	if (appendOutName)
 		filepath = filepath / (outName + "." + GetExternalExtension());
 
-	data = File::ReadAllBytes(filepath.string());
+	data = DiskFile::ReadAllBytes(filepath.string());
 
 	// Add padding.
 	data.insert(data.end(), GetRawDataSize() - data.size(), 0x00);
@@ -153,7 +153,7 @@ void ZBackground::Save(const fs::path& outFolder)
 	if (!Globals::Instance->otrMode)
 	{
 		fs::path filepath = outFolder / (outName + "." + GetExternalExtension());
-		File::WriteAllBytes(filepath.string(), data);
+		DiskFile::WriteAllBytes(filepath.string(), data);
 	}
 }
 
diff --git a/ZAPD/ZBlob.cpp b/ZAPD/ZBlob.cpp
index 759dbbc..0965d7e 100644
--- a/ZAPD/ZBlob.cpp
+++ b/ZAPD/ZBlob.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
@@ -19,7 +19,7 @@ ZBlob* ZBlob::FromFile(const std::string& filePath)
 {
 	ZBlob* blob = new ZBlob(nullptr);
 	blob->name = StringHelper::Split(Path::GetFileNameWithoutExtension(filePath), ".")[0];
-	blob->blobData = File::ReadAllBytes(filePath);
+	blob->blobData = DiskFile::ReadAllBytes(filePath);
 
 	return blob;
 }
@@ -87,7 +87,7 @@ std::string ZBlob::GetBodySourceCode() const
 void ZBlob::Save(const fs::path& outFolder)
 {
 	if (!Globals::Instance->otrMode)
-		File::WriteAllBytes((outFolder / (name + ".bin")).string(), blobData);
+		DiskFile::WriteAllBytes((outFolder / (name + ".bin")).string(), blobData);
 }
 
 bool ZBlob::IsExternalResource() const
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp
index 6ece8f6..9a43a2a 100644
--- a/ZAPD/ZDisplayList.cpp
+++ b/ZAPD/ZDisplayList.cpp
@@ -9,7 +9,7 @@
 #include "Globals.h"
 #include "OutputFormatter.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp
index 024ba62..d04f3b7 100644
--- a/ZAPD/ZFile.cpp
+++ b/ZAPD/ZFile.cpp
@@ -10,7 +10,7 @@
 #include "Utils/BinaryWriter.h"
 #include "Utils/BitConverter.h"
 #include "Utils/Directory.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/MemoryStream.h"
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
@@ -190,7 +190,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
 	{
 		if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
 		{
-			if (!File::Exists((basePath / name).string()))
+			if (!DiskFile::Exists((basePath / name).string()))
 			{
 				std::string errorHeader = StringHelper::Sprintf("binary file '%s' does not exist.",
 				                                                (basePath / name).c_str());
@@ -421,7 +421,7 @@ void ZFile::ExtractResources()
 
 	if (memStreamFile->GetLength() > 0)
 	{
-		File::WriteAllBytes(StringHelper::Sprintf("%s%s.bin",
+		DiskFile::WriteAllBytes(StringHelper::Sprintf("%s%s.bin",
 		                                          Globals::Instance->outputPath.string().c_str(),
 		                                          GetName().c_str()),
 		                    memStreamFile->ToVector());
@@ -802,7 +802,7 @@ void ZFile::GenerateSourceFiles()
 		OutputFormatter formatter;
 		formatter.Write(sourceOutput);
 
-		File::WriteAllText(outPath, formatter.GetOutput());
+		DiskFile::WriteAllText(outPath, formatter.GetOutput());
 	}
 
 	GenerateSourceHeaderFiles();
@@ -850,7 +850,7 @@ void ZFile::GenerateSourceHeaderFiles()
 		output.pop_back();
 
 	if (Globals::Instance->fileMode != ZFileMode::ExtractDirectory)
-		File::WriteAllText(headerFilename, output);
+		DiskFile::WriteAllText(headerFilename, output);
 	else if (Globals::Instance->sourceOutputPath != "")
 	{
 		std::string xmlPath = xmlFilePath.string();
@@ -875,7 +875,7 @@ void ZFile::GenerateSourceHeaderFiles()
 				outPath += "/";
 		}
 
-		File::WriteAllText(outPath, output);
+		DiskFile::WriteAllText(outPath, output);
 	}
 }
 
@@ -1121,7 +1121,7 @@ std::string ZFile::ProcessDeclarations()
 						extType = "vtx";
 
 					auto filepath = outputPath / item.second->varName;
-					File::WriteAllText(
+					DiskFile::WriteAllText(
 						StringHelper::Sprintf("%s.%s.inc", filepath.string().c_str(), extType.c_str()),
 						item.second->text);
 				}
diff --git a/ZAPD/ZRom.cpp b/ZAPD/ZRom.cpp
index 5dfad57..abce2bf 100644
--- a/ZAPD/ZRom.cpp
+++ b/ZAPD/ZRom.cpp
@@ -1,6 +1,6 @@
 #include "ZRom.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Directory.h"
 #include "yaz0/yaz0.h"
 
@@ -95,7 +95,7 @@ bool ZRom::IsMQ() {
 ZRom::ZRom(std::string romPath)
 {
 	RomVersion version;
-	romData = File::ReadAllBytes(romPath);
+	romData = DiskFile::ReadAllBytes(romPath);
 
 	version.crc = BitConverter::ToInt32BE(romData, 0x10);
 
@@ -189,7 +189,7 @@ ZRom::ZRom(std::string romPath)
 	}
 
 	auto path = StringHelper::Sprintf("%s/%s", Globals::Instance->fileListPath.string().c_str(), version.listPath.c_str());
-	auto txt = File::ReadAllText(path);
+	auto txt = DiskFile::ReadAllText(path);
 	std::vector<std::string> lines = StringHelper::Split(txt, "\n");
 
     std::vector<uint8_t> decompressedData(1);
@@ -222,7 +222,7 @@ ZRom::ZRom(std::string romPath)
 		else
 			files[lines[i]] = outData;
 
-		//File::WriteAllBytes(StringHelper::Sprintf("baserom/%s", lines[i].c_str()), files[lines[i]]);
+		//DiskFile::WriteAllBytes(StringHelper::Sprintf("baserom/%s", lines[i].c_str()), files[lines[i]]);
 	}
 }
 
diff --git a/ZAPD/ZRoom/ZRoom.cpp b/ZAPD/ZRoom/ZRoom.cpp
index 5831eaa..11dd706 100644
--- a/ZAPD/ZRoom/ZRoom.cpp
+++ b/ZAPD/ZRoom/ZRoom.cpp
@@ -39,7 +39,7 @@
 #include "Commands/Unused1D.h"
 #include "Commands/ZRoomCommandUnk.h"
 #include "Globals.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
diff --git a/ZAPD/ZScalar.cpp b/ZAPD/ZScalar.cpp
index 7e4be4d..6c4cf12 100644
--- a/ZAPD/ZScalar.cpp
+++ b/ZAPD/ZScalar.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
 #include "ZFile.h"
diff --git a/ZAPD/ZString.cpp b/ZAPD/ZString.cpp
index 2a0c1ea..4a90694 100644
--- a/ZAPD/ZString.cpp
+++ b/ZAPD/ZString.cpp
@@ -1,6 +1,6 @@
 #include "ZString.h"
 
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZText.cpp b/ZAPD/ZText.cpp
index b024920..95e4b52 100644
--- a/ZAPD/ZText.cpp
+++ b/ZAPD/ZText.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "Utils/StringHelper.h"
 #include "ZFile.h"
diff --git a/ZAPD/ZTexture.cpp b/ZAPD/ZTexture.cpp
index 94f4ebd..e0a91f0 100644
--- a/ZAPD/ZTexture.cpp
+++ b/ZAPD/ZTexture.cpp
@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "Utils/BitConverter.h"
 #include "Utils/Directory.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/Path.h"
 #include "WarningHandler.h"
 
@@ -727,7 +727,7 @@ void ZTexture::Save(const fs::path& outFolder)
 	// process for generating the Texture Pool XML.
 	if (Globals::Instance->outputCrc)
 	{
-		File::WriteAllText((Globals::Instance->outputPath / (outName + ".txt")).string(),
+		DiskFile::WriteAllText((Globals::Instance->outputPath / (outName + ".txt")).string(),
 		                   StringHelper::Sprintf("%08lX", hash));
 	}
 
diff --git a/ZAPD/ZVector.cpp b/ZAPD/ZVector.cpp
index 607aac8..092b876 100644
--- a/ZAPD/ZVector.cpp
+++ b/ZAPD/ZVector.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/File.h"
+#include <Utils/DiskFile.h>
 #include "Utils/StringHelper.h"
 #include "WarningHandler.h"
 #include "ZFile.h"