Skip to content

Commit 1a0eef1

Browse files
pandinocoderpandinocoder
committed
chore: rename variable descriptor types
chore: generate no-op migrations for renaming the descriptor types
1 parent daa0355 commit 1a0eef1

Some content is hidden

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

43 files changed

+3989
-440
lines changed

‎Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public enum GameObjectType
4848
[GameObjectInfo(typeof(EventBase), "events")]
4949
Event,
5050

51-
[GameObjectInfo(typeof(PlayerVariableBase), "player_variables")]
51+
[GameObjectInfo(typeof(PlayerVariableDescriptor), "player_variables")]
5252
PlayerVariable,
5353

54-
[GameObjectInfo(typeof(ServerVariableBase), "server_variables")]
54+
[GameObjectInfo(typeof(ServerVariableDescriptor), "server_variables")]
5555
ServerVariable,
5656

5757
[GameObjectInfo(typeof(TilesetBase), "tilesets")]
@@ -60,9 +60,9 @@ public enum GameObjectType
6060
[GameObjectInfo(typeof(TimeBase), "")]
6161
Time,
6262

63-
[GameObjectInfo(typeof(GuildVariableBase), "guild_variables")]
63+
[GameObjectInfo(typeof(GuildVariableDescriptor), "guild_variables")]
6464
GuildVariable,
6565

66-
[GameObjectInfo(typeof(UserVariableBase), "user_variables")]
66+
[GameObjectInfo(typeof(UserVariableDescriptor), "user_variables")]
6767
UserVariable,
6868
}

‎Framework/Intersect.Framework.Core/Descriptors/GameObjectTypeExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static string[] Names(this GameObjectType gameObjectType, VariableDataTyp
129129
return gameObjectType
130130
.GetLookup()
131131
.OrderBy(p => p.Value?.Name)
132-
.Select(pair => pair.Value?.Name ?? PlayerVariableBase.Deleted)
132+
.Select(pair => pair.Value?.Name ?? PlayerVariableDescriptor.Deleted)
133133
.ToArray();
134134
}
135135

@@ -139,7 +139,7 @@ public static string[] Names(this GameObjectType gameObjectType, VariableDataTyp
139139
.OfType<IVariableDescriptor>()
140140
.Where(descriptor => dataTypeFilter == default || descriptor.DataType == dataTypeFilter)
141141
.OrderBy(descriptor => descriptor.Name)
142-
.Select(descriptor => descriptor.Name ?? PlayerVariableBase.Deleted)
142+
.Select(descriptor => descriptor.Name ?? PlayerVariableDescriptor.Deleted)
143143
.ToArray();
144144
}
145145
}

Framework/Intersect.Framework.Core/GameObjects/Variables/GuildVariableBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Variables/GuildVariableDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace Intersect.Framework.Core.GameObjects.Variables;
44

5-
public partial class GuildVariableBase : VariableDescriptor<GuildVariableBase>, IVariableDescriptor
5+
public partial class GuildVariableDescriptor : VariableDescriptor<GuildVariableDescriptor>, IVariableDescriptor
66
{
77
[JsonConstructor]
8-
public GuildVariableBase(Guid id) : base(id)
8+
public GuildVariableDescriptor(Guid id) : base(id)
99
{
1010
Name = "New Guild Variable";
1111
}
1212

13-
public GuildVariableBase()
13+
public GuildVariableDescriptor()
1414
{
1515
Name = "New Guild Variable";
1616
}

Framework/Intersect.Framework.Core/GameObjects/Variables/PlayerVariableBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Variables/PlayerVariableDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace Intersect.Framework.Core.GameObjects.Variables;
44

5-
public partial class PlayerVariableBase : VariableDescriptor<PlayerVariableBase>, IVariableDescriptor
5+
public partial class PlayerVariableDescriptor : VariableDescriptor<PlayerVariableDescriptor>, IVariableDescriptor
66
{
77
[JsonConstructor]
8-
public PlayerVariableBase(Guid id) : base(id)
8+
public PlayerVariableDescriptor(Guid id) : base(id)
99
{
1010
Name = "New Player Variable";
1111
}
1212

13-
public PlayerVariableBase()
13+
public PlayerVariableDescriptor()
1414
{
1515
Name = "New Player Variable";
1616
}

Framework/Intersect.Framework.Core/GameObjects/Variables/ServerVariableBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Variables/ServerVariableDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
namespace Intersect.Framework.Core.GameObjects.Variables;
55

6-
public partial class ServerVariableBase : VariableDescriptor<ServerVariableBase>, IVariableDescriptor
6+
public partial class ServerVariableDescriptor : VariableDescriptor<ServerVariableDescriptor>, IVariableDescriptor
77
{
88
[JsonConstructor]
9-
public ServerVariableBase(Guid id) : base(id)
9+
public ServerVariableDescriptor(Guid id) : base(id)
1010
{
1111
Name = "New Global Variable";
1212
}
1313

14-
public ServerVariableBase()
14+
public ServerVariableDescriptor()
1515
{
1616
Name = "New Global Variable";
1717
}

Framework/Intersect.Framework.Core/GameObjects/Variables/UserVariableBase.cs renamed to Framework/Intersect.Framework.Core/GameObjects/Variables/UserVariableDescriptor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace Intersect.Framework.Core.GameObjects.Variables;
44

5-
public partial class UserVariableBase : VariableDescriptor<UserVariableBase>, IVariableDescriptor
5+
public partial class UserVariableDescriptor : VariableDescriptor<UserVariableDescriptor>, IVariableDescriptor
66
{
77
[JsonConstructor]
8-
public UserVariableBase(Guid id) : base(id)
8+
public UserVariableDescriptor(Guid id) : base(id)
99
{
1010
Name = "New User Variable";
1111
}
1212

13-
public UserVariableBase()
13+
public UserVariableDescriptor()
1414
{
1515
Name = "New User Variable";
1616
}

0 commit comments

Comments
 (0)