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

Rename modinfo attributes to be more clearer

Browse Source
pull/9/head
Miepee 3 years ago
parent 587b80ea82
commit 235ee287a3
3 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File

2
AM2RModPacker/ModPacker.Designer.cs generated
Unescape View File

@ -9,8 +9,6 @@ public partial class ModPacker : Form
{ {
public ModPacker() public ModPacker()
{ {
profile = new ModProfileXML();
Title = "AM2R ModPacker " + version; Title = "AM2R ModPacker " + version;
// TODO: Currently broken as I don't know how to do this from Rider // TODO: Currently broken as I don't know how to do this from Rider
//Icon = Icon.FromResource("icon64.ico"); //Icon = Icon.FromResource("icon64.ico");

79
AM2RModPacker/ModPacker.cs
Unescape View File

@ -15,8 +15,6 @@ public partial class ModPacker : Form
private ModCreationInfo modinfo = new ModCreationInfo(); private ModCreationInfo modinfo = new ModCreationInfo();
private readonly ModProfileXML profile;
private readonly FileFilter zipFileFilter = new FileFilter("zip archives (*.zip)", ".zip"); private readonly FileFilter zipFileFilter = new FileFilter("zip archives (*.zip)", ".zip");
private readonly FileFilter apkFileFilter = new FileFilter("Android application packages (*.apk)", ".apk"); private readonly FileFilter apkFileFilter = new FileFilter("Android application packages (*.apk)", ".apk");
@ -78,16 +76,16 @@ public partial class ModPacker : Form
if (saveFilePath.Contains(vanillaPrefix)) if (saveFilePath.Contains(vanillaPrefix))
saveFilePath = vanillaPrefix + saveFilePath.Substring(vanillaPrefix.Length).ToLower(); saveFilePath = vanillaPrefix + saveFilePath.Substring(vanillaPrefix.Length).ToLower();
modinfo.saveFilePath = saveFilePath; modinfo.SaveFolderPath = saveFilePath;
} }
} }
else else
{ {
wasSuccessful = true; wasSuccessful = true;
modinfo.saveFilePath = null; modinfo.SaveFolderPath = null;
} }
} }
customSaveTextBox.Text = modinfo.saveFilePath; customSaveTextBox.Text = modinfo.SaveFolderPath;
} }
private void YYCCheckBox_CheckedChanged(object sender, EventArgs e) private void YYCCheckBox_CheckedChanged(object sender, EventArgs e)
@ -95,10 +93,11 @@ public partial class ModPacker : Form
// Don't do anything if it's been disabled // Don't do anything if it's been disabled
if (!yycCheckBox.Checked.Value) if (!yycCheckBox.Checked.Value)
return; return;
// Disable mac stuff, as its incompatible with yyc
macCheckBox.Checked = false; macCheckBox.Checked = false;
macLabel.Visible = false; macLabel.Visible = false;
macButton.Enabled = false; macButton.Enabled = false;
modinfo.macPath = ""; modinfo.MacModPath = null;
} }
private void WindowsCheckBox_CheckedChanged(object sender, EventArgs e) private void WindowsCheckBox_CheckedChanged(object sender, EventArgs e)
@ -108,7 +107,7 @@ public partial class ModPacker : Form
if (!windowsCheckBox.Checked.Value) if (!windowsCheckBox.Checked.Value)
{ {
windowsLabel.Visible = false; windowsLabel.Visible = false;
modinfo.windowsPath = ""; modinfo.WindowsModPath = null;
} }
UpdateCreateButton(); UpdateCreateButton();
} }
@ -116,7 +115,7 @@ public partial class ModPacker : Form
private void WindowsButton_Click(object sender, EventArgs e) private void WindowsButton_Click(object sender, EventArgs e)
{ {
// Open window to select modded Linux .zip // Open window to select modded Linux .zip
(_, modinfo.windowsPath) = SelectFile("Please select your custom Windows AM2R .zip", zipFileFilter); modinfo.WindowsModPath = SelectFile("Please select your custom Windows AM2R .zip", zipFileFilter);
windowsLabel.Visible = modinfo.IsWindowsModLoaded; windowsLabel.Visible = modinfo.IsWindowsModLoaded;
UpdateCreateButton(); UpdateCreateButton();
} }
@ -128,7 +127,7 @@ public partial class ModPacker : Form
if (!apkCheckBox.Checked.Value) if (!apkCheckBox.Checked.Value)
{ {
apkLabel.Visible = false; apkLabel.Visible = false;
modinfo.apkPath = ""; modinfo.ApkModPath = null;
} }
UpdateCreateButton(); UpdateCreateButton();
} }
@ -136,7 +135,7 @@ public partial class ModPacker : Form
private void ApkButton_Click(object sender, EventArgs e) private void ApkButton_Click(object sender, EventArgs e)
{ {
// Open window to select modded AM2R APK // Open window to select modded AM2R APK
(_, modinfo.apkPath) = SelectFile("Please select your custom AM2R .apk", apkFileFilter); modinfo.ApkModPath = SelectFile("Please select your custom AM2R .apk", apkFileFilter);
apkLabel.Visible = modinfo.IsApkModLoaded; apkLabel.Visible = modinfo.IsApkModLoaded;
UpdateCreateButton(); UpdateCreateButton();
} }
@ -148,7 +147,7 @@ public partial class ModPacker : Form
if (!linuxCheckBox.Checked.Value) if (!linuxCheckBox.Checked.Value)
{ {
linuxLabel.Visible = false; linuxLabel.Visible = false;
modinfo.linuxPath = ""; modinfo.LinuxModPath = null;
} }
UpdateCreateButton(); UpdateCreateButton();
} }
@ -156,7 +155,7 @@ public partial class ModPacker : Form
private void LinuxButton_Click(object sender, EventArgs e) private void LinuxButton_Click(object sender, EventArgs e)
{ {
// Open window to select modded Linux .zip // Open window to select modded Linux .zip
(_, modinfo.linuxPath) = SelectFile("Please select your custom Linux AM2R .zip", zipFileFilter); modinfo.LinuxModPath = SelectFile("Please select your custom Linux AM2R .zip", zipFileFilter);
linuxLabel.Visible = modinfo.IsLinuxModLoaded; linuxLabel.Visible = modinfo.IsLinuxModLoaded;
UpdateCreateButton(); UpdateCreateButton();
} }
@ -170,7 +169,7 @@ public partial class ModPacker : Form
if (!macCheckBox.Checked.Value) if (!macCheckBox.Checked.Value)
{ {
macLabel.Visible = false; macLabel.Visible = false;
modinfo.macPath = ""; modinfo.MacModPath = null;
} }
UpdateCreateButton(); UpdateCreateButton();
} }
@ -184,7 +183,7 @@ public partial class ModPacker : Form
private void macButton_Click(object sender, EventArgs e) private void macButton_Click(object sender, EventArgs e)
{ {
// Open window to select modded Mac .zip // Open window to select modded Mac .zip
(_, modinfo.macPath) = SelectFile("Please select your custom Mac AM2R .zip", zipFileFilter); modinfo.MacModPath = SelectFile("Please select your custom Mac AM2R .zip", zipFileFilter);
macLabel.Visible = modinfo.IsMacModLoaded; macLabel.Visible = modinfo.IsMacModLoaded;
UpdateCreateButton(); UpdateCreateButton();
} }
@ -192,7 +191,7 @@ public partial class ModPacker : Form
private void OriginalZipButton_Click(object sender, EventArgs e) private void OriginalZipButton_Click(object sender, EventArgs e)
{ {
// Open window to select AM2R 1.1 // Open window to select AM2R 1.1
(_, modinfo.originalPath) = SelectFile("Please select AM2R_11.zip", zipFileFilter); modinfo.AM2R11Path = SelectFile("Please select AM2R_11.zip", zipFileFilter);
originalZipLabel.Visible = modinfo.IsAM2R11Loaded; originalZipLabel.Visible = modinfo.IsAM2R11Loaded;
UpdateCreateButton(); UpdateCreateButton();
} }
@ -212,7 +211,7 @@ public partial class ModPacker : Form
} }
// Verify 1.1 // Verify 1.1
var result11 = Core.CheckIfZipIsAM2R11(modinfo.originalPath); var result11 = Core.CheckIfZipIsAM2R11(modinfo.AM2R11Path);
if (result11 != IsZipAM2R11ReturnCodes.Successful) if (result11 != IsZipAM2R11ReturnCodes.Successful)
{ {
MessageBox.Show("AM2R 1.1 zip is invalid! Error code: " + result11); MessageBox.Show("AM2R 1.1 zip is invalid! Error code: " + result11);
@ -227,9 +226,9 @@ public partial class ModPacker : Form
{ {
string modZipPath = os switch string modZipPath = os switch
{ {
ProfileOperatingSystems.Windows => modinfo.windowsPath, ProfileOperatingSystems.Windows => modinfo.WindowsModPath,
ProfileOperatingSystems.Linux => modinfo.linuxPath, ProfileOperatingSystems.Linux => modinfo.LinuxModPath,
ProfileOperatingSystems.Mac => modinfo.macPath, ProfileOperatingSystems.Mac => modinfo.MacModPath,
_ => null _ => null
}; };
string output; string output;
@ -250,7 +249,7 @@ public partial class ModPacker : Form
LoadProfileParameters(os); LoadProfileParameters(os);
try try
{ {
Core.CreateModPack(profile, modinfo.originalPath, modZipPath, modinfo.apkPath, output); Core.CreateModPack(modinfo.Profile, modinfo.AM2R11Path, modZipPath, modinfo.ApkModPath, output);
} }
catch (Exception exception) catch (Exception exception)
{ {
@ -274,7 +273,7 @@ public partial class ModPacker : Form
if (windowsCheckBox.Checked.Value) if (windowsCheckBox.Checked.Value)
{ {
var windowsZip = ZipFile.Open(modinfo.windowsPath, ZipArchiveMode.Read); var windowsZip = ZipFile.Open(modinfo.WindowsModPath, ZipArchiveMode.Read);
if (windowsZip.Entries.All(f => f.FullName != "AM2R.exe")) if (windowsZip.Entries.All(f => f.FullName != "AM2R.exe"))
{ {
var result = MessageBox.Show("Modded game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning); var result = MessageBox.Show("Modded game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning);
@ -294,7 +293,7 @@ public partial class ModPacker : Form
if (linuxCheckBox.Checked.Value) if (linuxCheckBox.Checked.Value)
{ {
var linuxZip = ZipFile.Open(modinfo.linuxPath, ZipArchiveMode.Read); var linuxZip = ZipFile.Open(modinfo.LinuxModPath, ZipArchiveMode.Read);
if (linuxZip.Entries.All(f => f.FullName != "AM2R") && linuxZip.Entries.All(f => f.FullName != "runner")) if (linuxZip.Entries.All(f => f.FullName != "AM2R") && linuxZip.Entries.All(f => f.FullName != "runner"))
{ {
var result = MessageBox.Show("Modded Linux game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning); var result = MessageBox.Show("Modded Linux game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning);
@ -313,7 +312,7 @@ public partial class ModPacker : Form
} }
if (macCheckBox.Checked.Value) if (macCheckBox.Checked.Value)
{ {
var macZip = ZipFile.Open(modinfo.macPath, ZipArchiveMode.Read); var macZip = ZipFile.Open(modinfo.MacModPath, ZipArchiveMode.Read);
if (macZip.Entries.All(f => f.Name != "AM2R.app/Contents/MacOS/Mac_Runner")) if (macZip.Entries.All(f => f.Name != "AM2R.app/Contents/MacOS/Mac_Runner"))
{ {
var result = MessageBox.Show("Modded Mac game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning); var result = MessageBox.Show("Modded Mac game not found, make sure it's not placed in any subfolders.\nCreated profile will likely not be installable, are you sure you want to continue?", "WARNING", MessageBoxButtons.YesNo, MessageBoxType.Warning);
@ -333,26 +332,26 @@ public partial class ModPacker : Form
private void LoadProfileParameters(ProfileOperatingSystems operatingSystem) private void LoadProfileParameters(ProfileOperatingSystems operatingSystem)
{ {
profile.Name = nameTextBox.Text; modinfo.Profile.Name = nameTextBox.Text;
profile.Author = authorTextBox.Text; modinfo.Profile.Author = authorTextBox.Text;
profile.Version = versionTextBox.Text; modinfo.Profile.Version = versionTextBox.Text;
profile.UsesCustomMusic = musicCheckBox.Checked.Value; modinfo.Profile.UsesCustomMusic = musicCheckBox.Checked.Value;
profile.UsesYYC = yycCheckBox.Checked.Value; modinfo.Profile.UsesYYC = yycCheckBox.Checked.Value;
profile.SupportsAndroid = apkCheckBox.Checked.Value; modinfo.Profile.SupportsAndroid = apkCheckBox.Checked.Value;
profile.ProfileNotes = modNotesTextBox.Text; modinfo.Profile.ProfileNotes = modNotesTextBox.Text;
profile.OperatingSystem = operatingSystem.ToString(); modinfo.Profile.OperatingSystem = operatingSystem.ToString();
if (customSaveCheckBox.Checked.Value && customSaveTextBox.Text != "") if (customSaveCheckBox.Checked.Value && customSaveTextBox.Text != "")
profile.SaveLocation = customSaveTextBox.Text; modinfo.Profile.SaveLocation = customSaveTextBox.Text;
else else
profile.SaveLocation = "%localappdata%/AM2R"; modinfo.Profile.SaveLocation = "%localappdata%/AM2R";
if (operatingSystem == ProfileOperatingSystems.Linux) if (operatingSystem == ProfileOperatingSystems.Linux)
profile.SaveLocation = profile.SaveLocation.Replace("%localappdata%", "~/.config"); modinfo.Profile.SaveLocation = modinfo.Profile.SaveLocation.Replace("%localappdata%", "~/.config");
else if (operatingSystem == ProfileOperatingSystems.Mac) else if (operatingSystem == ProfileOperatingSystems.Mac)
{ {
if (profile.SaveLocation.Contains("%localappdata%/AM2R")) if (modinfo.Profile.SaveLocation.Contains("%localappdata%/AM2R"))
profile.SaveLocation = profile.SaveLocation.Replace("%localappdata%/AM2R", "~/Library/Application Support/com.yoyogames.am2r"); modinfo.Profile.SaveLocation = modinfo.Profile.SaveLocation.Replace("%localappdata%/AM2R", "~/Library/Application Support/com.yoyogames.am2r");
else else
profile.SaveLocation = "~/Library/Application Support/com.yoyogames." + new DirectoryInfo(profile.SaveLocation).Name.ToLower(); modinfo.Profile.SaveLocation = "~/Library/Application Support/com.yoyogames." + new DirectoryInfo(modinfo.Profile.SaveLocation).Name.ToLower();
} }
} }
@ -380,7 +379,7 @@ public partial class ModPacker : Form
createButton.Enabled = false; createButton.Enabled = false;
} }
private (bool, string) SelectFile(string title, FileFilter filter) private string SelectFile(string title, FileFilter filter)
{ {
using var fileFinder = new OpenFileDialog { Filters = { filter } }; using var fileFinder = new OpenFileDialog { Filters = { filter } };
fileFinder.Title = title; fileFinder.Title = title;
@ -388,9 +387,9 @@ public partial class ModPacker : Form
fileFinder.CheckFileExists = true; fileFinder.CheckFileExists = true;
if (fileFinder.ShowDialog(this) != DialogResult.Ok) if (fileFinder.ShowDialog(this) != DialogResult.Ok)
return (false, ""); return null;
string location = fileFinder.FileName; string location = fileFinder.FileName;
return (true, location); return location;
} }
} }

21
AM2RModPackerLib/ModCreationInfo.cs
Unescape View File

@ -5,14 +5,19 @@ namespace AM2RModPackerLib;
public class ModCreationInfo public class ModCreationInfo
{ {
public ModProfileXML profile; public ModProfileXML Profile = new ModProfileXML();
public bool IsAM2R11Loaded => String.IsNullOrWhiteSpace(originalPath); public bool IsAM2R11Loaded => String.IsNullOrWhiteSpace(AM2R11Path);
public bool IsWindowsModLoaded=> String.IsNullOrWhiteSpace(windowsPath); public bool IsWindowsModLoaded=> String.IsNullOrWhiteSpace(WindowsModPath);
public bool IsApkModLoaded => String.IsNullOrWhiteSpace(apkPath); public bool IsApkModLoaded => String.IsNullOrWhiteSpace(ApkModPath);
public bool IsLinuxModLoaded=> String.IsNullOrWhiteSpace(linuxPath); public bool IsLinuxModLoaded=> String.IsNullOrWhiteSpace(LinuxModPath);
public bool IsMacModLoaded=> String.IsNullOrWhiteSpace(macPath); public bool IsMacModLoaded=> String.IsNullOrWhiteSpace(MacModPath);
public string originalPath, windowsPath, apkPath, linuxPath, macPath; public string AM2R11Path;
public string saveFilePath; public string WindowsModPath;
public string ApkModPath;
public string LinuxModPath;
public string MacModPath;
public string SaveFolderPath;
} }
Write Preview
Loading…
Cancel
Save