Data Storage improvements

Author: Stevertus

.github/workflows/dart.yml

@@ -23,4 +23,11 @@ jobs:
       - name: Install dependencies
         run: dart pub get
       - name: Run tests
-        run: dart run test
+        run: pub run test --coverage="coverage"
+      - name: Convert coverage to ICOV
+        run: pub run coverage:format_coverage --lcov --in=coverage --out=coverage.lcov --packages=.packages --report-on=lib
+      - name: Upload coverage to Codecov  
+        uses: codecov/codecov-action@v1.0.2
+        with:
+          token: ${{secrets.CODECOV_TOKEN}}
+          file: coverage.lcov

example/files/load.dart

@@ -10,7 +10,8 @@ class LoadFile extends Widget {
       Data.merge(Entity.All(), nbt: {
         "uuid": UUID(1, 2, 3, 4),
         'name': TextComponent('name'),
-      })
+      }),
+      Bossbar("test").get(BossbarOption.value) + 1
     ]);
   }
 }

example/score_test.dart

@@ -3,15 +3,13 @@ import 'package:objd/core.dart';
 void main(List<String> args) {
   var s1 = Score(Entity.All(), "s1");
   var s2 = Score.Self('s2');
-  var t = (s1 + s2) +
-      s1 / (s2 + 2) +
-      (Bossbar("test") << s1) +
-      Bossbar("test").get(BossbarOption.value);
+  var t = Bossbar("test").get(BossbarOption.value) + 1;
 
-  //print(t);
-  print(s1 + (s2 + s1));
+  print(t);
+  // print(s1 + (s2 + s1));
 
   final (_, ops) = t.copy();
+  print(ops);
   //print(getCommands(For.of(ops)).join('\n'));
-  print(getCommands(s1 + s2 + s1).join('\n')); //TODO: Caveat s1 + s2 != s2 + s1
+  print(getCommands(t).join('\n')); //TODO: Caveat s1 + s2 != s2 + s1
 }

folder name/data/minecraft/tags/functions/load.json

@@ -0,0 +1 @@
+{"values":["mypack:load"]}

folder name/data/minecraft/tags/functions/tick.json

@@ -0,0 +1 @@
+{"values":["mypack:main"]}

folder name/data/mypack/functions/load.mcfunction

@@ -0,0 +1,3 @@
+scoreboard objectives add objd_temp dummy
+data merge entity @a {uuid:[I;1,2,3,4],name:{"text":"name"}}
+scoreboard players add #at6AbnE8 objd_temp 1

folder name/data/mypack/functions/main.mcfunction

@@ -0,0 +1 @@
+{"pack":{"pack_format":8,"description":"This is a datapack generated with objd by Stevertus"}}

folder name/pack.mcmeta

@@ -57,9 +57,8 @@ class Pack extends Widget {
         'name': name,
         'main': main?.toMap(),
         'load': load?.toMap(),
-        'modules':
-            modules == null ? null : modules!.map((x) => x.toMap()).toList(),
-        'files': files == null ? null : files!.map((x) => x.toMap()).toList(),
+        'modules': modules?.map((x) => x.toMap()).toList(),
+        'files': files?.map((x) => x.toMap()).toList(),
       }
     };
   }

lib/src/basic/pack.dart

@@ -2,5 +2,5 @@ import 'package:gson/parsable.dart';
 
 class Parsable extends GsonParsable {
   /// ObjD's own type of a Parsable
-  Parsable(String parsable) : super(parsable);
+  Parsable(super.parsable);
 }