Skip to content

Commit f095ca1

Browse files
committed
Fixed Script references being out of order
Fixed Packages not having the second PLD2 entry Overhauled T4 generation on records Some work on T4 SubrecordCollection generation Implemented some rudimentary sorting
1 parent a2d78c9 commit f095ca1

589 files changed

Lines changed: 11892 additions & 4282 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ESPSharp.sln

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ VisualStudioVersion = 12.0.30501.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ESPSharp", "ESPSharp\ESPSharp.csproj", "{EEC78DA7-DC30-49F2-936C-CDD6C4BEF45B}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ESPSharpTest", "ESPSharpTest\ESPSharpTest.csproj", "{2D902915-8DAD-49BB-BFFB-3F890066B2DC}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginDecompiler", "PluginDecompiler\PluginDecompiler.csproj", "{2D902915-8DAD-49BB-BFFB-3F890066B2DC}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ESPSharpTest", "ESPSharpTest\ESPSharpTest.csproj", "{C6E6C4DB-4720-486E-9D3A-D9486B8671B6}"
911
EndProject
1012
Global
1113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
2123
{2D902915-8DAD-49BB-BFFB-3F890066B2DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
2224
{2D902915-8DAD-49BB-BFFB-3F890066B2DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
2325
{2D902915-8DAD-49BB-BFFB-3F890066B2DC}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{C6E6C4DB-4720-486E-9D3A-D9486B8671B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{C6E6C4DB-4720-486E-9D3A-D9486B8671B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{C6E6C4DB-4720-486E-9D3A-D9486B8671B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{C6E6C4DB-4720-486E-9D3A-D9486B8671B6}.Release|Any CPU.Build.0 = Release|Any CPU
2430
EndGlobalSection
2531
GlobalSection(SolutionProperties) = preSolution
2632
HideSolutionNode = FALSE

ESPSharp/DataTypes/AlternateTexture.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,18 @@
1414

1515
namespace ESPSharp.DataTypes
1616
{
17-
public partial class AlternateTexture : IESPSerializable, ICloneable<AlternateTexture>, IReferenceContainer
17+
public partial class AlternateTexture : IESPSerializable, ICloneable, IReferenceContainer
1818
{
19-
partial void ReadData(ESPReader reader)
19+
partial void ReadNameBinary(ESPReader reader)
2020
{
2121
int length = reader.ReadInt32();
2222
Name = new String(reader.ReadChars(length));
23-
TextureSet.ReadBinary(reader);
24-
Index = reader.ReadInt32();
2523
}
2624

27-
partial void WriteData(ESPWriter writer)
25+
partial void WriteNameBinary(ESPWriter writer)
2826
{
2927
writer.Write(Name.Length);
3028
writer.Write(Name.ToCharArray());
31-
TextureSet.WriteBinary(writer);
32-
writer.Write(Index);
3329
}
3430
}
3531
}

ESPSharp/DataTypes/Comparison.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace ESPSharp.DataTypes
1616
{
17-
public class Comparison : IESPSerializable, ICloneable<Comparison>, IComparable<Comparison>, IEquatable<Comparison>, IReferenceContainer
17+
public class Comparison : IESPSerializable, ICloneable, IComparable<Comparison>, IEquatable<Comparison>, IReferenceContainer
1818
{
1919
public ConditionFlags Flags { get; set; }
2020
public ConditionComparisonType Operator { get; set; }
@@ -129,7 +129,7 @@ public void ReadXML(XElement ele, ElderScrollsPlugin master)
129129
}
130130
}
131131

132-
public Comparison Clone()
132+
public object Clone()
133133
{
134134
return new Comparison(this);
135135
}

ESPSharp/DataTypes/DateStamp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace ESPSharp.DataTypes
1616
{
17-
public partial class DateStamp : IESPSerializable, ICloneable<DateStamp>
17+
public partial class DateStamp : IESPSerializable, ICloneable
1818
{
1919
public static DateStamp Now
2020
{

ESPSharp/DataTypes/FormID.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public override string ToString()
3131
return RawValue.ToString("X8");
3232
}
3333

34-
partial void WriteDataXML(XElement ele, ElderScrollsPlugin master)
34+
partial void WriteRawValueXML(XElement ele, ElderScrollsPlugin master)
3535
{
3636
ele.Add(new XAttribute("ID", this));
3737

@@ -48,7 +48,7 @@ partial void WriteDataXML(XElement ele, ElderScrollsPlugin master)
4848
ele.Value = "NullReference";
4949
}
5050

51-
partial void ReadDataXML(XElement ele, ElderScrollsPlugin master)
51+
partial void ReadRawValueXML(XElement ele, ElderScrollsPlugin master)
5252
{
5353
RawValue = uint.Parse(ele.Attribute("ID").Value, System.Globalization.NumberStyles.HexNumber);
5454
}

ESPSharp/DataTypes/Function.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace ESPSharp.DataTypes
1616
{
17-
public class Function : IESPSerializable, ICloneable<Function>, IComparable<Function>, IEquatable<Function>, IReferenceContainer
17+
public class Function : IESPSerializable, ICloneable, IComparable<Function>, IEquatable<Function>, IReferenceContainer
1818
{
1919
#region Dictionary
2020
private static Dictionary<FunctionType, TypeStringArgData> Metadata = new Dictionary<FunctionType, TypeStringArgData>()
@@ -502,7 +502,7 @@ public void ReadXML(XElement ele, ElderScrollsPlugin master)
502502
else throw new Exception(Type.ToString() + " was not in the dictionary.");
503503
}
504504

505-
public Function Clone()
505+
public object Clone()
506506
{
507507
return new Function(this);
508508
}

ESPSharp/DataTypes/GeneratedCode/AlternateTexture.cs

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace ESPSharp.DataTypes
1616
{
17-
public partial class AlternateTexture : IESPSerializable, ICloneable<AlternateTexture>, IComparable<AlternateTexture>, IEquatable<AlternateTexture>, IReferenceContainer
17+
public partial class AlternateTexture : IESPSerializable, ICloneable, IComparable<AlternateTexture>, IEquatable<AlternateTexture>
1818
{
1919
public String Name { get; set; }
2020
public FormID TextureSet { get; set; }
@@ -36,16 +36,20 @@ public AlternateTexture(String Name, FormID TextureSet, Int32 Index)
3636

3737
public AlternateTexture(AlternateTexture copyObject)
3838
{
39-
Name = (String)copyObject.Name.Clone();
40-
TextureSet = copyObject.TextureSet.Clone();
39+
if (copyObject.Name != null)
40+
Name = (String)copyObject.Name.Clone();
41+
if (copyObject.TextureSet != null)
42+
TextureSet = (FormID)copyObject.TextureSet.Clone();
4143
Index = copyObject.Index;
4244
}
4345

4446
public void ReadBinary(ESPReader reader)
4547
{
4648
try
4749
{
48-
ReadData(reader);
50+
ReadNameBinary(reader);
51+
TextureSet.ReadBinary(reader);
52+
Index = reader.ReadInt32();
4953
}
5054
catch
5155
{
@@ -55,13 +59,15 @@ public void ReadBinary(ESPReader reader)
5559

5660
public void WriteBinary(ESPWriter writer)
5761
{
58-
WriteData(writer);
62+
WriteNameBinary(writer);
63+
TextureSet.WriteBinary(writer);
64+
writer.Write(Index);
5965
}
6066

6167
public void WriteXML(XElement ele, ElderScrollsPlugin master)
6268
{
6369
XElement subEle;
64-
70+
6571
ele.TryPathTo("Name", true, out subEle);
6672
subEle.Value = Name.ToString();
6773

@@ -75,31 +81,25 @@ public void WriteXML(XElement ele, ElderScrollsPlugin master)
7581
public void ReadXML(XElement ele, ElderScrollsPlugin master)
7682
{
7783
XElement subEle;
78-
84+
7985
if (ele.TryPathTo("Name", false, out subEle))
80-
{
8186
Name = subEle.Value;
82-
}
8387

8488
if (ele.TryPathTo("TextureSet", false, out subEle))
85-
{
8689
TextureSet.ReadXML(subEle, master);
87-
}
8890

8991
if (ele.TryPathTo("Index", false, out subEle))
90-
{
9192
Index = subEle.ToInt32();
92-
}
9393
}
9494

95-
public AlternateTexture Clone()
95+
public object Clone()
9696
{
9797
return new AlternateTexture(this);
9898
}
9999

100100
public int CompareTo(AlternateTexture other)
101101
{
102-
return Index.CompareTo(other.Index);
102+
return Index.CompareTo(other.Index);
103103
}
104104

105105
public static bool operator >(AlternateTexture objA, AlternateTexture objB)
@@ -124,14 +124,28 @@ public int CompareTo(AlternateTexture other)
124124

125125
public bool Equals(AlternateTexture other)
126126
{
127-
return Name == other.Name &&
127+
if (System.Object.ReferenceEquals(this, other))
128+
{
129+
return true;
130+
}
131+
132+
if (((object)this == null) || ((object)other == null))
133+
{
134+
return false;
135+
}
136+
137+
return Name.SequenceEqual(other.Name) &&
128138
TextureSet == other.TextureSet &&
129139
Index == other.Index;
130140
}
131141

132142
public override bool Equals(object obj)
133143
{
144+
if (obj == null)
145+
return false;
146+
134147
AlternateTexture other = obj as AlternateTexture;
148+
135149
if (other == null)
136150
return false;
137151
else
@@ -145,16 +159,36 @@ public override int GetHashCode()
145159

146160
public static bool operator ==(AlternateTexture objA, AlternateTexture objB)
147161
{
162+
if (System.Object.ReferenceEquals(objA, objB))
163+
{
164+
return true;
165+
}
166+
167+
if (((object)objA == null) || ((object)objB == null))
168+
{
169+
return false;
170+
}
171+
148172
return objA.Equals(objB);
149173
}
150174

151175
public static bool operator !=(AlternateTexture objA, AlternateTexture objB)
152176
{
177+
if (System.Object.ReferenceEquals(objA, objB))
178+
{
179+
return false;
180+
}
181+
182+
if (((object)objA == null) || ((object)objB == null))
183+
{
184+
return true;
185+
}
186+
153187
return !objA.Equals(objB);
154188
}
155189

156-
partial void ReadData(ESPReader reader);
190+
partial void ReadNameBinary(ESPReader reader);
157191

158-
partial void WriteData(ESPWriter writer);
192+
partial void WriteNameBinary(ESPWriter writer);
159193
}
160-
}
194+
}

ESPSharp/DataTypes/GeneratedCode/AlternateTexture.tt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
<#@ template debug="false" hostspecific="false" language="C#" #>
2-
<#@ output extension=".cs" #>
3-
<#
4-
DataTypeTemplate template = new DataTypeTemplate();
1+
<#
2+
ClassTemplate template = new ClassTemplate();
53
template.ClassName = "AlternateTexture";
6-
template.implementReadData = false;
7-
template.implementWriteData = false;
4+
//template.implementReadData = false;
5+
//template.implementWriteData = false;
86

9-
DataTypeField tempField;
7+
ClassField tempField;
108

119
tempField =
12-
new DataTypeField(
10+
new ClassField(
1311
typeof(string),
1412
"Name",
1513
"Name"
1614
);
15+
tempField.implementReadData = false;
16+
tempField.implementWriteData = false;
1717
template.Fields.Add(tempField);
1818

1919
tempField =
20-
new DataTypeField(
20+
new ClassField(
2121
typeof(FormID),
2222
"TextureSet",
2323
"TextureSet"
2424
);
2525
template.Fields.Add(tempField);
2626

2727
tempField =
28-
new DataTypeField(
28+
new ClassField(
2929
typeof(int),
3030
"Index",
3131
"Index"

0 commit comments

Comments
 (0)