@adeficior/data-modifier 1.0.0-rc.26 → 1.0.0-rc.28
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.
- package/dist/cli/index.js +1 -1
- package/dist/emit/assets/blockstates.d.ts +1 -2
- package/dist/emit/assets/blockstates.js +1 -3
- package/dist/emit/assets/blockstates.js.map +1 -1
- package/dist/emit/assets/lang.d.ts +1 -2
- package/dist/emit/assets/lang.js +5 -5
- package/dist/emit/assets/lang.js.map +1 -1
- package/dist/emit/assets/models.d.ts +3 -3
- package/dist/emit/assets/models.js +6 -6
- package/dist/emit/assets/models.js.map +1 -1
- package/dist/emit/blacklist.d.ts +2 -2
- package/dist/emit/blacklist.js +6 -6
- package/dist/emit/blacklist.js.map +1 -1
- package/dist/emit/content/blockDefinition.d.ts +1 -2
- package/dist/emit/content/blockDefinition.js +1 -3
- package/dist/emit/content/blockDefinition.js.map +1 -1
- package/dist/emit/content/itemDefinition.d.ts +1 -2
- package/dist/emit/content/itemDefinition.js +1 -3
- package/dist/emit/content/itemDefinition.js.map +1 -1
- package/dist/emit/custom.d.ts +4 -4
- package/dist/emit/custom.js +4 -3
- package/dist/emit/custom.js.map +1 -1
- package/dist/emit/data/loot.d.ts +2 -2
- package/dist/emit/data/loot.js +7 -7
- package/dist/emit/data/loot.js.map +1 -1
- package/dist/emit/data/recipe.d.ts +2 -2
- package/dist/emit/data/recipe.js +3 -4
- package/dist/emit/data/recipe.js.map +1 -1
- package/dist/emit/data/tags.d.ts +2 -2
- package/dist/emit/data/tags.js +4 -3
- package/dist/emit/data/tags.js.map +1 -1
- package/dist/emit/index.d.ts +2 -2
- package/dist/emit/polytoneTabs.d.ts +1 -2
- package/dist/emit/polytoneTabs.js +2 -4
- package/dist/emit/polytoneTabs.js.map +1 -1
- package/dist/emit/ruled.d.ts +4 -4
- package/dist/emit/ruled.js +4 -3
- package/dist/emit/ruled.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js.map +1 -1
- package/dist/loader/index.d.ts +5 -5
- package/dist/loader/index.js +3 -3
- package/dist/loader/index.js.map +1 -1
- package/dist/loader/pack.d.ts +6 -7
- package/dist/loader/pack.js +19 -27
- package/dist/loader/pack.js.map +1 -1
- package/dist/loader/registry/dump.d.ts +3 -4
- package/dist/loader/registry/dump.js +3 -7
- package/dist/loader/registry/dump.js.map +1 -1
- package/dist/loader/tags.d.ts +3 -3
- package/dist/loader/tags.js +3 -3
- package/dist/loader/tags.js.map +1 -1
- package/dist/textHelper.d.ts +2 -1
- package/dist/textHelper.js +4 -2
- package/dist/textHelper.js.map +1 -1
- package/package.json +3 -4
package/dist/cli/index.js
CHANGED
|
@@ -22,7 +22,7 @@ async function runCodegen(config) {
|
|
|
22
22
|
if (config.registryDump && existsSync(config.registryDump)) {
|
|
23
23
|
const resolver = createResolver({ from: config.registryDump });
|
|
24
24
|
const registry = new RegistryDumpLoader(logger);
|
|
25
|
-
await
|
|
25
|
+
await resolver.extract(registry);
|
|
26
26
|
await generateRegistryTypes(registry, config.output);
|
|
27
27
|
logger.info("successfully generated registry entry types");
|
|
28
28
|
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { Acceptor } from "@adeficior/pack-resolver";
|
|
2
1
|
import type { IdInput } from "../../common/id.js";
|
|
3
2
|
import type { Blockstate } from "../../schema/assets/blockstate.js";
|
|
4
3
|
import type { ClearableEmitter } from "../index.js";
|
|
@@ -11,7 +10,7 @@ export default class BlockstateEmitter implements BlockstateRules, ClearableEmit
|
|
|
11
10
|
private readonly custom;
|
|
12
11
|
private filePath;
|
|
13
12
|
add(id: IdInput, blockstate: Blockstate): void;
|
|
14
|
-
|
|
13
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
15
14
|
clear(): void;
|
|
16
15
|
basic(id: IdInput, model?: `${string}:${string}`): void;
|
|
17
16
|
cog(id: IdInput, model?: `${string}:${string}`): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockstates.js","sourceRoot":"","sources":["../../../src/emit/assets/blockstates.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blockstates.js","sourceRoot":"","sources":["../../../src/emit/assets/blockstates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,aAAa,MAAM,cAAc,CAAC;AASzC,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAGnB,MAAM,GAAG,IAAI,aAAa,CAAa,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE/D,QAAQ,CAAC,EAAM;QACrB,OAAO,UAAU,EAAE,CAAC,SAAS,gBAAgB,EAAE,CAAC,IAAI,OAAO,CAAC;IAC9D,CAAC;IAED,GAAG,CAAC,EAAW,EAAE,UAAsB;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IAEQ,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEzC,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,EAAW,EAAE,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC;QAC7C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACX,QAAQ,EAAE;gBACR,EAAE,EAAE;oBACF,KAAK;iBACN;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,EAAW,EAAE,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YACX,QAAQ,EAAE;gBACR,QAAQ,EAAE;oBACR,KAAK;oBACL,CAAC,EAAE,EAAE;oBACL,CAAC,EAAE,EAAE;iBACN;gBACD,QAAQ,EAAE;oBACR,KAAK;iBACN;gBACD,QAAQ,EAAE;oBACR,KAAK;oBACL,CAAC,EAAE,EAAE;oBACL,CAAC,EAAE,GAAG;iBACP;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
|
|
2
|
-
import type { Acceptor } from "@adeficior/pack-resolver";
|
|
3
2
|
import type { IdInput } from "../../common/id.js";
|
|
4
3
|
import type { LangDefinition } from "../../schema/assets/lang.js";
|
|
5
4
|
import type { ClearableEmitter, RegistryProvider } from "../index.js";
|
|
@@ -23,7 +22,7 @@ export default class LangEmitter implements LangRules, ClearableEmitter {
|
|
|
23
22
|
private custom;
|
|
24
23
|
private rules;
|
|
25
24
|
constructor(registry: RegistryProvider<LangDefinition>);
|
|
26
|
-
|
|
25
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
27
26
|
clear(): void;
|
|
28
27
|
private langPath;
|
|
29
28
|
replaceValue(match: string | RegExp, value: string, options?: ReplaceOptions): void;
|
package/dist/emit/assets/lang.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { arrayOrSelf } from "@adeficior/pack-resolver";
|
|
1
|
+
import { arrayOrSelf, simpleResolver } from "@adeficior/pack-resolver";
|
|
2
2
|
import { mapValues, omitBy } from "lodash-es";
|
|
3
3
|
import { createId, encodeId } from "../../common/id.js";
|
|
4
4
|
import Registry from "../../common/registry.js";
|
|
@@ -10,7 +10,7 @@ export default class LangEmitter {
|
|
|
10
10
|
constructor(registry) {
|
|
11
11
|
this.registry = registry;
|
|
12
12
|
}
|
|
13
|
-
async
|
|
13
|
+
resolver = simpleResolver(async (acceptor) => {
|
|
14
14
|
const missingCustomFiles = new Set(this.custom.keys());
|
|
15
15
|
await this.registry.forEachAsync(async (lang, id) => {
|
|
16
16
|
const allRules = this.rules.filter((rule) => {
|
|
@@ -32,14 +32,14 @@ export default class LangEmitter {
|
|
|
32
32
|
if (Object.keys(output).length > 0) {
|
|
33
33
|
missingCustomFiles.delete(encodeId(id));
|
|
34
34
|
const path = this.langPath(id);
|
|
35
|
-
acceptor(path,
|
|
35
|
+
await acceptor(path, toJson(output));
|
|
36
36
|
}
|
|
37
37
|
});
|
|
38
38
|
await Promise.all(Array.from(missingCustomFiles).map(async (id) => {
|
|
39
39
|
const path = this.langPath(createId(id));
|
|
40
|
-
acceptor(path,
|
|
40
|
+
await acceptor(path, toJson(this.custom.get(id)));
|
|
41
41
|
}));
|
|
42
|
-
}
|
|
42
|
+
});
|
|
43
43
|
clear() {
|
|
44
44
|
this.rules = [];
|
|
45
45
|
this.custom.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lang.js","sourceRoot":"","sources":["../../../src/emit/assets/lang.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lang.js","sourceRoot":"","sources":["../../../src/emit/assets/lang.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { Resolver } from "@adeficior/pack-resolver";
|
|
2
2
|
import type { IdInput, NormalizedId } from "../../common/id.js";
|
|
3
3
|
import type { Model } from "../../schema/assets/model.js";
|
|
4
4
|
import type { ClearableEmitter } from "../index.js";
|
|
@@ -14,10 +14,10 @@ export interface ModelRulesGroup {
|
|
|
14
14
|
}
|
|
15
15
|
export default class ModelEmitter implements ModelRules, ClearableEmitter {
|
|
16
16
|
private readonly custom;
|
|
17
|
+
readonly resolver: Resolver;
|
|
17
18
|
constructor(type: string);
|
|
18
|
-
add(id: IdInput, model: Model): `${string}:${string}`;
|
|
19
|
-
emit(acceptor: Acceptor): Promise<void>;
|
|
20
19
|
clear(): void;
|
|
20
|
+
add(id: IdInput, model: Model): `${string}:${string}`;
|
|
21
21
|
cubeAll(id: IdInput, texture?: `${string}:${string}`): `${string}:${string}`;
|
|
22
22
|
flat(id: IdInput, texture?: `${string}:${string}`): `${string}:${string}`;
|
|
23
23
|
cog(id: IdInput, large: boolean, texture?: `${string}:${string}`): `${string}:${string}`;
|
|
@@ -2,19 +2,19 @@ import { encodeId, prefix, suffix } from "../../common/id.js";
|
|
|
2
2
|
import CustomEmitter from "../custom.js";
|
|
3
3
|
export default class ModelEmitter {
|
|
4
4
|
custom;
|
|
5
|
+
resolver;
|
|
5
6
|
constructor(type) {
|
|
6
7
|
this.custom = new CustomEmitter((id) => `assets/${id.namespace}/models/${type}/${id.path}.json`);
|
|
8
|
+
this.resolver = this.custom.resolver;
|
|
9
|
+
}
|
|
10
|
+
// TODO helper WrappedEmitter?
|
|
11
|
+
clear() {
|
|
12
|
+
this.custom.clear();
|
|
7
13
|
}
|
|
8
14
|
add(id, model) {
|
|
9
15
|
this.custom.add(id, model);
|
|
10
16
|
return encodeId(id);
|
|
11
17
|
}
|
|
12
|
-
emit(acceptor) {
|
|
13
|
-
return this.custom.emit(acceptor);
|
|
14
|
-
}
|
|
15
|
-
clear() {
|
|
16
|
-
this.custom.clear();
|
|
17
|
-
}
|
|
18
18
|
cubeAll(id, texture = prefix(id, "block/")) {
|
|
19
19
|
return this.add(id, {
|
|
20
20
|
parent: "minecraft:block/cube_all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/emit/assets/models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,aAAa,MAAM,cAAc,CAAC;AAkBzC,MAAM,CAAC,OAAO,OAAO,YAAY;IACd,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/emit/assets/models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,aAAa,MAAM,cAAc,CAAC;AAkBzC,MAAM,CAAC,OAAO,OAAO,YAAY;IACd,MAAM,CAAC;IACf,QAAQ,CAAW;IAE5B,YAAY,IAAY;QACtB,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAC7B,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC,SAAS,WAAW,IAAI,IAAI,EAAE,CAAC,IAAI,OAAO,CAChE,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IACvC,CAAC;IAED,8BAA8B;IAC9B,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,EAAW,EAAE,KAAY;QAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC3B,OAAO,QAAQ,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,EAAW,EAAE,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC;QACjD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,MAAM,EAAE,0BAA0B;YAClC,QAAQ,EAAE;gBACR,GAAG,EAAE,OAAO;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,EAAW,EAAE,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC;QAC7C,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,MAAM,EAAE,0BAA0B;YAClC,QAAQ,EAAE;gBACR,MAAM,EAAE,OAAO;aAChB;SACF,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,EAAW,EAAE,KAAc,EAAE,OAAO,GAAG,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC;QAC7D,MAAM,QAAQ,GAAG,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;YACnC,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;oBAC9B,MAAM,EAAE,6BAA6B,GAAG,EAAE;oBAC1C,QAAQ,EAAE;wBACR,GAAG,EAAE,OAAO;wBACZ,QAAQ,EAAE,OAAO;qBAClB;iBACF,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE;oBAC9B,MAAM,EAAE,uBAAuB,GAAG,EAAE;oBACpC,QAAQ,EAAE;wBACR,KAAK,EAAE,OAAO;wBACd,QAAQ,EAAE,OAAO;qBAClB;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAO,CAAC;IACjB,CAAC;CACF"}
|
package/dist/emit/blacklist.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Logger } from "@adeficior/pack-resolver";
|
|
3
3
|
import type { IngredientFilter } from "../common/ingredient/filter.js";
|
|
4
4
|
import type { PackContext } from "../loader/context.js";
|
|
5
5
|
import type { ClearableEmitter } from "./index.js";
|
|
@@ -22,7 +22,7 @@ export default class BlacklistEmitter implements BlacklistRules, ClearableEmitte
|
|
|
22
22
|
hideEntry<T extends RegistryId>(type: T, ...entries: RegistryIdInput<T>[]): void;
|
|
23
23
|
private filterItemIds;
|
|
24
24
|
private resolveIds;
|
|
25
|
-
|
|
25
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
26
26
|
private emitJei;
|
|
27
27
|
private emitPolytone;
|
|
28
28
|
clear(): void;
|
package/dist/emit/blacklist.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { arrayOrSelf } from "@adeficior/pack-resolver";
|
|
1
|
+
import { arrayOrSelf, simpleResolver } from "@adeficior/pack-resolver";
|
|
2
2
|
import { uniq } from "lodash-es";
|
|
3
3
|
import { encodeId } from "../common/id.js";
|
|
4
4
|
import createIngredientPredicate from "../common/ingredient/filter.js";
|
|
@@ -53,7 +53,7 @@ export default class BlacklistEmitter {
|
|
|
53
53
|
];
|
|
54
54
|
return registries.flatMap((registry) => ingredient.idsFor(registry));
|
|
55
55
|
}
|
|
56
|
-
async
|
|
56
|
+
resolver = simpleResolver(async (acceptor) => {
|
|
57
57
|
const hiddenIds = uniq(this.hidden).sort();
|
|
58
58
|
if (hiddenIds.length === 0)
|
|
59
59
|
return;
|
|
@@ -63,17 +63,17 @@ export default class BlacklistEmitter {
|
|
|
63
63
|
if (this.hideModes.includes("polytone"))
|
|
64
64
|
promises.push(this.emitPolytone(acceptor, hiddenIds));
|
|
65
65
|
await Promise.all(promises);
|
|
66
|
-
}
|
|
66
|
+
});
|
|
67
67
|
async emitJei(acceptor, hiddenIds) {
|
|
68
68
|
const content = hiddenIds.join("\n");
|
|
69
69
|
const path = "jei/blacklist.cfg";
|
|
70
|
-
acceptor(path, content);
|
|
70
|
+
await acceptor(path, Promise.resolve(content));
|
|
71
71
|
}
|
|
72
72
|
async emitPolytone(acceptor, hiddenIds) {
|
|
73
73
|
const tabs = this.context.lookup.keys("minecraft:creative_mode_tab");
|
|
74
74
|
if (!tabs)
|
|
75
75
|
throw new Error("Cannot use polytone output without creative mod tab registry");
|
|
76
|
-
const content =
|
|
76
|
+
const content = toJson({
|
|
77
77
|
targets: [...tabs.values()],
|
|
78
78
|
removals: [
|
|
79
79
|
{
|
|
@@ -83,7 +83,7 @@ export default class BlacklistEmitter {
|
|
|
83
83
|
],
|
|
84
84
|
});
|
|
85
85
|
const path = "assets/generated/polytone/creative_tab_modifiers/hidden.json";
|
|
86
|
-
acceptor(path, content);
|
|
86
|
+
await acceptor(path, content);
|
|
87
87
|
}
|
|
88
88
|
clear() {
|
|
89
89
|
this.hidden = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../src/emit/blacklist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"blacklist.js","sourceRoot":"","sources":["../../src/emit/blacklist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type { BlockId } from "@adeficior/data-modifier/generated";
|
|
2
|
-
import type { Acceptor } from "@adeficior/pack-resolver";
|
|
3
2
|
import type { IdInput } from "../../common/id.js";
|
|
4
3
|
import type { BlockDefinition, BlockProperties } from "../../schema/content/blockDefinition.js";
|
|
5
4
|
import type { BlockstateRules } from "../assets/blockstates.js";
|
|
@@ -52,7 +51,7 @@ export default class BlockDefinitionEmitter extends AbstractBlockDefinitionRules
|
|
|
52
51
|
private readonly custom;
|
|
53
52
|
private filePath;
|
|
54
53
|
add<T extends BlockDefinition>(id: IdInput, definition: T): T;
|
|
55
|
-
|
|
54
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
56
55
|
clear(): void;
|
|
57
56
|
}
|
|
58
57
|
export {};
|
|
@@ -48,9 +48,7 @@ export default class BlockDefinitionEmitter extends AbstractBlockDefinitionRules
|
|
|
48
48
|
this.custom.add(id, definition);
|
|
49
49
|
return definition;
|
|
50
50
|
}
|
|
51
|
-
|
|
52
|
-
return this.custom.emit(acceptor);
|
|
53
|
-
}
|
|
51
|
+
resolver = this.custom.resolver;
|
|
54
52
|
clear() {
|
|
55
53
|
this.custom.clear();
|
|
56
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blockDefinition.js","sourceRoot":"","sources":["../../../src/emit/content/blockDefinition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blockDefinition.js","sourceRoot":"","sources":["../../../src/emit/content/blockDefinition.ts"],"names":[],"mappings":"AAQA,OAAO,aAAa,MAAM,cAAc,CAAC;AAgCzC,SAAS,iBAAiB,CAAC,IAAsB;IAC/C,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC;IACrC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,OAAgB,4BAA4B;IAE7B;IACA;IACA;IAHnB,YACmB,MAAkB,EAClB,WAA4B,EAC5B,IAAe;QAFf,WAAM,GAAN,MAAM,CAAY;QAClB,gBAAW,GAAX,WAAW,CAAiB;QAC5B,SAAI,GAAJ,IAAI,CAAW;IAC/B,CAAC;IAIJ,KAAK,CACH,EAAW,EACX,EAAE,IAAI,EAAE,GAAG,UAAU,EAA2B,EAChD,OAAgC;QAEhC,IAAI,OAAO,EAAE,KAAK,KAAK,KAAK;YAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEtD,IAAI,OAAO,EAAE,UAAU,KAAK,KAAK;YAAE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAE9D,IAAI,OAAO,EAAE,IAAI,KAAK,KAAK;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,IAAI,EAAE,IAAI,IAAI,OAAO;YACrB,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC;SAC1C,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CACD,EAAW,EACX,EACE,IAAI,EACJ,KAAK,GAAG,KAAK,EACb,GAAG,UAAU,EACiC,EAChD,OAAgC;QAEhC,IAAI,OAAO,EAAE,KAAK,KAAK,KAAK;YAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAEzD,IAAI,OAAO,EAAE,UAAU,KAAK,KAAK;YAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,OAAO,EAAE,IAAI,KAAK,KAAK;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEjD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,IAAI,EAAE,IAAI,IAAI,YAAY;YAC1B,KAAK;YACL,UAAU,EAAE,iBAAiB,CAAC,UAAU,CAAC;SAC1C,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,CAAC,OAAO,OAAO,sBACnB,SAAQ,4BAA4B;IAGnB,MAAM,GAAG,IAAI,aAAa,CAAkB,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEpE,QAAQ,CAAC,EAAM;QACrB,OAAO,WAAW,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,IAAI,OAAO,CAAC;IACzD,CAAC;IAED,GAAG,CAA4B,EAAW,EAAE,UAAa;QACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAChC,OAAO,UAAU,CAAC;IACpB,CAAC;IAEQ,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEzC,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { Acceptor } from "@adeficior/pack-resolver";
|
|
2
1
|
import type { IdInput } from "../../common/id.js";
|
|
3
2
|
import type { BlockDefinition } from "../../schema/content/blockDefinition.js";
|
|
4
3
|
import type { ItemDefinition, ItemProperties } from "../../schema/content/itemDefinition.js";
|
|
@@ -30,7 +29,7 @@ export default class ItemDefinitionEmitter implements ItemDefinitionRules, Clear
|
|
|
30
29
|
private filePath;
|
|
31
30
|
add<T extends ItemDefinition>(id: IdInput, definition: T): T;
|
|
32
31
|
clear(): void;
|
|
33
|
-
|
|
32
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
34
33
|
basic(id: IdInput, { type, ...properties }?: ExtendedItemProperties, options?: ItemDefinitionOptions): {
|
|
35
34
|
type: string;
|
|
36
35
|
properties: {
|
|
@@ -21,9 +21,7 @@ export default class ItemDefinitionEmitter {
|
|
|
21
21
|
clear() {
|
|
22
22
|
this.custom.clear();
|
|
23
23
|
}
|
|
24
|
-
|
|
25
|
-
return this.custom.emit(acceptor);
|
|
26
|
-
}
|
|
24
|
+
resolver = this.custom.resolver;
|
|
27
25
|
basic(id, { type, ...properties } = {}, options) {
|
|
28
26
|
if (options?.model !== false)
|
|
29
27
|
this.models.items.flat(id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"itemDefinition.js","sourceRoot":"","sources":["../../../src/emit/content/itemDefinition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"itemDefinition.js","sourceRoot":"","sources":["../../../src/emit/content/itemDefinition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQ5C,OAAO,aAAa,MAAM,cAAc,CAAC;AAIzC,OAAO,iCAAiC,MAAM,2BAA2B,CAAC;AAgC1E,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAMrB;IACA;IACA;IALF,MAAM,GAAG,IAAI,aAAa,CAAiB,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE3E,YACmB,MAAuB,EACvB,WAA4B,EAC5B,IAAe;QAFf,WAAM,GAAN,MAAM,CAAiB;QACvB,gBAAW,GAAX,WAAW,CAAiB;QAC5B,SAAI,GAAJ,IAAI,CAAW;IAC/B,CAAC;IAEI,QAAQ,CAAC,EAAM;QACrB,OAAO,WAAW,EAAE,CAAC,SAAS,SAAS,EAAE,CAAC,IAAI,OAAO,CAAC;IACxD,CAAC;IAED,GAAG,CAA2B,EAAW,EAAE,UAAa;QACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAChC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEQ,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEzC,KAAK,CACH,EAAW,EACX,EAAE,IAAI,EAAE,GAAG,UAAU,KAA6B,EAAE,EACpD,OAA+B;QAE/B,IAAI,OAAO,EAAE,KAAK,KAAK,KAAK;YAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzD,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,IAAI,EAAE,IAAI,IAAI,OAAO;YACrB,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAEO,qBAAqB,CAAC,EAAW,EAAE,KAA2B;QACpE,IAAI,OAAO,KAAK,KAAK,UAAU;YAAE,OAAO,KAAK,CAAC;QAC9C,MAAM,YAAY,GAAG,iCAAiC,CACpD,EAAE,EACF,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,IAAI,CACV,CAAC;QACF,OAAO,KAAK,CAAC,YAAY,CAAC,CAAC;IAC7B,CAAC;IAED,SAAS,CACP,EAAW,EACX,EACE,KAAK,EACL,IAAI,EACJ,GAAG,UAAU,EAGd,EACD,OAA+B;QAE/B,IAAI,OAAO,EAAE,KAAK,KAAK,KAAK,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAE9D,OAAO,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;YAClB,IAAI,EAAE,IAAI,IAAI,YAAY;YAC1B,KAAK,EAAE,eAAe;YACtB,UAAU;SACX,CAAC,CAAC;IACL,CAAC;CACF"}
|
package/dist/emit/custom.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Resolver } from "@adeficior/pack-resolver";
|
|
2
2
|
import type { IdInput } from "../common/id.js";
|
|
3
|
-
import type { PathProvider } from "./index.js";
|
|
4
|
-
export default class CustomEmitter<TEntry> {
|
|
3
|
+
import type { ClearableEmitter, PathProvider } from "./index.js";
|
|
4
|
+
export default class CustomEmitter<TEntry> implements ClearableEmitter {
|
|
5
5
|
private readonly pathProvider;
|
|
6
6
|
private readonly encoder;
|
|
7
7
|
constructor(pathProvider: PathProvider, encoder?: (value: TEntry) => string | Promise<string>);
|
|
@@ -10,6 +10,6 @@ export default class CustomEmitter<TEntry> {
|
|
|
10
10
|
add(id: IdInput, value: TEntry): void;
|
|
11
11
|
merge(id: IdInput, entry: TEntry, merger: (a: TEntry, b: TEntry) => TEntry): void;
|
|
12
12
|
modify(id: IdInput, factory: (existing?: TEntry) => TEntry): void;
|
|
13
|
-
|
|
13
|
+
readonly resolver: Resolver;
|
|
14
14
|
has(id: IdInput): boolean;
|
|
15
15
|
}
|
package/dist/emit/custom.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { simpleResolver } from "@adeficior/pack-resolver";
|
|
1
2
|
import { createId } from "../common/id.js";
|
|
2
3
|
import Registry from "../common/registry.js";
|
|
3
4
|
import { toJson } from "../textHelper.js";
|
|
@@ -29,12 +30,12 @@ export default class CustomEmitter {
|
|
|
29
30
|
else
|
|
30
31
|
this.add(id, factory());
|
|
31
32
|
}
|
|
32
|
-
async
|
|
33
|
+
resolver = simpleResolver(async (acceptor) => {
|
|
33
34
|
await this.customEntries.forEachAsync(async (entry, id) => {
|
|
34
35
|
const path = this.pathProvider(id);
|
|
35
|
-
acceptor(path,
|
|
36
|
+
await acceptor(path, Promise.resolve(this.encoder(entry)));
|
|
36
37
|
});
|
|
37
|
-
}
|
|
38
|
+
});
|
|
38
39
|
has(id) {
|
|
39
40
|
return this.customEntries.has(id);
|
|
40
41
|
}
|
package/dist/emit/custom.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/emit/custom.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/emit/custom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,MAAM,CAAC,OAAO,OAAO,aAAa;IAEb;IACA;IAFnB,YACmB,YAA0B,EAC1B,UAEe,MAAM;QAHrB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,YAAO,GAAP,OAAO,CAEc;IACrC,CAAC;IAEa,aAAa,GAAG,IAAI,QAAQ,EAAU,CAAC;IAExD,KAAK;QACH,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,EAAW,EAAE,KAAa;QAC5B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,EAAW,EAAE,KAAa,EAAE,MAAwC;QACxE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC3B,IAAI,QAAQ;gBAAE,OAAO,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,EAAW,EAAE,OAAsC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,QAAQ;YAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;;YACzC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/B,CAAC;IAEQ,QAAQ,GAAa,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QAC9D,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,EAAW;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;CACF"}
|
package/dist/emit/data/loot.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { type Logger, type Resolver } from "@adeficior/pack-resolver";
|
|
2
2
|
import { type CommonFilter, type Predicate } from "../../common/filters.js";
|
|
3
3
|
import type { IdInput, NormalizedId } from "../../common/id.js";
|
|
4
4
|
import type { IngredientFilter } from "../../common/ingredient/filter.js";
|
|
@@ -29,11 +29,11 @@ export default class LootTableEmitter implements LootRules, ClearableEmitter {
|
|
|
29
29
|
private readonly customTables;
|
|
30
30
|
private readonly customModifiers;
|
|
31
31
|
private readonly ruled;
|
|
32
|
+
readonly resolver: Resolver;
|
|
32
33
|
constructor(logger: Logger, lootTables: RegistryProvider<LootTable>, context: PackContext);
|
|
33
34
|
private tablePath;
|
|
34
35
|
private modifierPath;
|
|
35
36
|
clear(): void;
|
|
36
|
-
emit(acceptor: Acceptor): Promise<void>;
|
|
37
37
|
resolveIngredientTest(test: IngredientFilter): Predicate<Ingredient>;
|
|
38
38
|
private resolveLootTableTest;
|
|
39
39
|
add(id: IdInput, value: LootTable): void;
|
package/dist/emit/data/loot.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { combineResolvers, } from "@adeficior/pack-resolver";
|
|
1
2
|
import { resolveIDTest, } from "../../common/filters.js";
|
|
2
3
|
import { encodeId, prefix } from "../../common/id.js";
|
|
3
4
|
import createIngredientPredicate from "../../common/ingredient/filter.js";
|
|
@@ -21,6 +22,7 @@ export default class LootTableEmitter {
|
|
|
21
22
|
customTables = new CustomEmitter((it) => this.tablePath(it));
|
|
22
23
|
customModifiers = new CustomEmitter((it) => this.modifierPath(it));
|
|
23
24
|
ruled;
|
|
25
|
+
resolver;
|
|
24
26
|
constructor(logger, lootTables, context) {
|
|
25
27
|
this.logger = logger;
|
|
26
28
|
this.lootTables = lootTables;
|
|
@@ -28,6 +30,11 @@ export default class LootTableEmitter {
|
|
|
28
30
|
this.ruled = new RuledEmitter(this.logger, this.lootTables, (id) => this.tablePath(id), EMPTY_LOOT_TABLE,
|
|
29
31
|
// TODO also add value object here?
|
|
30
32
|
(it) => it, (id) => this.customTables.has(id));
|
|
33
|
+
this.resolver = combineResolvers([
|
|
34
|
+
this.ruled.resolver,
|
|
35
|
+
this.customTables.resolver,
|
|
36
|
+
this.customModifiers.resolver,
|
|
37
|
+
], { async: true });
|
|
31
38
|
}
|
|
32
39
|
tablePath(id) {
|
|
33
40
|
const folder = isAtLeastVersion(this.context.packFormat, "44")
|
|
@@ -43,13 +50,6 @@ export default class LootTableEmitter {
|
|
|
43
50
|
this.customModifiers.clear();
|
|
44
51
|
this.ruled.clear();
|
|
45
52
|
}
|
|
46
|
-
async emit(acceptor) {
|
|
47
|
-
await Promise.all([
|
|
48
|
-
this.ruled.emit(acceptor),
|
|
49
|
-
this.customTables.emit(acceptor),
|
|
50
|
-
this.customModifiers.emit(acceptor),
|
|
51
|
-
]);
|
|
52
|
-
}
|
|
53
53
|
resolveIngredientTest(test) {
|
|
54
54
|
return createIngredientPredicate(test, this.context);
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loot.js","sourceRoot":"","sources":["../../../src/emit/data/loot.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loot.js","sourceRoot":"","sources":["../../../src/emit/data/loot.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { RecipeSerializerId } from "@adeficior/data-modifier/generated";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Logger, Resolver } from "@adeficior/pack-resolver";
|
|
3
3
|
import { type CommonFilter } from "../../common/filters.js";
|
|
4
4
|
import type { IdInput, NormalizedId } from "../../common/id.js";
|
|
5
5
|
import type { IngredientFilter } from "../../common/ingredient/filter.js";
|
|
@@ -33,9 +33,9 @@ export default class RecipeEmitter implements RecipeRules, ClearableEmitter {
|
|
|
33
33
|
private readonly serializer;
|
|
34
34
|
private readonly custom;
|
|
35
35
|
private readonly ruled;
|
|
36
|
+
readonly resolver: Resolver;
|
|
36
37
|
constructor(logger: Logger, registry: RegistryProvider<RecipeHolder>, context: PackContext, serializer: RecipeSerializer);
|
|
37
38
|
private recipePath;
|
|
38
|
-
emit(acceptor: Acceptor): Promise<void>;
|
|
39
39
|
private createIngredientPredicate;
|
|
40
40
|
private createResultPredicate;
|
|
41
41
|
private resolveRecipeTest;
|
package/dist/emit/data/recipe.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { exists } from "@adeficior/pack-resolver";
|
|
1
|
+
import { combineResolvers, exists } from "@adeficior/pack-resolver";
|
|
2
2
|
import { resolveIDTest, } from "../../common/filters.js";
|
|
3
3
|
import { encodeId } from "../../common/id.js";
|
|
4
4
|
import createIngredientPredicate from "../../common/ingredient/filter.js";
|
|
@@ -32,12 +32,14 @@ export default class RecipeEmitter {
|
|
|
32
32
|
serializer;
|
|
33
33
|
custom = new CustomEmitter((it) => this.recipePath(it));
|
|
34
34
|
ruled;
|
|
35
|
+
resolver;
|
|
35
36
|
constructor(logger, registry, context, serializer) {
|
|
36
37
|
this.logger = logger;
|
|
37
38
|
this.registry = registry;
|
|
38
39
|
this.context = context;
|
|
39
40
|
this.serializer = serializer;
|
|
40
41
|
this.ruled = new RuledEmitter(this.logger, this.registry, (id) => this.recipePath(id), EMPTY_RECIPE, (it) => this.serializer.serialize(it), (id) => this.custom.has(id));
|
|
42
|
+
this.resolver = combineResolvers([this.ruled.resolver, this.custom.resolver], { async: true });
|
|
41
43
|
}
|
|
42
44
|
recipePath(id) {
|
|
43
45
|
const folder = isAtLeastVersion(this.context.packFormat, "44")
|
|
@@ -45,9 +47,6 @@ export default class RecipeEmitter {
|
|
|
45
47
|
: "recipes";
|
|
46
48
|
return `data/${id.namespace}/${folder}/${id.path}.json`;
|
|
47
49
|
}
|
|
48
|
-
async emit(acceptor) {
|
|
49
|
-
await Promise.all([this.ruled.emit(acceptor), this.custom.emit(acceptor)]);
|
|
50
|
-
}
|
|
51
50
|
createIngredientPredicate(filter) {
|
|
52
51
|
if (!filter)
|
|
53
52
|
return () => true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../src/emit/data/recipe.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../src/emit/data/recipe.ts"],"names":[],"mappings":"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"}
|
package/dist/emit/data/tags.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { InferIds, RegistryId } from "@adeficior/data-modifier/generated";
|
|
2
|
-
import
|
|
2
|
+
import { type Logger } from "@adeficior/pack-resolver";
|
|
3
3
|
import { type CommonFilter } from "../../common/filters.js";
|
|
4
4
|
import type { NormalizedId, TagInput } from "../../common/id.js";
|
|
5
5
|
import type TagsLoader from "../../loader/tags.js";
|
|
@@ -30,7 +30,7 @@ export default class TagEmitter implements TagRules, ClearableEmitter {
|
|
|
30
30
|
readonly fluids: ScopedTagRules<"minecraft:fluid">;
|
|
31
31
|
constructor(logger: Logger, registry: TagsLoader, options: TagEmitterOptions);
|
|
32
32
|
clear(): void;
|
|
33
|
-
|
|
33
|
+
readonly resolver: import("@adeficior/pack-resolver").Resolver<import("@adeficior/pack-resolver").Acceptable>;
|
|
34
34
|
add<T extends RegistryId>(registry: T, id: TagInput, value: TagEntry<InferIds<T>>): void;
|
|
35
35
|
remove<T extends RegistryId>(registry: T, id: TagInput, test: CommonFilter<NormalizedId<InferIds<T>>>): void;
|
|
36
36
|
scoped<T extends RegistryId>(registry: T, folder?: string): ScopedTagRules<T>;
|
package/dist/emit/data/tags.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { simpleResolver } from "@adeficior/pack-resolver";
|
|
1
2
|
import { resolveIDTest } from "../../common/filters.js";
|
|
2
3
|
import { createId, encodeId } from "../../common/id.js";
|
|
3
4
|
import Registry from "../../common/registry.js";
|
|
@@ -84,17 +85,17 @@ export default class TagEmitter {
|
|
|
84
85
|
clear() {
|
|
85
86
|
this.emitters.forEach((it) => it.clear());
|
|
86
87
|
}
|
|
87
|
-
async
|
|
88
|
+
resolver = simpleResolver(async (acceptor) => {
|
|
88
89
|
const emitters = Array.from(this.emitters.values());
|
|
89
90
|
await Promise.all(emitters.flatMap((scoped) => scoped.getModified(async (id, definition) => {
|
|
90
91
|
const path = `data/${id.namespace}/tags/${scoped.folder}/${id.path}.json`;
|
|
91
|
-
acceptor(path,
|
|
92
|
+
await acceptor(path, toJson({
|
|
92
93
|
...definition,
|
|
93
94
|
values: definition.values && orderTagEntries(definition.values),
|
|
94
95
|
remove: definition.remove && orderTagEntries(definition.remove),
|
|
95
96
|
}));
|
|
96
97
|
})));
|
|
97
|
-
}
|
|
98
|
+
});
|
|
98
99
|
add(registry, id, value) {
|
|
99
100
|
this.scoped(registry).add(id, value);
|
|
100
101
|
}
|