diff --git a/.gitattributes b/.gitattributes index 36518d989..e90fa0ec2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,3 @@ -/.yarn/** linguist-vendored -/.yarn/releases/* binary -/.yarn/plugins/**/* binary -/.pnp.* binary linguist-generated - datapacks/gu/** linguist-vendored *.ajblueprint linguist-language=JSON diff --git a/.gitignore b/.gitignore index e48057a32..6c85162e2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # yarn dependencies .yarn -.pnp* +node_modules # auto-ajexport related **/last_exported_hashes.json diff --git a/.vscode/settings.json b/.vscode/settings.json index c220945ad..fe4b7dd3d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,5 @@ { "search.exclude": { - "**/.yarn": true, - "**/.pnp.*": true - }, - "eslint.nodePath": ".yarn/sdks", - "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs" + "**/.yarn": true + } } diff --git a/.yarnrc.yml b/.yarnrc.yml index a1f8fdcdc..5c2b2aeeb 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,2 +1,3 @@ # save exact npm package by default when running `yarn add` defaultSemverRangePrefix: '' +nodeLinker: node-modules diff --git a/README.md b/README.md index 76d361653..7087b3e04 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,7 @@ Since then I've gained a lot of skills both in Minecraft map development and in 1. Install [`Node.js >= 16.10`](https://nodejs.org/en/download) 2. Install [`Yarn 3.6.3`](https://v3.yarnpkg.com/getting-started/install) by running `corepack enable` 3. Initialize the repo by running `yarn` -4. Enable Yarn's Plug'n'Play with VSCode by running `yarn dlx @yarnpkg/sdks vscode` -5. Copy-paste `.env.EXAMPLE` and rename it to `.env` +4. Copy-paste `.env.EXAMPLE` and rename it to `.env` 1. Replace all the paths in your new `.env` with paths on your local machine -- e.g. replacing `afro` with ``. @@ -48,7 +47,7 @@ Since then I've gained a lot of skills both in Minecraft map development and in 1. **Make sure to point to the doubly nested folder** -- e.g. `.../versions/1.21/1.21` -6. Run `yarn down` to extract the Minecraft world to your local Minecraft's `saves` directory (so you can open the world in-game) +5. Run `yarn down` to extract the Minecraft world to your local Minecraft's `saves` directory (so you can open the world in-game) diff --git a/omegaflowey.code-workspace b/omegaflowey.code-workspace index 74943c380..8e10207df 100644 --- a/omegaflowey.code-workspace +++ b/omegaflowey.code-workspace @@ -143,6 +143,8 @@ ], "gitmoji.showEmojiCode": true, - "terminal.integrated.cwd": "." + "terminal.integrated.cwd": ".", + + "typescript.enablePromptUseWorkspaceTsdk": true } } diff --git a/telemetry/package.json b/telemetry/package.json index 6c80e6245..2bdcc5dac 100644 --- a/telemetry/package.json +++ b/telemetry/package.json @@ -8,7 +8,7 @@ "license": "MIT", "scripts": { "build": "node scripts/esbuild.cjs", - "start": "NODE_OPTIONS='--require ./.pnp.cjs' electron ./dist/main.js" + "start": "electron ./dist/main.js" }, "devDependencies": { "electron": "33.0.2",