Use object initializers for PropertiesObjectType

Assets/Base/CustomTexture.cs

@@ -5,7 +5,11 @@
 public class CustomTexture : PropertiesObject
 {
     public static PropertiesObjectType objectType = new PropertiesObjectType(
-        "Custom Texture", s => s.CustomTextureDesc, "image", typeof(CustomTexture));
+        "Custom Texture", typeof(CustomTexture))
+    {
+        description = s => s.CustomTextureDesc,
+        iconName = "image",
+    };
     public PropertiesObjectType ObjectType => objectType;
 
     public enum CustomFilter

Assets/Base/Entity.cs

@@ -47,19 +47,24 @@ public static IEnumerable<Property> JoinProperties(
 // with all the missing data (this is done by Filter)
 public class PropertiesObjectType
 {
-    public static readonly PropertiesObjectType NONE =
-        new PropertiesObjectType("None", GUIStringSet.Empty, "cancel", null);
+    public static readonly PropertiesObjectType NONE = new PropertiesObjectType("None", null)
+        { iconName = "cancel" };
 
-    public string fullName; // not readonly so it can be serialized
+    // This name is used for identifying types and for error messages if a type is not recognized.
+    // It is always in English (not localized) and can never change.
+    public string fullName;
+
+    [XmlIgnore]
+    public readonly Type type;
     [XmlIgnore]
-    public readonly Localizer description;
+    public Func<PropertiesObject> constructor;
+
     [XmlIgnore]
-    public readonly Localizer longDescription;
+    public Localizer description = GUIStringSet.Empty;
     [XmlIgnore]
-    public readonly string iconName;
+    public Localizer longDescription = GUIStringSet.Empty;
     [XmlIgnore]
-    public readonly Type type;
-    private readonly Func<PropertiesObject> constructor;
+    public string iconName = "";
 
     private Texture _icon;
     public Texture icon
@@ -73,47 +78,25 @@ public Texture icon
     }
 
     // empty constructor for deserialization
-    public PropertiesObjectType() { }
-
-    public PropertiesObjectType(string fullName, Type type)
+    public PropertiesObjectType()
     {
-        this.fullName = fullName;
-        description = GUIStringSet.Empty;
-        longDescription = GUIStringSet.Empty;
-        iconName = "";
-        this.type = type;
         constructor = DefaultConstructor;
     }
 
-    public PropertiesObjectType(string fullName, Localizer description, string iconName,
-        Type type, Func<PropertiesObject> constructor = null)
-    {
-        this.fullName = fullName;
-        this.description = description;
-        longDescription = GUIStringSet.Empty;
-        this.iconName = iconName;
-        this.type = type;
-        this.constructor = constructor ?? DefaultConstructor;
-    }
-
-    public PropertiesObjectType(string fullName, Localizer description, Localizer longDescription,
-        string iconName, Type type, Func<PropertiesObject> constructor = null)
+    public PropertiesObjectType(string fullName, Type type)
     {
         this.fullName = fullName;
-        this.description = description;
-        this.longDescription = longDescription;
-        this.iconName = iconName;
         this.type = type;
-        this.constructor = constructor ?? DefaultConstructor;
+        constructor = DefaultConstructor;
     }
 
     public PropertiesObjectType(PropertiesObjectType baseType, Func<PropertiesObject> newConstructor)
     {
-        this.fullName = baseType.fullName;
-        this.description = baseType.description;
-        this.longDescription = baseType.longDescription;
-        this.iconName = baseType.iconName;
-        this.type = baseType.type;
+        fullName = baseType.fullName;
+        description = baseType.description;
+        longDescription = baseType.longDescription;
+        iconName = baseType.iconName;
+        type = baseType.type;
         constructor = newConstructor;
     }
 
@@ -190,7 +173,8 @@ public interface PropertiesObject
 public abstract class Entity : PropertiesObject
 {
     public static PropertiesObjectType objectType = new PropertiesObjectType(
-        "Anything", GUIStringSet.Empty, "circle-outline", typeof(Entity));
+        "Anything", typeof(Entity))
+        { iconName = "circle-outline" };
 
     public EntityComponent component;
     public Sensor sensor;
@@ -562,27 +546,11 @@ public virtual void LastBehaviorDisabled() { }
 
 public class BehaviorType : PropertiesObjectType
 {
-    public readonly Predicate<Entity> rule;
+    public Predicate<Entity> rule = DefaultRule;
 
     public BehaviorType(string fullName, Type type)
         : base(fullName, type)
-    {
-        this.rule = DefaultRule;
-    }
-
-    public BehaviorType(string fullName, Localizer description, string iconName, Type type,
-        Predicate<Entity> rule = null)
-        : base(fullName, description, iconName, type)
-    {
-        this.rule = rule ?? DefaultRule;
-    }
-
-    public BehaviorType(string fullName, Localizer description, Localizer longDescription,
-        string iconName, Type type, Predicate<Entity> rule = null)
-        : base(fullName, description, longDescription, iconName, type)
-    {
-        this.rule = rule ?? DefaultRule;
-    }
+    { }
 
     private static bool DefaultRule(Entity checkEntity) => true;
 

Assets/Base/Object.cs

@@ -4,7 +4,11 @@
 public abstract class ObjectEntity : DynamicEntity
 {
     public static new PropertiesObjectType objectType = new PropertiesObjectType(
-        "Object", s => s.ObjectDesc, "circle", typeof(ObjectEntity));
+        "Object", typeof(ObjectEntity))
+    {
+        description = s => s.ObjectDesc,
+        iconName = "circle",
+    };
     public override PropertiesObjectType ObjectType => objectType;
 
     public ObjectMarker marker;

Assets/Base/Substance.cs

@@ -10,8 +10,12 @@ public enum Pos { Min, Center, Max };
 public class Substance : DynamicEntity
 {
     public static new PropertiesObjectType objectType = new PropertiesObjectType(
-        "Substance", s => s.SubstanceDesc, s => s.SubstanceLongDesc, "cube-outline",
-        typeof(Substance));
+        "Substance", typeof(Substance))
+    {
+        description = s => s.SubstanceDesc,
+        longDescription = s => s.SubstanceLongDesc,
+        iconName = "cube-outline",
+    };
     public override PropertiesObjectType ObjectType => objectType;
 
     public Pivot pivot = new Pivot { x = Pivot.Pos.Center, y = Pivot.Pos.Center, z = Pivot.Pos.Center };

Assets/Base/WorldProperties.cs

@@ -13,7 +13,11 @@ public class WorldProperties : PropertiesObject
     };
 
     public static PropertiesObjectType objectType = new PropertiesObjectType(
-        "World", s => s.WorldDesc, "earth", typeof(WorldProperties));
+        "World", typeof(WorldProperties))
+    {
+        description = s => s.WorldDesc,
+        iconName = "earth",
+    };
     public PropertiesObjectType ObjectType => objectType;
 
     public void SetSky(Material sky)

Assets/Behaviors/Carryable.cs

@@ -5,11 +5,15 @@
 public class CarryableBehavior : GenericEntityBehavior<CarryableBehavior, CarryableComponent>
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Carryable", s => s.CarryableDesc, s => s.CarryableLongDesc, "coffee",
-        typeof(CarryableBehavior),
-        BehaviorType.AndRule(
+        "Carryable", typeof(CarryableBehavior))
+    {
+        description = s => s.CarryableDesc,
+        longDescription = s => s.CarryableLongDesc,
+        iconName = "coffee",
+        rule = BehaviorType.AndRule(
             BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
-            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))));
+            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public float throwSpeed = 0;

Assets/Behaviors/CharacterComponent.cs

@@ -4,11 +4,15 @@
 public class CharacterBehavior : BasePhysicsBehavior
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Character", s => s.CharacterDesc, s => s.CharacterLongDesc, "human",
-        typeof(CharacterBehavior),
-        BehaviorType.AndRule(
+        "Character", typeof(CharacterBehavior))
+    {
+        description = s => s.CharacterDesc,
+        longDescription = s => s.CharacterLongDesc,
+        iconName = "human",
+        rule = BehaviorType.AndRule(
             BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
-            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))));
+            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public override IEnumerable<Property> Properties() =>

Assets/Behaviors/Clone.cs

@@ -2,11 +2,15 @@
 
 public class CloneBehavior : TeleportBehavior
 {
-    public static new BehaviorType objectType = new BehaviorType(
-        "Clone", s => s.CloneDesc, s => s.CloneLongDesc, "content-copy", typeof(CloneBehavior),
-        BehaviorType.AndRule(
+    public static new BehaviorType objectType = new BehaviorType("Clone", typeof(CloneBehavior))
+    {
+        description = s => s.CloneDesc,
+        longDescription = s => s.CloneLongDesc,
+        iconName = "content-copy",
+        rule = BehaviorType.AndRule(
             BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
-            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))));
+            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public override Behaviour MakeComponent(GameObject gameObject)

Assets/Behaviors/Force.cs

@@ -8,9 +8,13 @@ public enum ForceBehaviorMode
         IMPULSE, CONTINUOUS
     }
 
-    public static new BehaviorType objectType = new BehaviorType(
-        "Force", s => s.ForceDesc, s => s.ForceLongDesc, "rocket", typeof(ForceBehavior),
-        BehaviorType.BaseTypeRule(typeof(DynamicEntity)));
+    public static new BehaviorType objectType = new BehaviorType("Force", typeof(ForceBehavior))
+    {
+        description = s => s.ForceDesc,
+        longDescription = s => s.ForceLongDesc,
+        iconName = "rocket",
+        rule = BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public ForceBehaviorMode mode = ForceBehaviorMode.CONTINUOUS;

Assets/Behaviors/HaloComponent.cs

@@ -4,8 +4,12 @@
 [EditorPreviewBehavior]
 public class HaloBehavior : GenericEntityBehavior<HaloBehavior, HaloComponent>
 {
-    public static new BehaviorType objectType = new BehaviorType(
-        "Halo", s => s.HaloDesc, s => s.HaloLongDesc, "blur", typeof(HaloBehavior));
+    public static new BehaviorType objectType = new BehaviorType("Halo", typeof(HaloBehavior))
+    {
+        description = s => s.HaloDesc,
+        longDescription = s => s.HaloLongDesc,
+        iconName = "blur",
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public float size = 3;

Assets/Behaviors/HurtHeal.cs

@@ -4,8 +4,13 @@
 public class HurtHealBehavior : GenericEntityBehavior<HurtHealBehavior, HurtHealComponent>
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Hurt/Heal", s => s.HurtHealDesc, s => s.HurtHealLongDesc, "heart",
-        typeof(HurtHealBehavior), BehaviorType.BaseTypeRule(typeof(DynamicEntity)));
+        "Hurt/Heal", typeof(HurtHealBehavior))
+    {
+        description = s => s.HurtHealDesc,
+        longDescription = s => s.HurtHealLongDesc,
+        iconName = "heart",
+        rule = BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public float amount = -30;

Assets/Behaviors/Joystick.cs

@@ -8,10 +8,14 @@ public class JoystickBehavior
     public enum JoystickAlignment { HORIZONTAL, VERTICAL }
 
     public static new BehaviorType objectType = new BehaviorType(
-        "Joystick", s => s.JoystickDesc, "joystick", typeof(JoystickBehavior),
-        BehaviorType.AndRule(
+        "Joystick", typeof(JoystickBehavior))
+    {
+        description = s => s.JoystickDesc,
+        iconName = "joystick",
+        rule = BehaviorType.AndRule(
             BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
-            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))));
+            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public float speed = 1;

Assets/Behaviors/LightComponent.cs

@@ -4,8 +4,12 @@
 [EditorPreviewBehavior]
 public class LightBehavior : GenericEntityBehavior<LightBehavior, LightComponent>
 {
-    public static new BehaviorType objectType = new BehaviorType(
-        "Light", s => s.LightDesc, s => s.LightLongDesc, "lightbulb-on", typeof(LightBehavior));
+    public static new BehaviorType objectType = new BehaviorType("Light", typeof(LightBehavior))
+    {
+        description = s => s.LightDesc,
+        longDescription = s => s.LightLongDesc,
+        iconName = "lightbulb-on",
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public float size = 10, intensity = 1;

Assets/Behaviors/LookAt.cs

@@ -3,9 +3,13 @@
 
 public class LookAtBehavior : GenericEntityBehavior<LookAtBehavior, LookAtComponent>
 {
-    public static new BehaviorType objectType = new BehaviorType(
-        "Look At", s => s.LookAtDesc, s => s.LookAtLongDesc, "compass", typeof(LookAtBehavior),
-        BehaviorType.BaseTypeRule(typeof(DynamicEntity)));
+    public static new BehaviorType objectType = new BehaviorType("Look At", typeof(LookAtBehavior))
+    {
+        description = s => s.LookAtDesc,
+        longDescription =  s => s.LookAtLongDesc,
+        iconName = "compass",
+        rule = BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public Target target = new Target(Target.EAST);

Assets/Behaviors/Move.cs

@@ -4,8 +4,13 @@
 public class MoveBehavior : GenericEntityBehavior<MoveBehavior, MoveComponent>
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Move", s => s.MoveDesc, s => s.MoveLongDesc, "arrow-right-bold-box-outline",
-        typeof(MoveBehavior), BehaviorType.BaseTypeRule(typeof(DynamicEntity)));
+        "Move", typeof(MoveBehavior))
+    {
+        description = s => s.MoveDesc,
+        longDescription = s => s.MoveLongDesc,
+        iconName = "arrow-right-bold-box-outline",
+        rule = BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public Target target = new Target(Target.NORTH);

Assets/Behaviors/MoveWith.cs

@@ -4,9 +4,13 @@
 public class MoveWithBehavior : GenericEntityBehavior<MoveWithBehavior, MoveWithComponent>
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Move With", s => s.MoveWithDesc, s => s.MoveWithLongDesc, "move-resize-variant",
-        typeof(MoveWithBehavior),
-        BehaviorType.BaseTypeRule(typeof(DynamicEntity)));
+        "Move With", typeof(MoveWithBehavior))
+    {
+        description = s => s.MoveWithDesc,
+        longDescription = s => s.MoveWithLongDesc,
+        iconName = "move-resize-variant",
+        rule = BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public EntityReference target = new EntityReference(null);

Assets/Behaviors/PhysicsComponent.cs

@@ -10,10 +10,15 @@ public abstract class BasePhysicsBehavior : EntityBehavior
 public class PhysicsBehavior : BasePhysicsBehavior
 {
     public static new BehaviorType objectType = new BehaviorType(
-        "Physics", s => s.PhysicsDesc, s => s.PhysicsLongDesc, "soccer", typeof(PhysicsBehavior),
-        BehaviorType.AndRule(
+        "Physics", typeof(PhysicsBehavior))
+    {
+        description = s => s.PhysicsDesc,
+        longDescription = s => s.PhysicsLongDesc,
+        iconName = "soccer",
+        rule = BehaviorType.AndRule(
             BehaviorType.BaseTypeRule(typeof(DynamicEntity)),
-            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))));
+            BehaviorType.NotBaseTypeRule(typeof(PlayerObject))),
+    };
     public override BehaviorType BehaviorObjectType => objectType;
 
     public override IEnumerable<Property> Properties() =>