Big WIP...

module/misc.js

@@ -69,9 +69,9 @@ export class Misc {
   }
 
   static classify(items, classifier = it => it.type) {
-    let itemsBy = {};
-    Misc.classifyInto(itemsBy, items, classifier);
-    return itemsBy;
+    let itemsBy = {}
+    Misc.classifyInto(itemsBy, items, classifier)
+    return itemsBy
   }
 
   static classifyFirst(items, classifier) {
@@ -87,13 +87,13 @@ export class Misc {
 
   static classifyInto(itemsBy, items, classifier = it => it.type) {
     for (const item of items) {
-      const classification = classifier(item);
+      const classification = classifier(item)
       let list = itemsBy[classification];
       if (!list) {
-        list = [];
-        itemsBy[classification] = list;
+        list = []
+        itemsBy[classification] = list
       }
-      list.push(item);
+      list.push(item)
     }
   }
 
@@ -105,21 +105,21 @@ export class Misc {
     return params.reduce((a, b) => a + separator + b);
   }
 
+
   static data(it) {
-    if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
-      return it.system
-    }
-    return it
+    /*if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
+      return it.data;
+    }*/
+    return it;
   }
 
   static templateData(it) {
-    return it.system ?? {}
-    //return Misc.data(it)?.system ?? {}
+    return Misc.data(it)?.data ?? {}
   }
 
   static getEntityTypeLabel(entity) {
-    const documentName = entity?.documentName;
-    const type = entity?.data.type;
+    const documentName = entity?.documentName
+    const type = entity?.type
     if (documentName === 'Actor' || documentName === 'Item') {
       const label = CONFIG[documentName]?.typeLabels?.[type] ?? type;
       return game.i18n.has(label) ? game.i18n.localize(label) : t;