Skip to content

Commit c9c4437

Browse files
LeftofZenLeftofZen
committed
code formatting and cleanup
1 parent 0b1f7ce commit c9c4437

66 files changed

Lines changed: 7607 additions & 7609 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.

‎Dat/Types/GlobalUsings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
global using char_t = System.Byte;
55
global using coord_t = System.Int16;
6-
global using UniqueObjectId = System.UInt64;
76
global using image_id = System.UInt32;
87
global using int16_t = System.Int16;
98
global using int32_t = System.Int32;
@@ -18,5 +17,6 @@
1817
global using uint16_t = System.UInt16;
1918
global using uint32_t = System.UInt32;
2019
global using uint8_t = System.Byte;
20+
global using UniqueObjectId = System.UInt64;
2121
#pragma warning restore IDE0005 // Using directive is unnecessary.
2222
#pragma warning restore IDE0079 // Remove unnecessary suppression

‎Dat/Types/S5Header.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Dat.Data;
33
using Dat.FileParsing;
44
using System.ComponentModel;
5-
using System.Xml.Linq;
65

76
namespace Dat.Types;
87

‎DatabaseExporter/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Common.Json;
2-
using Microsoft.EntityFrameworkCore;
32
using Definitions.Database;
43
using Definitions.SourceData;
4+
using Microsoft.EntityFrameworkCore;
55
using System.Text.Json;
66

77
var db = LocoDbContext.GetDbFromFile(LocoDbContext.DefaultDb);

‎DatabaseImporter/Program.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using Common;
22
using Common.Json;
3-
using Microsoft.EntityFrameworkCore;
43
using Common.Logging;
54
using Definitions;
65
using Definitions.Database;
6+
using Definitions.ObjectModels.Types;
77
using Definitions.SourceData;
8+
using Index;
9+
using Microsoft.EntityFrameworkCore;
810
using System.Text.Json;
911
using System.Text.Json.Serialization;
10-
using Index;
11-
using Definitions.ObjectModels.Types;
1212
using var db = Seed();
1313

1414
Console.WriteLine("done");

‎Definitions/Database/Base/DbSubObject.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
using Microsoft.EntityFrameworkCore;
21
using Definitions.DTO.Mappers;
32
using Definitions.ObjectModels;
4-
using Definitions.ObjectModels.Types;
53
using Definitions.ObjectModels.Objects.Airport;
6-
using Definitions.ObjectModels.Objects.Wall;
7-
using Definitions.ObjectModels.Objects.Water;
8-
using Definitions.ObjectModels.Objects.Vehicle;
9-
using Definitions.ObjectModels.Objects.Tunnel;
10-
using Definitions.ObjectModels.Objects.Tree;
11-
using Definitions.ObjectModels.Objects.TrackStation;
12-
using Definitions.ObjectModels.Objects.TrackSignal;
13-
using Definitions.ObjectModels.Objects.Track;
14-
using Definitions.ObjectModels.Objects.TrackExtra;
15-
using Definitions.ObjectModels.Objects.Streetlight;
16-
using Definitions.ObjectModels.Objects.Steam;
17-
using Definitions.ObjectModels.Objects.Sound;
18-
using Definitions.ObjectModels.Objects.Snow;
19-
using Definitions.ObjectModels.Objects.ScenarioText;
20-
using Definitions.ObjectModels.Objects.Scaffolding;
21-
using Definitions.ObjectModels.Objects.Road;
22-
using Definitions.ObjectModels.Objects.RoadStation;
23-
using Definitions.ObjectModels.Objects.RoadExtra;
24-
using Definitions.ObjectModels.Objects.LevelCrossing;
25-
using Definitions.ObjectModels.Objects.Land;
26-
using Definitions.ObjectModels.Objects.InterfaceSkin;
27-
using Definitions.ObjectModels.Objects.Industry;
28-
using Definitions.ObjectModels.Objects.HillShape;
29-
using Definitions.ObjectModels.Objects.Dock;
30-
using Definitions.ObjectModels.Objects.Currency;
31-
using Definitions.ObjectModels.Objects.Competitor;
32-
using Definitions.ObjectModels.Objects.Climate;
33-
using Definitions.ObjectModels.Objects.CliffEdge;
34-
using Definitions.ObjectModels.Objects.Cargo;
35-
using Definitions.ObjectModels.Objects.Building;
364
using Definitions.ObjectModels.Objects.Bridge;
5+
using Definitions.ObjectModels.Objects.Building;
6+
using Definitions.ObjectModels.Objects.Cargo;
7+
using Definitions.ObjectModels.Objects.CliffEdge;
8+
using Definitions.ObjectModels.Objects.Climate;
9+
using Definitions.ObjectModels.Objects.Competitor;
10+
using Definitions.ObjectModels.Objects.Currency;
11+
using Definitions.ObjectModels.Objects.Dock;
12+
using Definitions.ObjectModels.Objects.HillShape;
13+
using Definitions.ObjectModels.Objects.Industry;
14+
using Definitions.ObjectModels.Objects.InterfaceSkin;
15+
using Definitions.ObjectModels.Objects.Land;
16+
using Definitions.ObjectModels.Objects.LevelCrossing;
3717
using Definitions.ObjectModels.Objects.Region;
18+
using Definitions.ObjectModels.Objects.Road;
19+
using Definitions.ObjectModels.Objects.RoadExtra;
20+
using Definitions.ObjectModels.Objects.RoadStation;
21+
using Definitions.ObjectModels.Objects.Scaffolding;
22+
using Definitions.ObjectModels.Objects.ScenarioText;
23+
using Definitions.ObjectModels.Objects.Snow;
24+
using Definitions.ObjectModels.Objects.Sound;
25+
using Definitions.ObjectModels.Objects.Steam;
26+
using Definitions.ObjectModels.Objects.Streetlight;
3827
using Definitions.ObjectModels.Objects.TownNames;
28+
using Definitions.ObjectModels.Objects.Track;
29+
using Definitions.ObjectModels.Objects.TrackExtra;
30+
using Definitions.ObjectModels.Objects.TrackSignal;
31+
using Definitions.ObjectModels.Objects.TrackStation;
32+
using Definitions.ObjectModels.Objects.Tree;
33+
using Definitions.ObjectModels.Objects.Tunnel;
34+
using Definitions.ObjectModels.Objects.Vehicle;
35+
using Definitions.ObjectModels.Objects.Wall;
36+
using Definitions.ObjectModels.Objects.Water;
37+
using Definitions.ObjectModels.Types;
38+
using Microsoft.EntityFrameworkCore;
3939

4040
namespace Definitions.Database;
4141

‎Definitions/Migrations/20250112060337_InitialCreate.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Definitions/Migrations/20250602004808_AddObjectLookup.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Definitions/Migrations/20250602004808_AddObjectLookup.cs‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,62 +10,62 @@ public partial class AddObjectLookup : Migration
1010
/// <inheritdoc />
1111
protected override void Up(MigrationBuilder migrationBuilder)
1212
{
13-
migrationBuilder.DropColumn(
14-
name: "Availability",
15-
table: "Objects");
13+
_ = migrationBuilder.DropColumn(
14+
name: "Availability",
15+
table: "Objects");
1616

17-
migrationBuilder.CreateTable(
18-
name: "ObjectDatLookups",
19-
columns: table => new
20-
{
21-
Id = table.Column<int>(type: "INTEGER", nullable: false)
22-
.Annotation("Sqlite:Autoincrement", true),
23-
DatName = table.Column<string>(type: "TEXT", nullable: false),
24-
DatChecksum = table.Column<uint>(type: "INTEGER", nullable: false),
25-
xxHash3 = table.Column<long>(type: "INTEGER", nullable: false),
26-
ObjectId = table.Column<int>(type: "INTEGER", nullable: false)
27-
},
28-
constraints: table =>
29-
{
30-
table.PrimaryKey("PK_ObjectDatLookups", x => x.Id);
31-
table.ForeignKey(
32-
name: "FK_ObjectDatLookups_Objects_ObjectId",
33-
column: x => x.ObjectId,
34-
principalTable: "Objects",
35-
principalColumn: "Id",
36-
onDelete: ReferentialAction.Cascade);
37-
});
17+
_ = migrationBuilder.CreateTable(
18+
name: "ObjectDatLookups",
19+
columns: table => new
20+
{
21+
Id = table.Column<int>(type: "INTEGER", nullable: false)
22+
.Annotation("Sqlite:Autoincrement", true),
23+
DatName = table.Column<string>(type: "TEXT", nullable: false),
24+
DatChecksum = table.Column<uint>(type: "INTEGER", nullable: false),
25+
xxHash3 = table.Column<long>(type: "INTEGER", nullable: false),
26+
ObjectId = table.Column<int>(type: "INTEGER", nullable: false)
27+
},
28+
constraints: table =>
29+
{
30+
_ = table.PrimaryKey("PK_ObjectDatLookups", x => x.Id);
31+
_ = table.ForeignKey(
32+
name: "FK_ObjectDatLookups_Objects_ObjectId",
33+
column: x => x.ObjectId,
34+
principalTable: "Objects",
35+
principalColumn: "Id",
36+
onDelete: ReferentialAction.Cascade);
37+
});
3838

39-
migrationBuilder.CreateIndex(
40-
name: "IX_ObjectDatLookups_DatName_DatChecksum",
41-
table: "ObjectDatLookups",
42-
columns: new[] { "DatName", "DatChecksum" },
43-
unique: true,
44-
descending: new[] { true, false });
39+
_ = migrationBuilder.CreateIndex(
40+
name: "IX_ObjectDatLookups_DatName_DatChecksum",
41+
table: "ObjectDatLookups",
42+
columns: new[] { "DatName", "DatChecksum" },
43+
unique: true,
44+
descending: new[] { true, false });
4545

46-
migrationBuilder.CreateIndex(
47-
name: "IX_ObjectDatLookups_ObjectId",
48-
table: "ObjectDatLookups",
49-
column: "ObjectId");
46+
_ = migrationBuilder.CreateIndex(
47+
name: "IX_ObjectDatLookups_ObjectId",
48+
table: "ObjectDatLookups",
49+
column: "ObjectId");
5050

51-
migrationBuilder.CreateIndex(
52-
name: "IX_ObjectDatLookups_xxHash3",
53-
table: "ObjectDatLookups",
54-
column: "xxHash3",
55-
unique: true);
51+
_ = migrationBuilder.CreateIndex(
52+
name: "IX_ObjectDatLookups_xxHash3",
53+
table: "ObjectDatLookups",
54+
column: "xxHash3",
55+
unique: true);
5656
}
5757

5858
/// <inheritdoc />
5959
protected override void Down(MigrationBuilder migrationBuilder)
6060
{
61-
migrationBuilder.DropTable(
62-
name: "ObjectDatLookups");
61+
_ = migrationBuilder.DropTable(
62+
name: "ObjectDatLookups");
6363

64-
migrationBuilder.AddColumn<int>(
65-
name: "Availability",
66-
table: "Objects",
67-
type: "INTEGER",
68-
nullable: false,
69-
defaultValue: 0);
64+
_ = migrationBuilder.AddColumn<int>(
65+
name: "Availability",
66+
table: "Objects",
67+
type: "INTEGER",
68+
nullable: false,
69+
defaultValue: 0);
7070
}
7171
}

‎Definitions/Migrations/20250603100806_AddStringTable.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Definitions/Migrations/20250603102909_StringTableRowName.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)