Skip to content

Commit 1b89f19

Browse files
atenfyratenfyr
committed
alpha 4 release
1 parent 38dc899 commit 1b89f19

File tree

4 files changed

+80
-77
lines changed

4 files changed

+80
-77
lines changed

‎Form1.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ private void GetUnknownProperties(PropertyData dat)
265265
}
266266
else if (dat is MapPropertyData mapDat)
267267
{
268-
foreach (var entry in mapDat.Value)
268+
foreach (var entry in mapDat.Value)
269269
{
270270
GetUnknownProperties(entry.Key);
271271
GetUnknownProperties(entry.Value);
@@ -380,7 +380,7 @@ public void LoadFileAt(string filePath)
380380
dataGridView1.Columns.Clear();
381381
dataGridView1.Rows.Clear();
382382
UAGPalette.RefreshTheme(this);
383-
switch(ex)
383+
switch (ex)
384384
{
385385
case IOException _:
386386
MessageBox.Show("Failed to open this file! Please make sure the specified engine version is correct.", "Uh oh!");
@@ -550,7 +550,7 @@ private void dataGridClickCell(object sender, DataGridViewCellEventArgs e)
550550
{
551551
if (dataGridView1.CurrentCell != null && dataGridView1.CurrentCell.Style != null && dataGridView1.CurrentCell.Style.Font != null && dataGridView1.CurrentCell.Style.Font.Underline == true)
552552
{
553-
switch(dataGridView1.CurrentCell.Tag)
553+
switch (dataGridView1.CurrentCell.Tag)
554554
{
555555
case "CategoryJump":
556556
DataGridViewCell previousCell = dataGridView1.Rows[dataGridView1.CurrentCell.RowIndex].Cells[dataGridView1.CurrentCell.ColumnIndex - 1];
@@ -698,7 +698,7 @@ public void ForceResize()
698698
byteView1.Refresh();
699699
}
700700

701-
if (jsonView != null)
701+
if (jsonView != null)
702702
{
703703
jsonView.Size = dataGridView1.Size;
704704
jsonView.Location = dataGridView1.Location;
@@ -720,7 +720,7 @@ private void frm_closing(object sender, FormClosingEventArgs e)
720720
if (!existsUnsavedChanges) return;
721721

722722
DialogResult res = MessageBox.Show("Do you want to save your changes?", DisplayVersion, MessageBoxButtons.YesNoCancel);
723-
switch(res)
723+
switch (res)
724724
{
725725
case DialogResult.Yes:
726726
if (!ForceSave(currentSavingPath)) e.Cancel = true;
@@ -911,7 +911,7 @@ private void replaceAllReferencesToolStripMenuItem_Click(object sender, EventArg
911911
{
912912
DisplayText = "Enter a string to replace references of this name with"
913913
};
914-
914+
915915
if (replacementPrompt.ShowDialog(this) == DialogResult.OK)
916916
{
917917
FString newTxt = FString.FromString(replacementPrompt.OutputText);

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.3")]
36-
[assembly: AssemblyFileVersion("1.0.0.3")]
35+
[assembly: AssemblyVersion("1.0.0.4")]
36+
[assembly: AssemblyFileVersion("1.0.0.4")]

‎TableHandler.cs‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -131,82 +131,82 @@ public void FillOutTree()
131131
switch (baseUs)
132132
{
133133
case RawExport us3:
134-
{
135-
var parentNode = new PointingTreeNode("Raw Data (" + us3.Data.Length + " B)", us3.Data);
136-
categoryNode.Nodes.Add(parentNode);
137-
break;
138-
}
139-
case NormalExport us:
140-
{
141-
var parentNode = new PointingTreeNode((baseUs.ClassIndex.IsImport() ? baseUs.ClassIndex.ToImport(asset).ObjectName.Value.Value : baseUs.ClassIndex.Index.ToString()) + " (" + us.Data.Count + ")", us);
142-
categoryNode.Nodes.Add(parentNode);
143-
144-
for (int j = 0; j < us.Data.Count; j++) InterpretThing(us.Data[j], parentNode);
145-
146-
if (us is StringTableExport us2)
147134
{
148-
var parentNode2 = new PointingTreeNode(us2.Table.TableNamespace + " (" + us2.Table.Count + ")", us2.Table);
149-
categoryNode.Nodes.Add(parentNode2);
135+
var parentNode = new PointingTreeNode("Raw Data (" + us3.Data.Length + " B)", us3.Data);
136+
categoryNode.Nodes.Add(parentNode);
137+
break;
150138
}
151-
152-
if (us is StructExport structUs)
139+
case NormalExport us:
153140
{
154-
var parentNode2 = new PointingTreeNode("UStruct Data", structUs, PointingTreeNodeType.StructData);
155-
categoryNode.Nodes.Add(parentNode2);
156-
if (structUs.ScriptBytecode == null)
141+
var parentNode = new PointingTreeNode((baseUs.ClassIndex.IsImport() ? baseUs.ClassIndex.ToImport(asset).ObjectName.Value.Value : baseUs.ClassIndex.Index.ToString()) + " (" + us.Data.Count + ")", us);
142+
categoryNode.Nodes.Add(parentNode);
143+
144+
for (int j = 0; j < us.Data.Count; j++) InterpretThing(us.Data[j], parentNode);
145+
146+
if (us is StringTableExport us2)
157147
{
158-
var bytecodeNode = new PointingTreeNode("ScriptBytecode (" + structUs.ScriptBytecodeRaw.Length + " B)", structUs.ScriptBytecodeRaw, PointingTreeNodeType.Normal);
159-
parentNode2.Nodes.Add(bytecodeNode);
148+
var parentNode2 = new PointingTreeNode(us2.Table.TableNamespace + " (" + us2.Table.Count + ")", us2.Table);
149+
categoryNode.Nodes.Add(parentNode2);
160150
}
161-
else
151+
152+
if (us is StructExport structUs)
162153
{
163-
var bytecodeNode = new PointingTreeNode("ScriptBytecode (" + structUs.ScriptBytecode.Length + " instructions)", structUs.ScriptBytecode, PointingTreeNodeType.Normal);
164-
parentNode2.Nodes.Add(bytecodeNode);
154+
var parentNode2 = new PointingTreeNode("UStruct Data", structUs, PointingTreeNodeType.StructData);
155+
categoryNode.Nodes.Add(parentNode2);
156+
if (structUs.ScriptBytecode == null)
157+
{
158+
var bytecodeNode = new PointingTreeNode("ScriptBytecode (" + structUs.ScriptBytecodeRaw.Length + " B)", structUs.ScriptBytecodeRaw, PointingTreeNodeType.Normal);
159+
parentNode2.Nodes.Add(bytecodeNode);
160+
}
161+
else
162+
{
163+
var bytecodeNode = new PointingTreeNode("ScriptBytecode (" + structUs.ScriptBytecode.Length + " instructions)", structUs.ScriptBytecode, PointingTreeNodeType.Normal);
164+
parentNode2.Nodes.Add(bytecodeNode);
165+
}
165166
}
166-
}
167167

168-
if (us is ClassExport)
169-
{
170-
var parentNode2 = new PointingTreeNode("UClass Data", (ClassExport)us, PointingTreeNodeType.ClassData);
171-
categoryNode.Nodes.Add(parentNode2);
172-
}
173-
174-
if (us is PropertyExport)
175-
{
176-
var parentNode2 = new PointingTreeNode("UProperty Data", (PropertyExport)us, PointingTreeNodeType.UPropertyData);
177-
categoryNode.Nodes.Add(parentNode2);
178-
}
168+
if (us is ClassExport)
169+
{
170+
var parentNode2 = new PointingTreeNode("UClass Data", (ClassExport)us, PointingTreeNodeType.ClassData);
171+
categoryNode.Nodes.Add(parentNode2);
172+
}
179173

180-
if (us is DataTableExport us4)
181-
{
182-
var parentNode2 = new PointingTreeNode("Table Info (" + us4.Table.Data.Count + ")", us4.Table);
183-
categoryNode.Nodes.Add(parentNode2);
184-
foreach (StructPropertyData entry in us4.Table.Data)
174+
if (us is PropertyExport)
185175
{
186-
string decidedName = entry.Name.Value.Value;
176+
var parentNode2 = new PointingTreeNode("UProperty Data", (PropertyExport)us, PointingTreeNodeType.UPropertyData);
177+
categoryNode.Nodes.Add(parentNode2);
178+
}
187179

188-
var structNode = new PointingTreeNode(decidedName + " (" + entry.Value.Count + ")", entry);
189-
parentNode2.Nodes.Add(structNode);
190-
for (int j = 0; j < entry.Value.Count; j++)
180+
if (us is DataTableExport us4)
181+
{
182+
var parentNode2 = new PointingTreeNode("Table Info (" + us4.Table.Data.Count + ")", us4.Table);
183+
categoryNode.Nodes.Add(parentNode2);
184+
foreach (StructPropertyData entry in us4.Table.Data)
191185
{
192-
InterpretThing(entry.Value[j], structNode);
186+
string decidedName = entry.Name.Value.Value;
187+
188+
var structNode = new PointingTreeNode(decidedName + " (" + entry.Value.Count + ")", entry);
189+
parentNode2.Nodes.Add(structNode);
190+
for (int j = 0; j < entry.Value.Count; j++)
191+
{
192+
InterpretThing(entry.Value[j], structNode);
193+
}
193194
}
194195
}
195-
}
196196

197-
if (us is EnumExport us5)
198-
{
199-
var parentNode2 = new PointingTreeNode("Enum Data", us5, PointingTreeNodeType.EnumData);
200-
categoryNode.Nodes.Add(parentNode2);
201-
}
197+
if (us is EnumExport us5)
198+
{
199+
var parentNode2 = new PointingTreeNode("Enum Data", us5, PointingTreeNodeType.EnumData);
200+
categoryNode.Nodes.Add(parentNode2);
201+
}
202202

203-
{
204-
var parentNode3 = new PointingTreeNode("Extra Data (" + us.Extras.Length + " B)", us.Extras);
205-
categoryNode.Nodes.Add(parentNode3);
206-
}
203+
{
204+
var parentNode3 = new PointingTreeNode("Extra Data (" + us.Extras.Length + " B)", us.Extras);
205+
categoryNode.Nodes.Add(parentNode3);
206+
}
207207

208-
break;
209-
}
208+
break;
209+
}
210210
}
211211
}
212212

@@ -629,7 +629,7 @@ private PropertyData RowToPD(int rowNum, PropertyData original)
629629
case TextHistoryType.Base:
630630
if (value1B == null || value2B == null || value3B == null || !(value1B is string) || !(value2B is string) || !(value3B is string)) return null;
631631
decidedTextData.Namespace = (string)value1B == FString.NullCase ? null : FString.FromString((string)value1B);
632-
decidedTextData.Value = (string)value2B == FString.NullCase ? null : FString.FromString((string)value2B);
632+
decidedTextData.Value = (string)value2B == FString.NullCase ? null : FString.FromString((string)value2B);
633633
decidedTextData.CultureInvariantString = (string)value3B == FString.NullCase ? null : FString.FromString((string)value3B);
634634
break;
635635
case TextHistoryType.StringTableEntry:
@@ -1000,7 +1000,7 @@ public void Load() // Updates the table with selected asset data
10001000
switch (pointerNode.Pointer)
10011001
{
10021002
case NormalExport usCategory:
1003-
switch(pointerNode.Type)
1003+
switch (pointerNode.Type)
10041004
{
10051005
case PointingTreeNodeType.Normal:
10061006
for (int num = 0; num < usCategory.Data.Count; num++)
@@ -1262,7 +1262,7 @@ public void Load() // Updates the table with selected asset data
12621262
standardRendering = false;
12631263
break;
12641264
}
1265-
1265+
12661266
break;
12671267
case FStringTable strUs:
12681268
{
@@ -1710,7 +1710,7 @@ public void Save(bool forceNewLoad) // Reads from the table and updates the asse
17101710
}
17111711
else
17121712
{
1713-
asset.DependsMap.Insert(vals[0], new int[]{ vals[1] });
1713+
asset.DependsMap.Insert(vals[0], new int[] { vals[1] });
17141714
}
17151715
}
17161716
break;
@@ -1844,7 +1844,7 @@ public void Save(bool forceNewLoad) // Reads from the table and updates the asse
18441844
}
18451845
else if (pointerNode.Pointer is NormalExport usCat)
18461846
{
1847-
switch(pointerNode.Type)
1847+
switch (pointerNode.Type)
18481848
{
18491849
case PointingTreeNodeType.Normal:
18501850
List<PropertyData> newData = new List<PropertyData>();
@@ -1870,7 +1870,7 @@ public void Save(bool forceNewLoad) // Reads from the table and updates the asse
18701870
{
18711871
var currRow = dataGridView1.Rows[i];
18721872
if (currRow == null || currRow.Cells.Count < 2) continue;
1873-
1873+
18741874
string enumFrontValue = (string)currRow.Cells[0].Value;
18751875
string enumValueValue = (string)currRow.Cells[1].Value;
18761876
if (enumFrontValue == "CppForm")
@@ -1887,7 +1887,7 @@ public void Save(bool forceNewLoad) // Reads from the table and updates the asse
18871887
}
18881888
break;
18891889
}
1890-
1890+
18911891
}
18921892
else if (pointerNode.Pointer is UDataTable dtUs)
18931893
{

‎next_patch_notes.txt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
* Overhauled internal code and improved support for a variety of engine versions and assets (UAssetAPI 1.0).
1+
* Overhauled internal code and vastly improved support for a variety of engine versions and assets (UAssetAPI 1.0).
22
* Added further BlueprintGeneratedClass, UFunction, and UserDefinedEnum support.
3-
* Renamed tabs and fields to be more tool-agnostic.
3+
* Added support for importing and exporting assets to and from a custom JSON format.
4+
* Added support for displaying JSON for Kismet bytecode scripts (implemented by LongerWarrior).
5+
* Added the ability to directly modify export preload dependencies for assets from games that use the event driven loader.
46
* Added many new shortcut keys.
57
* Added support for versioned assets.
68
* Added a new tab containing information about the CustomVersionContainer.
79
* Added a new tab containing information about the WorldTileInfo, if it exists.
810
* Added the ability to select an engine version to parse assets with.
9-
* Added the ability to add new NormalExports (None-terminated UProperty list categories) within UAssetGUI.
11+
* Added the ability to add new NormalExports (None-terminated UProperty list exports) within UAssetGUI.
1012
* Added DPI awareness.
1113
* Added the ability to manually change the encoding of entries in the name map (header list).
1214
* Added more information while displaying TextProperty data.
1315
* Added support for a variety of new properties.
16+
* Renamed tabs and fields to be more tool-agnostic.

0 commit comments

Comments
 (0)