AM2R-Community-Developers
/
AM2RModPacker
mirror of https://github.com/AM2R-Community-Developers/AM2RModPacker
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean CreateModPack function up

Browse Source
pull/9/head
Miepee 4 years ago
parent 78589c9257
commit b0dc4daa4a
2 changed files with 57 additions and 77 deletions
Show Stats Download Patch File Download Diff File

1
AM2RModPacker/ModPacker.cs
Unescape View File

@ -254,6 +254,7 @@ public partial class ModPacker : Form
private void LoadProfileParameters(ProfileOperatingSystems operatingSystem) private void LoadProfileParameters(ProfileOperatingSystems operatingSystem)
{ {
// TODO: give the control events where they assign the values directly?
modInfo.Profile.Name = nameTextBox.Text; modInfo.Profile.Name = nameTextBox.Text;
modInfo.Profile.Author = authorTextBox.Text; modInfo.Profile.Author = authorTextBox.Text;
modInfo.Profile.Version = versionTextBox.Text; modInfo.Profile.Version = versionTextBox.Text;

131
AM2RModPackerLib/Core.cs
Unescape View File

@ -29,10 +29,8 @@ public enum IsZipAM2R11ReturnCodes
public static class Core public static class Core
{ {
public const string Version = "2.0.3"; public const string Version = "2.0.3";
private static readonly string[] DATAFILES_BLACKLIST = { "data.win", "AM2R.exe", "D3DX9_43.dll", "game.unx", "game.ios" };
private static readonly string localPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory); private static readonly string localPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
// TODO: go over thhis and clean
public static void CreateModPack(ModCreationInfo modInfo, string output) public static void CreateModPack(ModCreationInfo modInfo, string output)
{ {
ProfileOperatingSystems profileOS = Enum.Parse<ProfileOperatingSystems>(modInfo.Profile.OperatingSystem); ProfileOperatingSystems profileOS = Enum.Parse<ProfileOperatingSystems>(modInfo.Profile.OperatingSystem);
@ -45,171 +43,153 @@ public static class Core
}; };
// Cleanup in case of previous errors // Cleanup in case of previous errors
if (Directory.Exists(Path.GetTempPath() + "/AM2RModPacker")) if (Directory.Exists($"{Path.GetTempPath()}/AM2RModPacker"))
Directory.Delete(Path.GetTempPath() + "/AM2RModPacker", true); Directory.Delete($"{Path.GetTempPath()}/AM2RModPacker", true);
// Create temp work folders // Create temp work folders
string tempPath = Directory.CreateDirectory(Path.GetTempPath() + "/AM2RModPacker").FullName; string tempPath = Directory.CreateDirectory($"{Path.GetTempPath()}/AM2RModPacker").FullName;
string tempOriginalPath = Directory.CreateDirectory(tempPath + "/original").FullName; string tempOriginalPath = Directory.CreateDirectory($"{tempPath}/original").FullName;
string tempModPath = Directory.CreateDirectory(tempPath + "/mod").FullName; string tempModPath = Directory.CreateDirectory($"{tempPath}/mod").FullName;
string tempProfilePath = Directory.CreateDirectory(tempPath + "/profile").FullName; string tempProfilePath = Directory.CreateDirectory($"{tempPath}/profile").FullName;
// Extract 1.1 and modded AM2R to their own directories in temp work // Extract 1.1 and modded AM2R to their own directories in temp work
ZipFile.ExtractToDirectory(modInfo.AM2R11Path, tempOriginalPath); ZipFile.ExtractToDirectory(modInfo.AM2R11Path, tempOriginalPath);
ZipFile.ExtractToDirectory(modZipPath, tempModPath); ZipFile.ExtractToDirectory(modZipPath, tempModPath);
if (Directory.Exists(tempModPath + "/AM2R")) if (Directory.Exists($"{tempModPath}/AM2R"))
tempModPath += "/AM2R"; tempModPath += "/AM2R";
// Create AM2R.exe and data.win patches
switch (profileOS) switch (profileOS)
{ {
// Create AM2R.exe and data.win patches
case ProfileOperatingSystems.Windows: case ProfileOperatingSystems.Windows:
{
if (modInfo.Profile.UsesYYC) if (modInfo.Profile.UsesYYC)
CreatePatch(tempOriginalPath + "/data.win", tempModPath + "/AM2R.exe", tempProfilePath + "/AM2R.xdelta"); CreatePatch($"{tempOriginalPath}/data.win", $"{tempModPath}/AM2R.exe", $"{tempProfilePath}/AM2R.xdelta");
else else
{ {
CreatePatch(tempOriginalPath + "/data.win", tempModPath + "/data.win", tempProfilePath + "/data.xdelta"); CreatePatch($"{tempOriginalPath}/data.win", $"{tempModPath}/data.win", $"{tempProfilePath}/data.xdelta");
CreatePatch(tempOriginalPath + "/AM2R.exe", tempModPath + "/AM2R.exe", tempProfilePath + "/AM2R.xdelta"); CreatePatch($"{tempOriginalPath}/AM2R.exe", $"{tempModPath}/AM2R.exe", $"{tempProfilePath}/AM2R.xdelta");
} }
break; break;
}
case ProfileOperatingSystems.Linux: case ProfileOperatingSystems.Linux:
{ string runnerName = File.Exists($"{tempModPath}/AM2R") ? "AM2R" : "runner";
string runnerName = File.Exists(tempModPath + "/" + "AM2R") ? "AM2R" : "runner"; CreatePatch($"{tempOriginalPath}/data.win", $"{tempModPath}/assets/game.unx", $"{tempProfilePath}/game.xdelta");
CreatePatch(tempOriginalPath + "/data.win", tempModPath + "/assets/game.unx", tempProfilePath + "/game.xdelta"); CreatePatch($"{tempOriginalPath}/AM2R.exe", $"{tempModPath}/{runnerName}", $"{tempProfilePath}/AM2R.xdelta");
CreatePatch(tempOriginalPath + "/AM2R.exe", tempModPath + "/" + runnerName, tempProfilePath + "/AM2R.xdelta");
break; break;
}
case ProfileOperatingSystems.Mac: case ProfileOperatingSystems.Mac:
{ CreatePatch($"{tempOriginalPath}/data.win", $"{tempModPath}/AM2R.app/Contents/Resources/game.ios", $"{tempProfilePath}/game.xdelta");
CreatePatch(tempOriginalPath + "/data.win", tempModPath + "/AM2R.app/Contents/Resources/game.ios", tempProfilePath + "/game.xdelta"); CreatePatch($"{tempOriginalPath}/AM2R.exe", $"{tempModPath}/AM2R.app/Contents/MacOS/Mac_Runner", $"{tempProfilePath}/AM2R.xdelta");
CreatePatch(tempOriginalPath + "/AM2R.exe", tempModPath + "/AM2R.app/Contents/MacOS/Mac_Runner", tempProfilePath + "/AM2R.xdelta");
// Copy plist over for custom title name // Copy plist over for custom title name
File.Copy(tempModPath + "/AM2R.app/Contents/Info.plist", tempProfilePath + "/Info.plist"); File.Copy($"{tempModPath}/AM2R.app/Contents/Info.plist", $"{tempProfilePath}/Info.plist");
break; break;
} }
}
// Create game.droid patch and wrapper if Android is supported // Create game.droid patch and wrapper if Android is supported
if (modInfo.Profile.SupportsAndroid) if (modInfo.Profile.SupportsAndroid)
{ {
string tempAndroid = Directory.CreateDirectory(tempPath + "/android").FullName; string tempAndroid = Directory.CreateDirectory($"{tempPath}/android").FullName;
// Extract APK
// - java -jar apktool.jar d "%~dp0AM2RWrapper_old.apk"
// Extract APK first in order to create patch from the data.win
// TODO: simplify these java calls?
// - java -jar apktool.jar d "AM2RWrapper_old.apk"
// Process startInfo // Process startInfo
string filename = OS.IsWindows ? "cmd.exe" : "java"; string filename = OS.IsWindows ? "cmd.exe" : "java";
string javaArgs = OS.IsWindows ? "/C java -jar" : "-jar"; string javaArgs = OS.IsWindows ? "/C java -jar" : "-jar";
var procStartInfo = new ProcessStartInfo var apktoolDump = new ProcessStartInfo
{ {
FileName = filename, FileName = filename,
WorkingDirectory = tempAndroid, WorkingDirectory = tempAndroid,
Arguments = $"{javaArgs} \"" + localPath + "/utilities/android/apktool.jar\" d -f -o \"" + tempAndroid + "\" \"" + modInfo.ApkModPath + "\"", Arguments = $"{javaArgs} \"{localPath}/utilities/android/apktool.jar\" d -f -o \"{tempAndroid}\" \"{modInfo.ApkModPath}\"",
UseShellExecute = false, UseShellExecute = false,
CreateNoWindow = true CreateNoWindow = true
}; };
// Run process // Run process
using (var proc = new Process { StartInfo = procStartInfo }) using (var proc = new Process { StartInfo = apktoolDump })
{ {
proc.Start(); proc.Start();
proc.WaitForExit(); proc.WaitForExit();
} }
// Create game.droid patch // Create game.droid patch
CreatePatch(tempOriginalPath + "/data.win", tempAndroid + "/assets/game.droid", tempProfilePath + "/droid.xdelta"); CreatePatch($"{tempOriginalPath}/data.win", $"{tempAndroid}/assets/game.droid", $"{tempProfilePath}/droid.xdelta");
// Delete excess files in APK // Delete excess files in APK, so we can use it as a bare-minimum wrapper
// Create whitelist // Create whitelist
string[] whitelist = { "splash.png", "portrait_splash.png" }; string[] whitelist = { "splash.png", "portrait_splash.png" };
// Get directory // Get directory
var androidAssets = new DirectoryInfo(tempAndroid + "/assets"); var androidAssets = new DirectoryInfo($"{tempAndroid}/assets");
// Delete files and folders
// Delete files
foreach (var file in androidAssets.GetFiles()) foreach (var file in androidAssets.GetFiles())
{ {
// Not really sure why it's checked like this, but AM2R.ini is a file necessary to boot for YYC
if (file.Name.EndsWith(".ini") && file.Name != "modifiers.ini") if (file.Name.EndsWith(".ini") && file.Name != "modifiers.ini")
{ File.Copy(file.FullName, $"{tempProfilePath}/AM2R.ini", true);
if (File.Exists(tempProfilePath + "/AM2R.ini"))
// This shouldn't be a problem... normally...
File.Delete(tempProfilePath + "/AM2R.ini");
File.Copy(file.FullName, tempProfilePath + "/AM2R.ini");
}
if (!whitelist.Contains(file.Name)) if (!whitelist.Contains(file.Name))
File.Delete(file.FullName); File.Delete(file.FullName);
} }
foreach (var dir in androidAssets.GetDirectories()) foreach (var dir in androidAssets.GetDirectories())
Directory.Delete(dir.FullName, true); Directory.Delete(dir.FullName, true);
// Create wrapper // And now we create the wrapper from it
// Process startInfo // Process startInfo
// - java -jar apktool.jar b "%~dp0AM2RWrapper_old" -o "%~dp0AM2RWrapper.apk" // - java -jar apktool.jar b "AM2RWrapper_old" -o "AM2RWrapper.apk"
var procStartInfo2 = new ProcessStartInfo var apktoolBuild = new ProcessStartInfo
{ {
FileName = filename, FileName = filename,
WorkingDirectory = tempAndroid, WorkingDirectory = tempAndroid,
Arguments = $"{javaArgs} \"" + localPath + "/utilities/android/apktool.jar\" b -f \"" + tempAndroid + "\" -o \"" + tempProfilePath + "/AM2RWrapper.apk\"", Arguments = $"{javaArgs} \"{localPath}/utilities/android/apktool.jar\" b -f \"{tempAndroid}\" -o \"{tempProfilePath}/AM2RWrapper.apk\"",
UseShellExecute = false, UseShellExecute = false,
CreateNoWindow = true CreateNoWindow = true
}; };
// Run process // Run process
using (var proc = new Process { StartInfo = procStartInfo2 }) using (var proc = new Process { StartInfo = apktoolBuild })
{ {
proc.Start(); proc.Start();
proc.WaitForExit(); proc.WaitForExit();
} }
string tempAndroidProfilePath = tempProfilePath + "/android"; string tempAndroidWrapperPath = $"{tempProfilePath}/android";
Directory.CreateDirectory(tempAndroidProfilePath); Directory.CreateDirectory(tempAndroidWrapperPath);
File.Move(tempProfilePath + "/AM2RWrapper.apk", tempAndroidProfilePath + "/AM2RWrapper.apk"); File.Move($"{tempProfilePath}/AM2RWrapper.apk", $"{tempAndroidWrapperPath}/AM2RWrapper.apk");
if (File.Exists(tempProfilePath + "/AM2R.ini")) if (File.Exists($"{tempProfilePath}/AM2R.ini"))
File.Move(tempProfilePath + "/AM2R.ini", tempAndroidProfilePath + "/AM2R.ini"); File.Move($"{tempProfilePath}/AM2R.ini", $"{tempAndroidWrapperPath}/AM2R.ini");
} }
// Copy datafiles (exclude .ogg if custom music is not selected) // Copy datafiles and exclude .ogg if custom music is not selected
var dirInfo = new DirectoryInfo(tempModPath); var gameAssetDir = new DirectoryInfo(tempModPath);
if (profileOS == ProfileOperatingSystems.Linux) if (profileOS == ProfileOperatingSystems.Linux)
dirInfo = new DirectoryInfo(tempModPath + "/assets"); gameAssetDir = new DirectoryInfo($"{tempModPath}/assets");
else if (profileOS == ProfileOperatingSystems.Mac) else if (profileOS == ProfileOperatingSystems.Mac)
dirInfo = new DirectoryInfo(tempModPath + "/AM2R.app/Contents/Resources"); gameAssetDir = new DirectoryInfo($"{tempModPath}/AM2R.app/Contents/Resources");
Directory.CreateDirectory(tempProfilePath + "/files_to_copy"); Directory.CreateDirectory($"{tempProfilePath}/files_to_copy");
string[] datafilesBlacklist = { "data.win", "AM2R.exe", "D3DX9_43.dll", "game.unx", "game.ios" };
if (modInfo.Profile.UsesCustomMusic) if (modInfo.Profile.UsesCustomMusic)
{ {
// Copy files, excluding the blacklist // Copy all files, excluding the blacklist
CopyFilesRecursive(dirInfo, DATAFILES_BLACKLIST, tempProfilePath + "/files_to_copy"); CopyFilesRecursive(gameAssetDir, datafilesBlacklist, $"{tempProfilePath}/files_to_copy");
} }
else else
{ {
// Get list of 1.1's music files // Get list of 1.1's music files
string[] musFiles = Directory.GetFiles(tempOriginalPath, "*.ogg").Select(file => Path.GetFileName(file)).ToArray(); string[] musFiles = Directory.GetFiles(tempOriginalPath, "*.ogg").Select(file => Path.GetFileName(file)).ToArray();
// Since on Unix our songs are in lowercase and we want to compare them later, we need to adjust for it here
if (profileOS == ProfileOperatingSystems.Linux || profileOS == ProfileOperatingSystems.Mac) if (profileOS == ProfileOperatingSystems.Linux || profileOS == ProfileOperatingSystems.Mac)
musFiles = Directory.GetFiles(tempOriginalPath, "*.ogg").Select(file => Path.GetFileName(file).ToLower()).ToArray(); musFiles = musFiles.Select(f => f.ToLower()).ToArray();
// Combine musFiles with the known datafiles for a blacklist // Combine musFiles with the known datafiles for a blacklist
string[] blacklist = musFiles.Concat(DATAFILES_BLACKLIST).ToArray(); string[] blacklist = musFiles.Concat(datafilesBlacklist).ToArray();
// Copy files, excluding the blacklist // Copy files, excluding the blacklist
CopyFilesRecursive(dirInfo, blacklist, tempProfilePath + "/files_to_copy"); CopyFilesRecursive(gameAssetDir, blacklist, $"{tempProfilePath}/files_to_copy");
} }
// Export profile as XML // Export profile as XML
string xmlOutput = Serializer.Serialize<ModProfileXML>(modInfo.Profile); string xmlOutput = Serializer.Serialize<ModProfileXML>(modInfo.Profile);
File.WriteAllText(tempProfilePath + "/profile.xml", xmlOutput); File.WriteAllText($"{tempProfilePath}/profile.xml", xmlOutput);
// Compress temp folder to .zip // Compress temp folder to .zip
if (File.Exists(output)) if (File.Exists(output))
@ -221,7 +201,6 @@ public static class Core
Directory.Delete(tempPath, true); Directory.Delete(tempPath, true);
} }
public static void CreatePatch(string original, string modified, string output) public static void CreatePatch(string original, string modified, string output)
{ {
// Specify process start info // Specify process start info

Write Preview
Loading…
Cancel
Save