DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Misc

Browse Source
This commit is contained in:
Cj 2024-06-20 23:30:17 -04:00
parent 6966628e5b
commit 03252c1422
3 changed files with 43 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
RecodeItGUI/GUI/Main.Designer.cs generated
View File

@ -29,7 +29,7 @@ partial class ReCodeItForm
private void InitializeComponent() private void InitializeComponent()
{ {
components = new System.ComponentModel.Container(); components = new System.ComponentModel.Container();
TabPageRemapper = new TabPage(); RemapperTabPage = new TabPage();
RemapTreeView = new TreeView(); RemapTreeView = new TreeView();
groupBox1 = new GroupBox(); groupBox1 = new GroupBox();
ActiveProjectMappingsCheckbox = new CheckBox(); ActiveProjectMappingsCheckbox = new CheckBox();
@ -140,7 +140,7 @@ partial class ReCodeItForm
AutoMapperExcludeTypesRemoveButton = new Button(); AutoMapperExcludeTypesRemoveButton = new Button();
AutoMapperExcludeTypesAddButton = new Button(); AutoMapperExcludeTypesAddButton = new Button();
AutoMapperTypesExcludeBox = new ListBox(); AutoMapperTypesExcludeBox = new ListBox();
tabPage5 = new TabPage(); CCTabPage = new TabPage();
groupBox4 = new GroupBox(); groupBox4 = new GroupBox();
groupBox5 = new GroupBox(); groupBox5 = new GroupBox();
CrossPatchRemapButton = new Button(); CrossPatchRemapButton = new Button();
@ -166,7 +166,7 @@ partial class ReCodeItForm
SilentModeCheckbox = new CheckBox(); SilentModeCheckbox = new CheckBox();
DebugLoggingCheckbox = new CheckBox(); DebugLoggingCheckbox = new CheckBox();
toolTip1 = new ToolTip(components); toolTip1 = new ToolTip(components);
TabPageRemapper.SuspendLayout(); RemapperTabPage.SuspendLayout();
groupBox1.SuspendLayout(); groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).BeginInit(); ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).BeginInit();
Inclusions.SuspendLayout(); Inclusions.SuspendLayout();
@ -182,7 +182,7 @@ partial class ReCodeItForm
AutoMapperTab.SuspendLayout(); AutoMapperTab.SuspendLayout();
((System.ComponentModel.ISupportInitialize)AutoMapperMinLengthUpDown).BeginInit(); ((System.ComponentModel.ISupportInitialize)AutoMapperMinLengthUpDown).BeginInit();
((System.ComponentModel.ISupportInitialize)AutoMapperRequiredMatchesUpDown).BeginInit(); ((System.ComponentModel.ISupportInitialize)AutoMapperRequiredMatchesUpDown).BeginInit();
tabPage5.SuspendLayout(); CCTabPage.SuspendLayout();
groupBox4.SuspendLayout(); groupBox4.SuspendLayout();
groupBox5.SuspendLayout(); groupBox5.SuspendLayout();
groupBox3.SuspendLayout(); groupBox3.SuspendLayout();
@ -190,17 +190,17 @@ partial class ReCodeItForm
groupBox2.SuspendLayout(); groupBox2.SuspendLayout();
SuspendLayout(); SuspendLayout();
// //
// TabPageRemapper // RemapperTabPage
// //
TabPageRemapper.BackColor = SystemColors.ControlDarkDark; RemapperTabPage.BackColor = SystemColors.ControlDarkDark;
TabPageRemapper.Controls.Add(RemapTreeView); RemapperTabPage.Controls.Add(RemapTreeView);
TabPageRemapper.Controls.Add(groupBox1); RemapperTabPage.Controls.Add(groupBox1);
TabPageRemapper.Location = new Point(4, 34); RemapperTabPage.Location = new Point(4, 34);
TabPageRemapper.Name = "TabPageRemapper"; RemapperTabPage.Name = "RemapperTabPage";
TabPageRemapper.Padding = new Padding(3); RemapperTabPage.Padding = new Padding(3);
TabPageRemapper.Size = new Size(1336, 953); RemapperTabPage.Size = new Size(1336, 953);
TabPageRemapper.TabIndex = 1; RemapperTabPage.TabIndex = 1;
TabPageRemapper.Text = "Remapper"; RemapperTabPage.Text = "Remapper";
// //
// RemapTreeView // RemapTreeView
// //
@ -1077,9 +1077,9 @@ partial class ReCodeItForm
// //
// TabControlMain // TabControlMain
// //
TabControlMain.Controls.Add(TabPageRemapper); TabControlMain.Controls.Add(RemapperTabPage);
TabControlMain.Controls.Add(AutoMapperTab); TabControlMain.Controls.Add(AutoMapperTab);
TabControlMain.Controls.Add(tabPage5); TabControlMain.Controls.Add(CCTabPage);
TabControlMain.Controls.Add(SettingsTab); TabControlMain.Controls.Add(SettingsTab);
TabControlMain.Location = new Point(-5, 1); TabControlMain.Location = new Point(-5, 1);
TabControlMain.Name = "TabControlMain"; TabControlMain.Name = "TabControlMain";
@ -1430,16 +1430,17 @@ partial class ReCodeItForm
AutoMapperTypesExcludeBox.Size = new Size(353, 229); AutoMapperTypesExcludeBox.Size = new Size(353, 229);
AutoMapperTypesExcludeBox.TabIndex = 21; AutoMapperTypesExcludeBox.TabIndex = 21;
// //
// tabPage5 // CCTabPage
// //
tabPage5.BackColor = SystemColors.ControlDarkDark; CCTabPage.BackColor = SystemColors.ControlDarkDark;
tabPage5.Controls.Add(groupBox4); CCTabPage.Controls.Add(groupBox4);
tabPage5.Location = new Point(4, 34); CCTabPage.Location = new Point(4, 34);
tabPage5.Name = "tabPage5"; CCTabPage.Name = "CCTabPage";
tabPage5.Padding = new Padding(3); CCTabPage.Padding = new Padding(3);
tabPage5.Size = new Size(1336, 953); CCTabPage.Size = new Size(1336, 953);
tabPage5.TabIndex = 4; CCTabPage.TabIndex = 4;
tabPage5.Text = "ReCodeIt Compiler"; CCTabPage.Text = "ReCodeIt Compiler";
CCTabPage.Validated += OnCCTabPageValidate;
// //
// groupBox4 // groupBox4
// //
@ -1719,7 +1720,7 @@ partial class ReCodeItForm
FormBorderStyle = FormBorderStyle.FixedSingle; FormBorderStyle = FormBorderStyle.FixedSingle;
Name = "ReCodeItForm"; Name = "ReCodeItForm";
Text = "ReCodeIt V0.1.0 - RC1"; Text = "ReCodeIt V0.1.0 - RC1";
TabPageRemapper.ResumeLayout(false); RemapperTabPage.ResumeLayout(false);
groupBox1.ResumeLayout(false); groupBox1.ResumeLayout(false);
groupBox1.PerformLayout(); groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).EndInit(); ((System.ComponentModel.ISupportInitialize)ConstuctorCountUpDown).EndInit();
@ -1741,7 +1742,7 @@ partial class ReCodeItForm
AutoMapperTab.PerformLayout(); AutoMapperTab.PerformLayout();
((System.ComponentModel.ISupportInitialize)AutoMapperMinLengthUpDown).EndInit(); ((System.ComponentModel.ISupportInitialize)AutoMapperMinLengthUpDown).EndInit();
((System.ComponentModel.ISupportInitialize)AutoMapperRequiredMatchesUpDown).EndInit(); ((System.ComponentModel.ISupportInitialize)AutoMapperRequiredMatchesUpDown).EndInit();
tabPage5.ResumeLayout(false); CCTabPage.ResumeLayout(false);
groupBox4.ResumeLayout(false); groupBox4.ResumeLayout(false);
groupBox4.PerformLayout(); groupBox4.PerformLayout();
groupBox5.ResumeLayout(false); groupBox5.ResumeLayout(false);
@ -1754,7 +1755,7 @@ partial class ReCodeItForm
} }
#endregion #endregion
private TabPage TabPageRemapper; private TabPage RemapperTabPage;
private GroupBox groupBox1; private GroupBox groupBox1;
private TabControl Inclusions; private TabControl Inclusions;
private TabPage tabPage1; private TabPage tabPage1;
@ -1852,7 +1853,7 @@ partial class ReCodeItForm
private Button AutoMapperMethodRemoveButton; private Button AutoMapperMethodRemoveButton;
private Button AutoMapperMethodAddButton; private Button AutoMapperMethodAddButton;
private ListBox AutoMapperMethodBox; private ListBox AutoMapperMethodBox;
private TabPage tabPage5; private TabPage CCTabPage;
private Button PickNameMangledPathButton; private Button PickNameMangledPathButton;
private TextBox NameMangledAssemblyTextBox; private TextBox NameMangledAssemblyTextBox;
private GroupBox groupBox3; private GroupBox groupBox3;

16
RecodeItGUI/GUI/Main.cs
View File

@ -36,6 +36,12 @@ public partial class ReCodeItForm : Form
RefreshAutoMapperPage(); RefreshAutoMapperPage();
RefreshCrossCompilerPage(); RefreshCrossCompilerPage();
LoadMappingFile(); LoadMappingFile();
var remaps = AppSettings.Remapper.UseProjectMappings
? CrossCompiler.ActiveProject.RemapModels
: DataProvider.Remaps;
ReloadRemapTreeView(remaps);
} }
private void SubscribeToEvents() private void SubscribeToEvents()
@ -306,7 +312,6 @@ public partial class ReCodeItForm : Form
} }
ReloadRemapTreeView(remaps); ReloadRemapTreeView(remaps);
ReloadCCRemapTreeView(remaps);
ResetAllRemapFields(); ResetAllRemapFields();
return; return;
@ -330,13 +335,9 @@ public partial class ReCodeItForm : Form
//RemapTreeView.Nodes.Remove(node); //RemapTreeView.Nodes.Remove(node);
RemapTreeView.Nodes.Add(node); RemapTreeView.Nodes.Add(node);
//CCMappingTreeView.Nodes.Remove(node);
CCMappingTreeView.Nodes.Add(node);
_cachedNewTypeNames.Clear(); _cachedNewTypeNames.Clear();
ReloadRemapTreeView(remaps); ReloadRemapTreeView(remaps);
ReloadCCRemapTreeView(remaps);
ResetAllRemapFields(); ResetAllRemapFields();
} }
@ -874,6 +875,11 @@ public partial class ReCodeItForm : Form
#region CROSS_COMPILER #region CROSS_COMPILER
private void OnCCTabPageValidate(object sender, EventArgs e)
{
RefreshCrossCompilerPage();
}
private void RefreshCrossCompilerPage() private void RefreshCrossCompilerPage()
{ {
var ccSettings = AppSettings.CrossCompiler; var ccSettings = AppSettings.CrossCompiler;

13
RecodeItLib/Utils/DataProvider.cs
View File

@ -185,19 +185,8 @@ public static class DataProvider
var fileName = Path.GetFileName(path); var fileName = Path.GetFileName(path);
foreach (var module in assemblyDefinition.Modules.ToArray())
{
if (module.Name == fileName)
{
Logger.Log($"Module definition {module.Name} found");
AssemblyDefinition = assemblyDefinition; AssemblyDefinition = assemblyDefinition;
ModuleDefinition = module; ModuleDefinition = assemblyDefinition.Modules.First();
return;
}
}
Logger.Log($"Module {fileName} not found in assembly {fileName}");
} }
public static string WriteAssemblyDefinition(string path) public static string WriteAssemblyDefinition(string path)