rename CraftingTableBase -> CraftingTableDescriptor

pandinocoder · pandinocoder · commit 7ec3149f4d25 · 2025-02-27T11:40:44.000-05:00
diff --git a/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs b/Framework/Intersect.Framework.Core/Descriptors/GameObjectType.cs
@@ -36,7 +36,7 @@ public enum GameObjectType
     [GameObjectInfo(typeof(SpellBase), "spells")]
     Spell,
 
-    [GameObjectInfo(typeof(CraftingTableBase), "crafting_tables")]
+    [GameObjectInfo(typeof(CraftingTableDescriptor), "crafting_tables")]
     CraftTables,
 
     [GameObjectInfo(typeof(CraftingRecipeDescriptor), "crafts")]
diff --git a/Framework/Intersect.Framework.Core/GameObjects/Crafting/CraftingTableDescriptor.cs b/Framework/Intersect.Framework.Core/GameObjects/Crafting/CraftingTableDescriptor.cs
@@ -4,19 +4,19 @@
 
 namespace Intersect.Framework.Core.GameObjects.Crafting;
 
-public partial class CraftingTableBase : DatabaseObject<CraftingTableBase>, IFolderable
+public partial class CraftingTableDescriptor : DatabaseObject<CraftingTableDescriptor>, IFolderable
 {
     [NotMapped]
     public DbList<CraftingRecipeDescriptor> Crafts { get; set; } = [];
 
     [JsonConstructor]
-    public CraftingTableBase(Guid id) : base(id)
+    public CraftingTableDescriptor(Guid id) : base(id)
     {
         Name = "New Table";
     }
 
     //Parameterless constructor for EF
-    public CraftingTableBase()
+    public CraftingTableDescriptor()
     {
         Name = "New Table";
     }
diff --git a/Intersect.Client.Core/General/Globals.cs b/Intersect.Client.Core/General/Globals.cs
@@ -100,7 +100,7 @@ public static partial class Globals
     //Scene management
 
     //Only need 1 table, and that is the one we see at a given moment in time.
-    public static CraftingTableBase? ActiveCraftingTable { get; set; }
+    public static CraftingTableDescriptor? ActiveCraftingTable { get; set; }
 
     public static int AnimationFrame { get; set; }
 
diff --git a/Intersect.Client.Core/Networking/PacketHandler.cs b/Intersect.Client.Core/Networking/PacketHandler.cs
@@ -1725,7 +1725,7 @@ public void HandlePacket(IPacketSender packetSender, CraftingTablePacket packet)
     {
         if (!packet.Close)
         {
-            Globals.ActiveCraftingTable = new CraftingTableBase();
+            Globals.ActiveCraftingTable = new CraftingTableDescriptor();
             Globals.ActiveCraftingTable.Load(packet.TableData);
             Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenCraftingTable(packet.JournalMode));
         }
diff --git a/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs b/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs
@@ -1220,8 +1220,8 @@ private static string GetCommandText(OpenShopCommand command, MapInstance map)
     private static string GetCommandText(OpenCraftingTableCommand command, MapInstance map)
     {
         return command.JournalMode ?
-            Strings.EventCommandList.OpenCraftingJournal.ToString(CraftingTableBase.GetName(command.CraftingTableId)) :
-            Strings.EventCommandList.opencrafting.ToString(CraftingTableBase.GetName(command.CraftingTableId));
+            Strings.EventCommandList.OpenCraftingJournal.ToString(CraftingTableDescriptor.GetName(command.CraftingTableId)) :
+            Strings.EventCommandList.opencrafting.ToString(CraftingTableDescriptor.GetName(command.CraftingTableId));
     }
 
     private static string GetCommandText(SetClassCommand command, MapInstance map)
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.cs
@@ -20,8 +20,8 @@ public EventCommandOpenCraftingTable(OpenCraftingTableCommand refCommand, FrmEve
         mEventEditor = editor;
         InitLocalization();
         cmbTable.Items.Clear();
-        cmbTable.Items.AddRange(CraftingTableBase.Names);
-        cmbTable.SelectedIndex = CraftingTableBase.ListIndex(mMyCommand.CraftingTableId);
+        cmbTable.Items.AddRange(CraftingTableDescriptor.Names);
+        cmbTable.SelectedIndex = CraftingTableDescriptor.ListIndex(mMyCommand.CraftingTableId);
         chkJournalMode.Checked = mMyCommand.JournalMode;
     }
 
@@ -47,7 +47,7 @@ private void btnSave_Click(object sender, EventArgs e)
     {
         if (cmbTable.SelectedIndex > -1)
         {
-            mMyCommand.CraftingTableId = CraftingTableBase.IdFromList(cmbTable.SelectedIndex);
+            mMyCommand.CraftingTableId = CraftingTableDescriptor.IdFromList(cmbTable.SelectedIndex);
         }
 
         mMyCommand.JournalMode = chkJournalMode.Checked;
diff --git a/Intersect.Editor/Forms/Editors/frmCraftingTables.cs b/Intersect.Editor/Forms/Editors/frmCraftingTables.cs
@@ -14,11 +14,11 @@ namespace Intersect.Editor.Forms.Editors;
 public partial class FrmCraftingTables : EditorForm
 {
 
-    private List<CraftingTableBase> mChanged = new List<CraftingTableBase>();
+    private List<CraftingTableDescriptor> mChanged = new List<CraftingTableDescriptor>();
 
     private string mCopiedItem;
 
-    private CraftingTableBase mEditorItem;
+    private CraftingTableDescriptor mEditorItem;
 
     private List<string> mKnownFolders = new List<string>();
 
@@ -32,7 +32,7 @@ public FrmCraftingTables()
     }
     private void AssignEditorItem(Guid id)
     {
-        mEditorItem = CraftingTableBase.Get(id);
+        mEditorItem = CraftingTableDescriptor.Get(id);
         UpdateEditor();
     }
 
@@ -41,7 +41,7 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)
         if (type == GameObjectType.CraftTables)
         {
             InitEditor();
-            if (mEditorItem != null && !DatabaseObject<CraftingTableBase>.Lookup.Values.Contains(mEditorItem))
+            if (mEditorItem != null && !DatabaseObject<CraftingTableDescriptor>.Lookup.Values.Contains(mEditorItem))
             {
                 mEditorItem = null;
                 UpdateEditor();
@@ -283,15 +283,15 @@ public void InitEditor()
     {
         //Collect folders
         var mFolders = new List<string>();
-        foreach (var itm in CraftingTableBase.Lookup)
+        foreach (var itm in CraftingTableDescriptor.Lookup)
         {
-            if (!string.IsNullOrEmpty(((CraftingTableBase) itm.Value).Folder) &&
-                !mFolders.Contains(((CraftingTableBase) itm.Value).Folder))
+            if (!string.IsNullOrEmpty(((CraftingTableDescriptor) itm.Value).Folder) &&
+                !mFolders.Contains(((CraftingTableDescriptor) itm.Value).Folder))
             {
-                mFolders.Add(((CraftingTableBase) itm.Value).Folder);
-                if (!mKnownFolders.Contains(((CraftingTableBase) itm.Value).Folder))
+                mFolders.Add(((CraftingTableDescriptor) itm.Value).Folder);
+                if (!mKnownFolders.Contains(((CraftingTableDescriptor) itm.Value).Folder))
                 {
-                    mKnownFolders.Add(((CraftingTableBase) itm.Value).Folder);
+                    mKnownFolders.Add(((CraftingTableDescriptor) itm.Value).Folder);
                 }
             }
         }
@@ -302,8 +302,8 @@ public void InitEditor()
         cmbFolder.Items.Add("");
         cmbFolder.Items.AddRange(mKnownFolders.ToArray());
 
-        var items = CraftingTableBase.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
-            new KeyValuePair<string, string>(((CraftingTableBase)pair.Value)?.Name ?? Models.DatabaseObject<CraftingTableBase>.Deleted, ((CraftingTableBase)pair.Value)?.Folder ?? ""))).ToArray();
+        var items = CraftingTableDescriptor.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,
+            new KeyValuePair<string, string>(((CraftingTableDescriptor)pair.Value)?.Name ?? Models.DatabaseObject<CraftingTableDescriptor>.Deleted, ((CraftingTableDescriptor)pair.Value)?.Folder ?? ""))).ToArray();
         lstGameObjects.Repopulate(items, mFolders, btnAlphabetical.Checked, CustomSearch(), txtSearch.Text);
     }
 
diff --git a/Intersect.Editor/Networking/PacketHandler.cs b/Intersect.Editor/Networking/PacketHandler.cs
@@ -606,14 +606,14 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)
             case GameObjectType.CraftTables:
                 if (deleted)
                 {
-                    var cft = CraftingTableBase.Get(id);
+                    var cft = CraftingTableDescriptor.Get(id);
                     cft.Delete();
                 }
                 else
                 {
-                    var cft = new CraftingTableBase(id);
+                    var cft = new CraftingTableDescriptor(id);
                     cft.Load(json);
-                    CraftingTableBase.Lookup.Set(id, cft);
+                    CraftingTableDescriptor.Lookup.Set(id, cft);
                 }
 
                 break;
diff --git a/Intersect.Server.Core/Database/DbInterface.cs b/Intersect.Server.Core/Database/DbInterface.cs
@@ -674,7 +674,7 @@ private static void ClearGameObjects(GameObjectType type)
 
                 break;
             case GameObjectType.CraftTables:
-                CraftingTableBase.Lookup.Clear();
+                CraftingTableDescriptor.Lookup.Clear();
 
                 break;
             case GameObjectType.Crafts:
@@ -795,7 +795,7 @@ private static void LoadGameObjects(GameObjectType gameObjectType)
                     case GameObjectType.CraftTables:
                         foreach (var craft in context.CraftingTables)
                         {
-                            CraftingTableBase.Lookup.Set(craft.Id, craft);
+                            CraftingTableDescriptor.Lookup.Set(craft.Id, craft);
                         }
 
                         break;
@@ -1026,7 +1026,7 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, Guid
 
                 break;
             case GameObjectType.CraftTables:
-                dbObj = new CraftingTableBase(predefinedid);
+                dbObj = new CraftingTableDescriptor(predefinedid);
 
                 break;
             case GameObjectType.Crafts:
@@ -1144,8 +1144,8 @@ public static IDatabaseObject AddGameObject(GameObjectType gameObjectType, IData
                         break;
 
                     case GameObjectType.CraftTables:
-                        context.CraftingTables.Add((CraftingTableBase)dbObj);
-                        CraftingTableBase.Lookup.Set(dbObj.Id, dbObj);
+                        context.CraftingTables.Add((CraftingTableDescriptor)dbObj);
+                        CraftingTableDescriptor.Lookup.Set(dbObj.Id, dbObj);
 
                         break;
 
@@ -1292,7 +1292,7 @@ public static void DeleteGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.CraftTables:
-                        context.CraftingTables.Remove((CraftingTableBase)gameObject);
+                        context.CraftingTables.Remove((CraftingTableDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Crafts:
@@ -1457,7 +1457,7 @@ public static void SaveGameObject(IDatabaseObject gameObject)
 
                         break;
                     case GameObjectType.CraftTables:
-                        context.CraftingTables.Update((CraftingTableBase)gameObject);
+                        context.CraftingTables.Update((CraftingTableDescriptor)gameObject);
 
                         break;
                     case GameObjectType.Crafts:
diff --git a/Intersect.Server.Core/Database/GameData/GameContext.cs b/Intersect.Server.Core/Database/GameData/GameContext.cs
@@ -24,7 +24,7 @@ protected GameContext(DatabaseContextOptions databaseContextOptions) : base(data
     //Crafting
     public DbSet<CraftingRecipeDescriptor> Crafts { get; set; }
 
-    public DbSet<CraftingTableBase> CraftingTables { get; set; }
+    public DbSet<CraftingTableDescriptor> CraftingTables { get; set; }
 
     //Classes
     public DbSet<ClassDescriptor> Classes { get; set; }
diff --git a/Intersect.Server.Core/Database/GameData/IGameContext.cs b/Intersect.Server.Core/Database/GameData/IGameContext.cs
@@ -14,7 +14,7 @@ public interface IGameContext : IDbContext
 
     DbSet<CraftingRecipeDescriptor> Crafts { get; set; }
 
-    DbSet<CraftingTableBase> CraftingTables { get; set; }
+    DbSet<CraftingTableDescriptor> CraftingTables { get; set; }
 
     DbSet<ClassDescriptor> Classes { get; set; }
 
diff --git a/Intersect.Server.Core/Entities/Events/CommandProcessing.cs b/Intersect.Server.Core/Entities/Events/CommandProcessing.cs
@@ -1264,7 +1264,7 @@ private static void ProcessCommand(
         Stack<CommandInstance> callStack
     )
     {
-        player.OpenCraftingTable(CraftingTableBase.Get(command.CraftingTableId), command.JournalMode);
+        player.OpenCraftingTable(CraftingTableDescriptor.Get(command.CraftingTableId), command.JournalMode);
         callStack.Peek().WaitingForResponse = CommandInstance.EventResponse.Crafting;
     }
 
diff --git a/Intersect.Server.Core/Entities/Player.cs b/Intersect.Server.Core/Entities/Player.cs
@@ -727,7 +727,7 @@ public override void Update(long timeMs)
                     }
                 }
 
-                if (CraftingTableBase.TryGet(OpenCraftingTableId, out var b) && CraftingState?.Id != default)
+                if (CraftingTableDescriptor.TryGet(OpenCraftingTableId, out var b) && CraftingState?.Id != default)
                 {
                     if (CraftingState != default && b.Crafts.Contains(CraftingState.Id))
                     {
@@ -4169,7 +4169,7 @@ public void BuyItem(int slot, int amount)
     }
 
     //Crafting
-    public bool OpenCraftingTable(CraftingTableBase table, bool journalMode)
+    public bool OpenCraftingTable(CraftingTableDescriptor table, bool journalMode)
     {
         if (IsBusy())
         {
@@ -4340,7 +4340,7 @@ public bool ShouldCancelCrafting()
             return true;
         }
 
-        if (!CraftingTableBase.TryGet(OpenCraftingTableId, out var table))
+        if (!CraftingTableDescriptor.TryGet(OpenCraftingTableId, out var table))
         {
             return true;
         }
diff --git a/Intersect.Server.Core/Networking/PacketSender.cs b/Intersect.Server.Core/Networking/PacketSender.cs
@@ -1695,12 +1695,12 @@ public static void SendCloseShop(Player player)
     }
 
     //CraftingTablePacket
-    public static void SendOpenCraftingTable(Player player, CraftingTableBase table, bool journalMode)
+    public static void SendOpenCraftingTable(Player player, CraftingTableDescriptor table, bool journalMode)
     {
         if (table != null)
         {
             //Use Json To Cheaply Clone The Table
-            var playerTable = JsonConvert.DeserializeObject<CraftingTableBase>(table.JsonData);
+            var playerTable = JsonConvert.DeserializeObject<CraftingTableDescriptor>(table.JsonData);
 
             //Strip our the items the player can't craft
             foreach (var craft in table.Crafts)
@@ -1792,7 +1792,7 @@ public static void SendGameObjects(Client client, GameObjectType type, List<Game
 
                 break;
             case GameObjectType.CraftTables:
-                foreach (var obj in CraftingTableBase.Lookup)
+                foreach (var obj in CraftingTableDescriptor.Lookup)
                 {
                     SendGameObject(client, obj.Value, false, false, packetList);
                 }
diff --git a/Intersect.Server/Networking/NetworkedPacketHandler.cs b/Intersect.Server/Networking/NetworkedPacketHandler.cs
@@ -916,7 +916,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.DeleteGameObjectP
                     break;
 
                 case GameObjectType.CraftTables:
-                    obj = DatabaseObject<CraftingTableBase>.Lookup.Get(id);
+                    obj = DatabaseObject<CraftingTableDescriptor>.Lookup.Get(id);
 
                     break;
 
@@ -1048,7 +1048,7 @@ public void HandlePacket(Client client, Network.Packets.Editor.SaveGameObjectPac
                     break;
 
                 case GameObjectType.CraftTables:
-                    obj = DatabaseObject<CraftingTableBase>.Lookup.Get(id);
+                    obj = DatabaseObject<CraftingTableDescriptor>.Lookup.Get(id);
 
                     break;
 

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,19 @@`
`4`	`4`
`5`	`5`	`namespace Intersect.Framework.Core.GameObjects.Crafting;`
`6`	`6`
`7`		`-public partial class CraftingTableBase : DatabaseObject<CraftingTableBase>, IFolderable`
	`7`	`+public partial class CraftingTableDescriptor : DatabaseObject<CraftingTableDescriptor>, IFolderable`
`8`	`8`	`{`
`9`	`9`	`[NotMapped]`
`10`	`10`	`public DbList<CraftingRecipeDescriptor> Crafts { get; set; } = [];`
`11`	`11`
`12`	`12`	`[JsonConstructor]`
`13`		`- public CraftingTableBase(Guid id) : base(id)`
	`13`	`+ public CraftingTableDescriptor(Guid id) : base(id)`
`14`	`14`	`{`
`15`	`15`	`Name = "New Table";`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`//Parameterless constructor for EF`
`19`		`- public CraftingTableBase()`
	`19`	`+ public CraftingTableDescriptor()`
`20`	`20`	`{`
`21`	`21`	`Name = "New Table";`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1725,7 +1725,7 @@ public void HandlePacket(IPacketSender packetSender, CraftingTablePacket packet)`
`1725`	`1725`	`{`
`1726`	`1726`	`if (!packet.Close)`
`1727`	`1727`	`{`
`1728`		`- Globals.ActiveCraftingTable = new CraftingTableBase();`
	`1728`	`+ Globals.ActiveCraftingTable = new CraftingTableDescriptor();`
`1729`	`1729`	`Globals.ActiveCraftingTable.Load(packet.TableData);`
`1730`	`1730`	`Interface.Interface.EnqueueInGame(gameInterface => gameInterface.NotifyOpenCraftingTable(packet.JournalMode));`
`1731`	`1731`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1220,8 +1220,8 @@ private static string GetCommandText(OpenShopCommand command, MapInstance map)`
`1220`	`1220`	`private static string GetCommandText(OpenCraftingTableCommand command, MapInstance map)`
`1221`	`1221`	`{`
`1222`	`1222`	`return command.JournalMode ?`
`1223`		`- Strings.EventCommandList.OpenCraftingJournal.ToString(CraftingTableBase.GetName(command.CraftingTableId)) :`
`1224`		`- Strings.EventCommandList.opencrafting.ToString(CraftingTableBase.GetName(command.CraftingTableId));`
	`1223`	`+ Strings.EventCommandList.OpenCraftingJournal.ToString(CraftingTableDescriptor.GetName(command.CraftingTableId)) :`
	`1224`	`+ Strings.EventCommandList.opencrafting.ToString(CraftingTableDescriptor.GetName(command.CraftingTableId));`
`1225`	`1225`	`}`
`1226`	`1226`
`1227`	`1227`	`private static string GetCommandText(SetClassCommand command, MapInstance map)`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public EventCommandOpenCraftingTable(OpenCraftingTableCommand refCommand, FrmEve`
`20`	`20`	`mEventEditor = editor;`
`21`	`21`	`InitLocalization();`
`22`	`22`	`cmbTable.Items.Clear();`
`23`		`- cmbTable.Items.AddRange(CraftingTableBase.Names);`
`24`		`- cmbTable.SelectedIndex = CraftingTableBase.ListIndex(mMyCommand.CraftingTableId);`
	`23`	`+ cmbTable.Items.AddRange(CraftingTableDescriptor.Names);`
	`24`	`+ cmbTable.SelectedIndex = CraftingTableDescriptor.ListIndex(mMyCommand.CraftingTableId);`
`25`	`25`	`chkJournalMode.Checked = mMyCommand.JournalMode;`
`26`	`26`	`}`
`27`	`27`
`@@ -47,7 +47,7 @@ private void btnSave_Click(object sender, EventArgs e)`
`47`	`47`	`{`
`48`	`48`	`if (cmbTable.SelectedIndex > -1)`
`49`	`49`	`{`
`50`		`- mMyCommand.CraftingTableId = CraftingTableBase.IdFromList(cmbTable.SelectedIndex);`
	`50`	`+ mMyCommand.CraftingTableId = CraftingTableDescriptor.IdFromList(cmbTable.SelectedIndex);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`mMyCommand.JournalMode = chkJournalMode.Checked;`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ namespace Intersect.Editor.Forms.Editors;`
`14`	`14`	`public partial class FrmCraftingTables : EditorForm`
`15`	`15`	`{`
`16`	`16`
`17`		`- private List<CraftingTableBase> mChanged = new List<CraftingTableBase>();`
	`17`	`+ private List<CraftingTableDescriptor> mChanged = new List<CraftingTableDescriptor>();`
`18`	`18`
`19`	`19`	`private string mCopiedItem;`
`20`	`20`
`21`		`- private CraftingTableBase mEditorItem;`
	`21`	`+ private CraftingTableDescriptor mEditorItem;`
`22`	`22`
`23`	`23`	`private List<string> mKnownFolders = new List<string>();`
`24`	`24`
`@@ -32,7 +32,7 @@ public FrmCraftingTables()`
`32`	`32`	`}`
`33`	`33`	`private void AssignEditorItem(Guid id)`
`34`	`34`	`{`
`35`		`- mEditorItem = CraftingTableBase.Get(id);`
	`35`	`+ mEditorItem = CraftingTableDescriptor.Get(id);`
`36`	`36`	`UpdateEditor();`
`37`	`37`	`}`
`38`	`38`
`@@ -41,7 +41,7 @@ protected override void GameObjectUpdatedDelegate(GameObjectType type)`
`41`	`41`	`if (type == GameObjectType.CraftTables)`
`42`	`42`	`{`
`43`	`43`	`InitEditor();`
`44`		`- if (mEditorItem != null && !DatabaseObject<CraftingTableBase>.Lookup.Values.Contains(mEditorItem))`
	`44`	`+ if (mEditorItem != null && !DatabaseObject<CraftingTableDescriptor>.Lookup.Values.Contains(mEditorItem))`
`45`	`45`	`{`
`46`	`46`	`mEditorItem = null;`
`47`	`47`	`UpdateEditor();`
`@@ -283,15 +283,15 @@ public void InitEditor()`
`283`	`283`	`{`
`284`	`284`	`//Collect folders`
`285`	`285`	`var mFolders = new List<string>();`
`286`		`- foreach (var itm in CraftingTableBase.Lookup)`
	`286`	`+ foreach (var itm in CraftingTableDescriptor.Lookup)`
`287`	`287`	`{`
`288`		`- if (!string.IsNullOrEmpty(((CraftingTableBase) itm.Value).Folder) &&`
`289`		`- !mFolders.Contains(((CraftingTableBase) itm.Value).Folder))`
	`288`	`+ if (!string.IsNullOrEmpty(((CraftingTableDescriptor) itm.Value).Folder) &&`
	`289`	`+ !mFolders.Contains(((CraftingTableDescriptor) itm.Value).Folder))`
`290`	`290`	`{`
`291`		`- mFolders.Add(((CraftingTableBase) itm.Value).Folder);`
`292`		`- if (!mKnownFolders.Contains(((CraftingTableBase) itm.Value).Folder))`
	`291`	`+ mFolders.Add(((CraftingTableDescriptor) itm.Value).Folder);`
	`292`	`+ if (!mKnownFolders.Contains(((CraftingTableDescriptor) itm.Value).Folder))`
`293`	`293`	`{`
`294`		`- mKnownFolders.Add(((CraftingTableBase) itm.Value).Folder);`
	`294`	`+ mKnownFolders.Add(((CraftingTableDescriptor) itm.Value).Folder);`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`}`
`@@ -302,8 +302,8 @@ public void InitEditor()`
`302`	`302`	`cmbFolder.Items.Add("");`
`303`	`303`	`cmbFolder.Items.AddRange(mKnownFolders.ToArray());`
`304`	`304`
`305`		`- var items = CraftingTableBase.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,`
`306`		`- new KeyValuePair<string, string>(((CraftingTableBase)pair.Value)?.Name ?? Models.DatabaseObject<CraftingTableBase>.Deleted, ((CraftingTableBase)pair.Value)?.Folder ?? ""))).ToArray();`
	`305`	`+ var items = CraftingTableDescriptor.Lookup.OrderBy(p => p.Value?.Name).Select(pair => new KeyValuePair<Guid, KeyValuePair<string, string>>(pair.Key,`
	`306`	`+ new KeyValuePair<string, string>(((CraftingTableDescriptor)pair.Value)?.Name ?? Models.DatabaseObject<CraftingTableDescriptor>.Deleted, ((CraftingTableDescriptor)pair.Value)?.Folder ?? ""))).ToArray();`
`307`	`307`	`lstGameObjects.Repopulate(items, mFolders, btnAlphabetical.Checked, CustomSearch(), txtSearch.Text);`
`308`	`308`	`}`
`309`	`309`
Original file line number	Diff line number	Diff line change
`@@ -606,14 +606,14 @@ public void HandlePacket(IPacketSender packetSender, GameObjectPacket packet)`
`606`	`606`	`case GameObjectType.CraftTables:`
`607`	`607`	`if (deleted)`
`608`	`608`	`{`
`609`		`- var cft = CraftingTableBase.Get(id);`
	`609`	`+ var cft = CraftingTableDescriptor.Get(id);`
`610`	`610`	`cft.Delete();`
`611`	`611`	`}`
`612`	`612`	`else`
`613`	`613`	`{`
`614`		`- var cft = new CraftingTableBase(id);`
	`614`	`+ var cft = new CraftingTableDescriptor(id);`
`615`	`615`	`cft.Load(json);`
`616`		`- CraftingTableBase.Lookup.Set(id, cft);`
	`616`	`+ CraftingTableDescriptor.Lookup.Set(id, cft);`
`617`	`617`	`}`
`618`	`618`
`619`	`619`	`break;`