warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): Fixes type caching & cleanup (#422)

Browse source 
- [X] Fixes some issues with the type caching
- [X] Changes type check default to ignore case
- [X] Splits out type caching of insensitive and sensitive lists. This means less stuff to iterate through when checking a type against the string.
- [X] Adds an ArrayEnumerator, mostly for reference purposes (copy/paste as needed)
This commit is contained in:
Kamron Batman 2021-01-20 00:10:33 -08:00 • committed by GitHub
parent b921c38879
commit e869c105d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 253 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Engines/Bulk Orders/Books/BOBLargeSubEntry.cs
View file

@ -24,7 +24,7 @@ namespace Server.Engines.BulkOrders
if (type != null)
{
ItemType = AssemblyHandler.FindFirstTypeForName(type);
ItemType = AssemblyHandler.FindTypeByFullName(type);
}
AmountCur = reader.ReadEncodedInt();

2
Projects/UOContent/Engines/Bulk Orders/Books/BOBSmallEntry.cs
View file

@ -37,7 +37,7 @@ namespace Server.Engines.BulkOrders
if (type != null)
{
ItemType = AssemblyHandler.FindFirstTypeForName(type);
ItemType = AssemblyHandler.FindTypeByFullName(type);
}
RequireExceptional = reader.ReadBool();

2
Projects/UOContent/Engines/Bulk Orders/LargeBulkEntry.cs
View file

@ -25,7 +25,7 @@ namespace Server.Engines.BulkOrders
if (type != null)
{
realType = AssemblyHandler.FindFirstTypeForName(type);
realType = AssemblyHandler.FindTypeByFullName(type);
}
Details = new SmallBulkEntry(realType, reader.ReadInt(), reader.ReadInt());

2
Projects/UOContent/Engines/Bulk Orders/SmallBOD.cs
View file

@ -219,7 +219,7 @@ namespace Server.Engines.BulkOrders
if (type != null)
{
Type = AssemblyHandler.FindFirstTypeForName(type);
Type = AssemblyHandler.FindTypeByFullName(type);
}
m_Number = reader.ReadInt();

2
Projects/UOContent/Engines/Bulk Orders/SmallBulkEntry.cs
View file

@ -76,7 +76,7 @@ namespace Server.Engines.BulkOrders
if (split.Length >= 2)
{
var type = AssemblyHandler.FindFirstTypeForName(split[0]);
var type = AssemblyHandler.FindTypeByName(split[0]);
var graphic = Utility.ToInt32(split[^1]);
if (type != null && graphic > 0)

2
Projects/UOContent/Engines/Doom/GauntletSpawner.cs
View file

@ -321,7 +321,7 @@ namespace Server.Engines.Doom
return;
}
var type = AssemblyHandler.FindFirstTypeForName(TypeName, true);
var type = AssemblyHandler.FindTypeByName(TypeName);
if (type == null)
{

6
Projects/UOContent/Engines/ML Quests/Items/Teleporters.cs
View file

@ -101,7 +101,7 @@ namespace Server.Engines.MLQuests.Items
if (typeName != null)
{
m_QuestType = AssemblyHandler.FindFirstTypeForName(typeName);
m_QuestType = AssemblyHandler.FindTypeByFullName(typeName);
}
Message = TextDefinition.Deserialize(reader);
@ -195,7 +195,7 @@ namespace Server.Engines.MLQuests.Items
writer.Write(0); // version
writer.Write(m_TicketType != null ? m_TicketType.FullName : null);
writer.Write( m_TicketType?.FullName);
TextDefinition.Serialize(writer, Message);
}
@ -209,7 +209,7 @@ namespace Server.Engines.MLQuests.Items
if (typeName != null)
{
m_TicketType = AssemblyHandler.FindFirstTypeForName(typeName);
m_TicketType = AssemblyHandler.FindTypeByFullName(typeName);
}
Message = TextDefinition.Deserialize(reader);

10
Projects/UOContent/Engines/ML Quests/MLQuestSystem.cs
View file

@ -51,7 +51,7 @@ namespace Server.Engines.MLQuests
var split = line.Split('\t');
var type = AssemblyHandler.FindFirstTypeForName(split[0]);
var type = AssemblyHandler.FindTypeByName(split[0]);
if (type == null || !baseQuestType.IsAssignableFrom(type))
{
@ -87,7 +87,7 @@ namespace Server.Engines.MLQuests
for (var i = 1; i < split.Length; ++i)
{
var questerType = AssemblyHandler.FindFirstTypeForName(split[i]);
var questerType = AssemblyHandler.FindTypeByName(split[i]);
if (questerType == null || !baseQuesterType.IsAssignableFrom(questerType))
{
@ -190,7 +190,7 @@ namespace Server.Engines.MLQuests
return;
}
var index = AssemblyHandler.FindFirstTypeForName(e.GetString(0));
var index = AssemblyHandler.FindTypeByName(e.GetString(0));
if (index == null || !Quests.TryGetValue(index, out var quest))
{
@ -216,7 +216,7 @@ namespace Server.Engines.MLQuests
return;
}
var index = AssemblyHandler.FindFirstTypeForName(e.GetString(0));
var index = AssemblyHandler.FindTypeByName(e.GetString(0));
if (index == null || !Quests.TryGetValue(index, out var quest))
{
@ -773,7 +773,7 @@ namespace Server.Engines.MLQuests
return null; // not serialized
}
var questType = AssemblyHandler.FindFirstTypeForName(typeName);
var questType = AssemblyHandler.FindTypeByFullName(typeName);
if (questType == null)
{

2
Projects/UOContent/Engines/Quests/Core/QuestSerializer.cs
View file

@ -70,7 +70,7 @@ namespace Server.Engines.Quests
return null;
}
return AssemblyHandler.FindFirstTypeForName(fullName);
return AssemblyHandler.FindTypeByFullName(fullName);
}
}
}

6
Projects/UOContent/Engines/Spawners/BaseSpawner.cs
View file

@ -567,7 +567,7 @@ namespace Server.Engines.Spawners
// Defrag taken care of in Spawn(), beforehand
// Count check taken care of in Spawn(), beforehand
var type = AssemblyHandler.FindFirstTypeForName(entry.SpawnedName);
var type = AssemblyHandler.FindTypeByName(entry.SpawnedName);
if (type == null)
{
@ -1027,7 +1027,7 @@ namespace Server.Engines.Spawners
Entries[i].SpawnedName = typeName;
}
if (AssemblyHandler.FindFirstTypeForName(typeName) == null)
if (AssemblyHandler.FindTypeByName(typeName) == null)
{
m_WarnTimer ??= new WarnTimer();
@ -1055,7 +1055,7 @@ namespace Server.Engines.Spawners
for (var j = 0; j < Entries.Count; j++)
{
if (AssemblyHandler.FindFirstTypeForName(Entries[j].SpawnedName) == e.GetType())
if (AssemblyHandler.FindTypeByName(Entries[j].SpawnedName) == e.GetType())
{
Entries[j].Spawned.Add(e);
Spawned.Add(e, Entries[j]);

2
Projects/UOContent/Engines/Spawners/GenerateSpawners.cs
View file

@ -67,7 +67,7 @@ namespace Server.Engines.Spawners
for (var i = 0; i < spawners.Count; i++)
{
var json = spawners[i];
var type = AssemblyHandler.FindFirstTypeForName(json.Type);
var type = AssemblyHandler.FindTypeByName(json.Type);
if (type == null || !typeof(BaseSpawner).IsAssignableFrom(type))
{

2
Projects/UOContent/Engines/Spawners/SpawnerGump.cs
View file

@ -194,7 +194,7 @@ namespace Server.Engines.Spawners
if (str.Length > 0)
{
var type = AssemblyHandler.FindFirstTypeForName(str);
var type = AssemblyHandler.FindTypeByName(str);
if (type == null)
{