Skip to content

Commit a83e1ef

Browse files
authored
Merge pull request #208 from BigBang1112/dev
2.4.3
2 parents 8b314bc + e6f10a4 commit a83e1ef

92 files changed

Lines changed: 16014 additions & 386 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.

GBX.NET.slnx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<File Path="Resources/CollectionId.txt" />
2626
<File Path="Resources/Engine.txt" />
2727
<File Path="Resources/Extensions.txt" />
28+
<File Path="Resources/FileHashes_MP3.txt" />
2829
<File Path="Resources/FileHashes_MP4.txt" />
2930
<File Path="Resources/FileHashes_TM2020.txt" />
3031
<File Path="Resources/FileHashes_TMT.txt" />
@@ -93,6 +94,7 @@
9394
<Project Path="Templates/MyGbxToolApp/MyGbxToolAppCLI/MyGbxToolAppCLI.csproj" />
9495
</Folder>
9596
<Folder Name="/Tests/">
97+
<Project Path="Tests/GBX.NET.PAK.Tests/GBX.NET.PAK.Tests.csproj" Id="e0d7028e-a295-4aa8-9b4c-93f37112ea53" />
9698
<Project Path="Tests/GBX.NET.Tests/GBX.NET.Tests.csproj" />
9799
</Folder>
98100
<Folder Name="/Tools/">

Generators/GBX.NET.Generators/ChunkL/MemberSerializationWriter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,8 @@ public static string MapType(string type, out bool noMatch)
876876
"int128" => "Int128",
877877
"uint128" => "UInt128",
878878
"uint256" => "UInt256",
879+
"checksum128" => "Checksum128",
880+
"checksum256" => "Checksum256",
879881
"int64" or "long" => nameof(Int64),
880882
"uint64" or "ulong" => nameof(UInt64),
881883
"uint32" or "uint" => nameof(UInt32),

Generators/GBX.NET.Generators/ChunkL/PropertyTypeExtensions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ internal static class PropertyTypeExtensions
3232
"Int128",
3333
"UInt128",
3434
"UInt256",
35+
"Checksum128",
36+
"Checksum256",
3537
"Byte3",
3638
"BoxAligned",
3739
"BoxInt3",
@@ -114,6 +116,8 @@ public static string MapType(string type)
114116
"int128" => "Int128",
115117
"uint128" => "UInt128",
116118
"uint256" => "UInt256",
119+
"checksum128" => "Checksum128",
120+
"checksum256" => "Checksum256",
117121
"int64" => "long",
118122
"uint64" => "ulong",
119123
"uint32" => "uint",

Generators/GBX.NET.Generators/GBX.NET.Generators.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<IncludeBuildOutput>false</IncludeBuildOutput>
65
<ImplicitUsings>enable</ImplicitUsings>
76
<Nullable>enable</Nullable>
87
<LangVersion>14</LangVersion>

Generators/GBX.NET.Generators/SubGenerators/ClassManagerSubGenerator.cs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -171,30 +171,6 @@ public static void GenerateSource(SourceProductionContext context, ImmutableDict
171171
builder.AppendLine(" _ => true");
172172
builder.AppendLine(" };");
173173

174-
builder.AppendLine();
175-
builder.AppendLine(" public static partial bool IsClassWriteSupported(uint classId) => classId switch");
176-
builder.AppendLine(" {");
177-
178-
foreach (var classInfo in classInfos)
179-
{
180-
if (classInfo.Value.TypeSymbol is null)
181-
{
182-
continue;
183-
}
184-
185-
if (!classInfo.Value.TypeSymbol.GetAttributes().Any(x => x.AttributeClass?.Name == "WriteNotSupportedAttribute"))
186-
{
187-
continue;
188-
}
189-
190-
builder.Append(" 0x");
191-
builder.Append(classInfo.Value.Id.GetValueOrDefault().ToString("X8"));
192-
builder.AppendLine(" => false,");
193-
}
194-
195-
builder.AppendLine(" _ => true");
196-
builder.AppendLine(" };");
197-
198174
builder.AppendLine();
199175
builder.AppendLine(" internal static partial uint? GetBaseClassId(uint classId) => classId switch");
200176
builder.AppendLine(" {");

Generators/GBX.NET.Lua.Generators/GBX.NET.Lua.Generators.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" PrivateAssets="all" />
1515
</ItemGroup>
1616

17-
<PropertyGroup>
18-
<IncludeBuildOutput>false</IncludeBuildOutput>
19-
</PropertyGroup>
20-
2117
<ItemGroup>
2218
<InternalsVisibleTo Include="$(AssemblyName).Tests" />
2319
</ItemGroup>

Resources/BaseKeys.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@ TMValleyCE 5BDB289BFB0E9DFCAA3AA9B5FEB7D733
7575
Trackmania 50106CD3E964B316CAA0780F4949737D
7676
TrackMania 50106CD3E964B316CAA0780F4949737D
7777
TrackManiaCE 50106CD3E964B316CAA0780F4949737D
78+
Trackmania.Title.Pack 50106CD3E964B316CAA0780F4949737D
7879
Update 19ED4601E3E8E53CFB30E184C013B3DF
7980
WhiteShore 105C22EB2CFAC821DF2282E634B453BD

0 commit comments

Comments
 (0)