@adeficior/data-modifier 1.0.0-rc.20 → 1.0.0-rc.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BlockIngredient, BlockTagIngredient, FluidIngredient, FluidTagIngredient, Ingredient, ItemIngredient, ItemTagIngredient, } from ".";
|
|
2
|
-
import { tryCatching } from "../../error";
|
|
3
2
|
import { createCommonFilter, } from "../filters";
|
|
4
|
-
import {
|
|
3
|
+
import {} from "../id";
|
|
5
4
|
// TODO is createPredicate
|
|
6
5
|
export default function createIngredientFilter(test, context) {
|
|
7
6
|
if (typeof test === "string") {
|
|
@@ -11,7 +10,7 @@ export default function createIngredientFilter(test, context) {
|
|
|
11
10
|
return createIngredientFilter(new ItemIngredient(test), context);
|
|
12
11
|
}
|
|
13
12
|
if (test instanceof RegExp) {
|
|
14
|
-
return filterByRegistry(test, context
|
|
13
|
+
return filterByRegistry(test, context, "minecraft:item");
|
|
15
14
|
}
|
|
16
15
|
if (typeof test === "function") {
|
|
17
16
|
return (it, logger) => test(context.ingredients.create(it), logger);
|
|
@@ -20,40 +19,35 @@ export default function createIngredientFilter(test, context) {
|
|
|
20
19
|
test.validate(context.lookup);
|
|
21
20
|
}
|
|
22
21
|
if (test instanceof ItemTagIngredient) {
|
|
23
|
-
return filterByRegistry(test.tag, context
|
|
22
|
+
return filterByRegistry(test.tag, context, "minecraft:item");
|
|
24
23
|
}
|
|
25
24
|
if (test instanceof ItemIngredient) {
|
|
26
|
-
return filterByRegistry(test.id, context
|
|
25
|
+
return filterByRegistry(test.id, context, "minecraft:item");
|
|
27
26
|
}
|
|
28
27
|
if (test instanceof FluidTagIngredient) {
|
|
29
|
-
return filterByRegistry(test.tag, context
|
|
28
|
+
return filterByRegistry(test.tag, context, "minecraft:fluid");
|
|
30
29
|
}
|
|
31
30
|
if (test instanceof FluidIngredient) {
|
|
32
|
-
return filterByRegistry(test.id, context
|
|
31
|
+
return filterByRegistry(test.id, context, "minecraft:fluid");
|
|
33
32
|
}
|
|
34
33
|
if (test instanceof BlockTagIngredient) {
|
|
35
|
-
return filterByRegistry(test.tag, context
|
|
34
|
+
return filterByRegistry(test.tag, context, "minecraft:block");
|
|
36
35
|
}
|
|
37
36
|
if (test instanceof BlockIngredient) {
|
|
38
|
-
return filterByRegistry(test.id, context
|
|
37
|
+
return filterByRegistry(test.id, context, "minecraft:block");
|
|
39
38
|
}
|
|
40
39
|
// TODO add support for ListIngredient?
|
|
41
40
|
// TODO warn or throw?
|
|
42
41
|
return () => false;
|
|
43
42
|
}
|
|
44
|
-
function filterByRegistry(test,
|
|
43
|
+
function filterByRegistry(test, context, registry) {
|
|
45
44
|
function resolveIds(it) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (Array.isArray(it)) {
|
|
49
|
-
return it.flatMap(resolveIds);
|
|
50
|
-
}
|
|
51
|
-
return it.idsFor(registry);
|
|
45
|
+
const ingredient = context.ingredients.create(it);
|
|
46
|
+
return ingredient.idsFor(registry);
|
|
52
47
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
}) ?? [], tags.registry(registry));
|
|
48
|
+
// TODO create Ingredient Filter and transform to input filter
|
|
49
|
+
return createCommonFilter(test,
|
|
50
|
+
// TODO remove logger
|
|
51
|
+
(input, _logger) => resolveIds(input), context.tags.registry(registry));
|
|
58
52
|
}
|
|
59
53
|
//# sourceMappingURL=filter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/common/ingredient/filter.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,iBAAiB,GAClB,MAAM,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/common/ingredient/filter.ts"],"names":[],"mappings":"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"}
|