Skip to content

Commit 86cb4ec

Browse files
committed
Merge branch 'master' into scoreoperations
2 parents e57e0c1 + 1997366 commit 86cb4ec

18 files changed

Lines changed: 2599 additions & 2415 deletions

.github/workflows/dart.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
- uses: actions/checkout@v3
2323
- name: Install dependencies
2424
run: dart pub get
25+
- name: Lint Code
26+
run: dart analyze lib/
2527
- name: Run tests
26-
run: pub run test --coverage="coverage"
27-
- name: Convert coverage to ICOV
28-
run: pub run coverage:format_coverage --lcov --in=coverage --out=coverage.lcov --packages=.packages --report-on=lib
28+
run: dart run coverage:test_with_coverage
2929
- name: Upload coverage to Codecov
3030
uses: codecov/codecov-action@v1.0.2
3131
with:
3232
token: ${{secrets.CODECOV_TOKEN}}
33-
file: coverage.lcov
33+
file: coverage/lcov.info

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
.dart_tool/
44
.packages
55
pubspec.lock
6-
generators/
6+
generators/
7+
coverage/

.pubignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
.gitignore
55
web_example
66
pubspec.lock
7-
generators/
7+
generators/
8+
coverage/

lib/src/annotations/file.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Writing Minecrafts functions annotations becomes really easy. Just annotate a Widget variable that should be inside of your function with `@Func()`:
2-
32
class Func {
43
final String? name;
54
final String? path;

lib/src/annotations/pack.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// The `@Pck()` annotation works similar to @Func. You annotate a File List variable and it generates a Widget for this Pack.
2-
32
class Pck {
43
final String? name;
54
final String? main;

lib/src/annotations/project.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// This can automatically generate a main function with all necessary pieces to actually generate all packs and files.
2-
32
class Prj {
43
final String? name;
54
final int? version;

lib/src/annotations/widget.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
/// Log('Hello $name $lastname!'),
77
///]);
88
///```
9-
109
// ignore: constant_identifier_names
1110
const Wdg = WidgetAnnotation();
1211

lib/src/basic/text_components.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class TextHoverEvent {
409409
}
410410
}
411411

412-
/// See all available colors: https://minecraft.gamepedia.com/Formatting_codes#Color_codes
412+
/// See all available colors: https://minecraft.wiki/w/Formatting_codes#Color_codes
413413
class Color {
414414
final String _color;
415415

lib/src/basic/types/area.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Area {
6767
dz = (loc2.z - loc1.z).abs();
6868
}
6969

70-
Map getRanges() {
70+
Map<String, double> getRanges() {
7171
var ret = <String, double>{};
7272
ret['x'] = loc1.x;
7373
ret['y'] = loc1.y;

lib/src/basic/types/blocks.dart

Lines changed: 1004 additions & 1004 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)