@spyglassmc/java-edition 0.1.1 → 0.2.0

package/lib/index.js

@@ -1,88 +1,65 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialize = exports.mcf = exports.json = exports.dependency = void 0;
-const core = __importStar(require("@spyglassmc/core"));
-const nbt = __importStar(require("@spyglassmc/nbt"));
-const nbtdoc = __importStar(require("@spyglassmc/nbtdoc"));
-const binder_1 = require("./binder");
-const dependency_1 = require("./dependency");
-const jeJson = __importStar(require("./json"));
-const jeMcf = __importStar(require("./mcfunction"));
-exports.dependency = __importStar(require("./dependency"));
-exports.json = __importStar(require("./json"));
-exports.mcf = __importStar(require("./mcfunction"));
-const initialize = async (ctx) => {
+import * as core from '@spyglassmc/core';
+import * as mcdoc from '@spyglassmc/mcdoc';
+import * as nbt from '@spyglassmc/nbt';
+import { uriBinder } from './binder/index.js';
+import { getMcmetaSummary, getVanillaMcdoc, getVersions, PackMcmeta, resolveConfiguredVersion, symbolRegistrar } from './dependency/index.js';
+import * as jeJson from './json/index.js';
+import * as jeMcf from './mcfunction/index.js';
+export * as dependency from './dependency/index.js';
+export * as json from './json/index.js';
+export * as mcf from './mcfunction/index.js';
+export const initialize = async (ctx) => {
+    const { config, downloader, externals, logger, meta, projectRoot } = ctx;
     async function getPackMcmeta() {
         let ans;
         const uri = `${projectRoot}pack.mcmeta`;
         try {
-            const data = await core.fileUtil.readJson(uri);
-            dependency_1.PackMcmeta.assert(data);
+            const data = await core.fileUtil.readJson(externals, uri);
+            PackMcmeta.assert(data);
             ans = data;
         }
         catch (e) {
-            if (!core.isEnoent(e)) {
+            if (!externals.error.isKind(e, 'ENOENT')) {
                 // `pack.mcmeta` exists but broken. Log an error.
                 logger.error(`[je.initialize] Failed loading pack.mcmeta “${uri}”`, e);
             }
         }
         return ans;
     }
-    const { config, downloader, logger, meta, projectRoot } = ctx;
-    meta.registerUriBinder(binder_1.uriBinder);
-    const versions = await (0, dependency_1.getVersions)(ctx.downloader);
+    meta.registerUriBinder(uriBinder);
+    const versions = await getVersions(ctx.externals, ctx.downloader);
     if (!versions) {
         ctx.logger.error('[je-initialize] Failed loading game version list. Expect everything to be broken.');
         return;
     }
     const packMcmeta = await getPackMcmeta();
-    const { major, id: version, isLatest } = (0, dependency_1.resolveConfiguredVersion)(config.env.gameVersion, { packMcmeta, versions });
-    meta.registerDependencyProvider('@mc-nbtdoc', () => (0, dependency_1.getMcNbtdoc)(downloader, version, isLatest));
-    const summary = await (0, dependency_1.getMcmetaSummary)(downloader, logger, version, isLatest, config.env.dataSource, config.env.mcmetaSummaryOverrides);
+    const { release, id: version, isLatest } = resolveConfiguredVersion(config.env.gameVersion, { packMcmeta, versions });
+    meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(externals, downloader, version, isLatest));
+    const summary = await getMcmetaSummary(ctx.externals, downloader, logger, version, isLatest, config.env.dataSource, config.env.mcmetaSummaryOverrides);
     if (!summary.blocks || !summary.commands || !summary.fluids || !summary.registries) {
         ctx.logger.error('[je-initialize] Failed loading mcmeta summaries. Expect everything to be broken.');
         return;
     }
     meta.registerSymbolRegistrar('mcmeta-summary', {
         checksum: summary.checksum,
-        registrar: (0, dependency_1.symbolRegistrar)(summary),
+        registrar: symbolRegistrar(summary),
     });
     meta.registerLinter('nameOfNbtKey', {
         configValidator: core.linter.configValidator.nameConvention,
         linter: core.linter.nameConvention('value'),
         nodePredicate: n => (
-        // nbt compound keys without nbtdoc definition.
+        // nbt compound keys without mcdoc definition.
         (!n.symbol && n.parent?.parent?.type === 'nbt:compound' && core.PairNode.is(n.parent) && n.type === 'string' && n.parent.key === n) ||
-            // nbt path keys without nbtdoc definition.
+            // nbt path keys without mcdoc definition.
             (!n.symbol && n.parent?.type === 'nbt:path' && n.type === 'string') ||
-            // nbtdoc compound key definition outside of `::minecraft` modules.
-            (nbtdoc.CompoundFieldNode.is(n.parent) && nbtdoc.CompoundFieldKey.is(n) && !n.symbol?.path[0]?.startsWith('::minecraft'))),
+            // mcdoc compound key definition outside of `::minecraft` modules.
+            (mcdoc.StructFieldNode.is(n.parent) && mcdoc.StructKeyNode.is(n) && !n.symbol?.path[0]?.startsWith('::minecraft'))),
     });
     jeJson.initialize(ctx);
-    jeMcf.initialize(ctx, summary.commands, major);
+    jeMcf.initialize(ctx, summary.commands, release);
     nbt.initialize(ctx);
     return {
-        loadedVersion: major,
+        loadedVersion: release,
     };
 };
-exports.initialize = initialize;
 //# sourceMappingURL=index.js.map

package/lib/json/checker/data/advancement.d.ts

@@ -1,14 +1,14 @@
-export declare const item_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const block_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const fluid_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const location_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const distance_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const mob_effect_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const statistic_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const player_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const entity_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const damage_source_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const damage_predicate: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const criterion: import("@spyglassmc/json/lib/checker").JsonChecker;
-export declare const advancement: import("@spyglassmc/json/lib/checker").JsonChecker;
+export declare const item_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const block_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const fluid_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const location_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const distance_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const mob_effect_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const statistic_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const player_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const entity_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const damage_source_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const damage_predicate: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const criterion: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
+export declare const advancement: import("@spyglassmc/json/lib/checker/JsonChecker.js").JsonChecker;
 //# sourceMappingURL=advancement.d.ts.map