@spyglassmc/java-edition 0.3.0 → 0.3.1

package/lib/dependency/index.d.ts

@@ -18,13 +18,11 @@ interface GetMcmetaSummaryResult extends Partial<McmetaSummary> {
  */
 export declare function getMcmetaSummary(externals: core.Externals, downloader: core.Downloader, logger: core.Logger, version: string, isLatest: boolean, source: string, overridePaths?: core.EnvConfig['mcmetaSummaryOverrides']): Promise<GetMcmetaSummaryResult>;
 /**
- * @param version An already resolved version identifier.
- *
  * @throws Network/file system errors.
  *
  * @returns
  * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
  * 	- `uri`: URI to the `.tar.gz` file.
  */
-export declare function getVanillaMcdoc(externals: core.Externals, downloader: core.Downloader, version: string, isLatest: boolean): Promise<core.Dependency>;
+export declare function getVanillaMcdoc(downloader: core.Downloader): Promise<core.Dependency>;
 //# sourceMappingURL=index.d.ts.map

package/lib/dependency/index.js

@@ -102,9 +102,14 @@ function getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref) {
     };
 }
 /**
+ * Download data from a GitHub repository with tags corresponding to Minecraft versions.
+ * The downloaded data will be cached based on the commit SHA of the respective tag.
+ *
+ * If `isLatest` if `true`, instead of finding the tag corresponding to the given version, the default branch will be used.
+ *
  * @returns The URI to the `.tar.gz` file.
  */
-async function downloadGitHubRepo({ defaultBranch, downloader, externals, getTag, repo, isLatest, owner, version }) {
+async function downloadGitHubRepo({ defaultBranch, downloader, getTag, repo, isLatest, owner, version }) {
     const ref = getGitRef({ defaultBranch, getTag, isLatest, version });
     const out = {};
     await downloader.download({
@@ -119,27 +124,28 @@ async function downloadGitHubRepo({ defaultBranch, downloader, externals, getTag
 }
 /* istanbul ignore next */
 /**
- * @param version An already resolved version identifier.
- *
  * @throws Network/file system errors.
  *
  * @returns
  * 	- `startDepth`: The amount of level to skip when unzipping the tarball.
  * 	- `uri`: URI to the `.tar.gz` file.
  */
-export async function getVanillaMcdoc(externals, downloader, version, isLatest) {
+export async function getVanillaMcdoc(downloader) {
+    const owner = 'SpyglassMC';
+    const repo = 'vanilla-mcdoc';
+    const ref = 'refs/heads/main';
+    const out = {};
+    await downloader.download({
+        id: 'mc-je/vanilla-mcdoc.tar.gz',
+        uri: `https://api.github.com/repos/${owner}/${repo}/tarball/${ref}`,
+        transformer: b => b,
+        cache: getCacheOptionsBasedOnGitHubCommitSha(owner, repo, ref),
+        options: GitHubApiDownloadOptions,
+        ttl: DownloaderTtl,
+    }, out);
     return {
         info: { startDepth: 1 },
-        uri: await downloadGitHubRepo({
-            defaultBranch: 'main',
-            downloader,
-            externals,
-            getTag: v => v,
-            isLatest,
-            owner: 'SpyglassMC',
-            repo: 'vanila-mcdoc',
-            version,
-        }),
+        uri: out.cacheUri,
     };
 }
 //# sourceMappingURL=index.js.map

package/lib/index.js

@@ -34,7 +34,7 @@ export const initialize = async (ctx) => {
     }
     const packMcmeta = await getPackMcmeta();
     const { release, id: version, isLatest } = resolveConfiguredVersion(config.env.gameVersion, { packMcmeta, versions });
-    meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(externals, downloader, version, isLatest));
+    meta.registerDependencyProvider('@vanilla-mcdoc', () => getVanillaMcdoc(downloader));
     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.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/java-edition",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,12 +17,12 @@
     "release:dry": "npm publish --dry-run"
   },
   "dependencies": {
-    "@spyglassmc/core": "0.3.0",
-    "@spyglassmc/json": "0.3.0",
+    "@spyglassmc/core": "0.4.0",
+    "@spyglassmc/json": "0.3.1",
     "@spyglassmc/locales": "0.3.0",
-    "@spyglassmc/mcfunction": "0.2.1",
-    "@spyglassmc/mcdoc": "0.3.0",
-    "@spyglassmc/nbt": "0.3.0"
+    "@spyglassmc/mcfunction": "0.2.2",
+    "@spyglassmc/mcdoc": "0.3.1",
+    "@spyglassmc/nbt": "0.3.1"
   },
   "devDependencies": {
     "fast-glob": "^3.2.5",