tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Server/Client Ignored Components lists easier to find (#1202)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
This commit is contained in:
Tyler Young
2020-07-02 09:50:45 -04:00
committed by GitHub
parent bb51fe2cc0
commit 9f1bdb4b0a
4 changed files with 164 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
Content.Client/EntryPoint.cs
View File

@@ -52,136 +52,7 @@ namespace Content.Client
factory.DoAutoRegistrations(); factory.DoAutoRegistrations();
var registerIgnore = new[] foreach (var ignoreName in IgnoredComponents.List)
{
"Anchorable",
"AmmoBox",
"Breakable",
"Pickaxe",
"Interactable",
"Destructible",
"Temperature",
"Explosive",
"OnUseTimerTrigger",
"ToolboxElectricalFill",
"ToolboxEmergencyFill",
"WarpPoint",
"ToolboxGoldFill",
"ToolLockerFill",
"EmitSoundOnUse",
"FootstepModifier",
"HeatResistance",
"Teleportable",
"ItemTeleporter",
"Portal",
"EntityStorage",
"PlaceableSurface",
"Wirecutter",
"Screwdriver",
"Multitool",
"Wrench",
"Crowbar",
"Projectile",
"MeleeWeapon",
"Storeable",
"Dice",
"Construction",
"Door",
"PoweredLight",
"Smes",
"Powercell",
"LightBulb",
"Healing",
"Catwalk",
"RangedMagazine",
"Ammo",
"HitscanWeaponCapacitor",
"PowerCell",
"PowerCellCharger",
"WeaponCapacitorCharger",
"AiController",
"Computer",
"AsteroidRock",
"ResearchServer",
"ResearchPointSource",
"ResearchClient",
"IdCard",
"Access",
"AccessReader",
"IdCardConsole",
"Airlock",
"MedicalScanner",
"WirePlacer",
"Drink",
"Food",
"FoodContainer",
"Stomach",
"Rotatable",
"MagicMirror",
"MedkitFill",
"FloorTile",
"FootstepSound",
"UtilityBeltClothingFill",
"ShuttleController",
"HumanInventoryController",
"UseDelay",
"Pourable",
"Paper",
"Write",
"Bloodstream",
"TransformableContainer",
"Mind",
"StorageFill",
"Mop",
"Bucket",
"Puddle",
"CanSpill",
"SpeedLoader",
"Hitscan",
"BoltActionBarrel",
"PumpBarrel",
"RevolverBarrel",
"ExplosiveProjectile",
"StunnableProjectile",
"RandomPottedPlant",
"CommunicationsConsole",
"BarSign",
"DroppedBodyPart",
"DroppedMechanism",
"BodyManager",
"SolarPanel",
"BodyScanner",
"Stunbaton",
"EmergencyClosetFill",
"Tool",
"TilePrying",
"RandomToolColor",
"ConditionalSpawner",
"PottedPlantHide",
"SecureEntityStorage",
"PresetIdCard",
"SolarControlConsole",
"BatteryBarrel",
"FlashExplosive",
"FlashProjectile",
"Utensil",
"UnarmedCombat",
"TimedSpawner",
"Buckle",
"Strap",
"NodeContainer",
"PowerSupplier",
"PowerConsumer",
"Battery",
"BatteryStorage",
"BatteryDischarger",
"Apc",
"PowerProvider",
"PowerReceiver",
"Wire",
};
foreach (var ignoreName in registerIgnore)
{ {
factory.RegisterIgnore(ignoreName); factory.RegisterIgnore(ignoreName);
} }
@@ -254,10 +125,7 @@ namespace Content.Client
/// </summary> /// </summary>
public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs) public static void DetachPlayerFromEntity(EntityDetachedEventArgs eventArgs)
{ {
if (!eventArgs.OldEntity.Deleted) eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
{
eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
}
} }
public override void PostInit() public override void PostInit()

135
Content.Client/IgnoredComponents.cs Normal file
View File

@@ -0,0 +1,135 @@
namespace Content.Client
{
public static class IgnoredComponents
{
public static string[] List => new[]
{
"Anchorable",
"AmmoBox",
"Breakable",
"Pickaxe",
"Interactable",
"Destructible",
"Temperature",
"Explosive",
"OnUseTimerTrigger",
"ToolboxElectricalFill",
"ToolboxEmergencyFill",
"WarpPoint",
"ToolboxGoldFill",
"ToolLockerFill",
"EmitSoundOnUse",
"FootstepModifier",
"HeatResistance",
"Teleportable",
"ItemTeleporter",
"Portal",
"EntityStorage",
"PlaceableSurface",
"Wirecutter",
"Screwdriver",
"Multitool",
"Wrench",
"Crowbar",
"Projectile",
"MeleeWeapon",
"Storeable",
"Dice",
"Construction",
"Door",
"PoweredLight",
"Smes",
"Powercell",
"LightBulb",
"Healing",
"Catwalk",
"RangedMagazine",
"Ammo",
"HitscanWeaponCapacitor",
"PowerCell",
"PowerCellCharger",
"WeaponCapacitorCharger",
"AiController",
"Computer",
"AsteroidRock",
"ResearchServer",
"ResearchPointSource",
"ResearchClient",
"IdCard",
"Access",
"AccessReader",
"IdCardConsole",
"Airlock",
"MedicalScanner",
"WirePlacer",
"Drink",
"Food",
"FoodContainer",
"Stomach",
"Rotatable",
"MagicMirror",
"MedkitFill",
"FloorTile",
"FootstepSound",
"UtilityBeltClothingFill",
"ShuttleController",
"HumanInventoryController",
"UseDelay",
"Pourable",
"Paper",
"Write",
"Bloodstream",
"TransformableContainer",
"Mind",
"StorageFill",
"Mop",
"Bucket",
"Puddle",
"CanSpill",
"SpeedLoader",
"Hitscan",
"BoltActionBarrel",
"PumpBarrel",
"RevolverBarrel",
"ExplosiveProjectile",
"StunnableProjectile",
"RandomPottedPlant",
"CommunicationsConsole",
"BarSign",
"DroppedBodyPart",
"DroppedMechanism",
"BodyManager",
"SolarPanel",
"BodyScanner",
"Stunbaton",
"EmergencyClosetFill",
"Tool",
"TilePrying",
"RandomToolColor",
"ConditionalSpawner",
"PottedPlantHide",
"SecureEntityStorage",
"PresetIdCard",
"SolarControlConsole",
"BatteryBarrel",
"FlashExplosive",
"FlashProjectile",
"Utensil",
"UnarmedCombat",
"TimedSpawner",
"Buckle",
"Strap",
"NodeContainer",
"PowerSupplier",
"PowerConsumer",
"Battery",
"BatteryStorage",
"BatteryDischarger",
"Apc",
"PowerProvider",
"PowerReceiver",
"Wire",
"StressTestMovement",
};
}
}

20
Content.Server/EntryPoint.cs
View File

@@ -31,25 +31,7 @@ namespace Content.Server
factory.DoAutoRegistrations(); factory.DoAutoRegistrations();
var registerIgnore = new[] foreach (var ignoreName in IgnoredComponents.List)
{
"ConstructionGhost",
"IconSmooth",
"SubFloorHide",
"LowWall",
"ReinforcedWall",
"Window",
"CharacterInfo",
"InteractionOutline",
"MeleeWeaponArcAnimation",
"AnimationsTest",
"ItemStatus",
"Marker",
"EmergencyLight",
"Clickable",
};
foreach (var ignoreName in registerIgnore)
{ {
factory.RegisterIgnore(ignoreName); factory.RegisterIgnore(ignoreName);
} }

26
Content.Server/IgnoredComponents.cs Normal file
View File

@@ -0,0 +1,26 @@
namespace Content.Server
{
public static class IgnoredComponents
{
public static string[] List => new [] {
"ConstructionGhost",
"IconSmooth",
"SubFloorHide",
"LowWall",
"ReinforcedWall",
"Window",
"CharacterInfo",
"InteractionOutline",
"MeleeWeaponArcAnimation",
"AnimationsTest",
"ItemStatus",
"Marker",
"EmergencyLight",
"Clickable",
};
}
}