diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c53d6061..8397c7ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,8 @@ jobs: uses: actions/checkout@master - name: Install pnpm run: npm i -g pnpm - - run: pnpm install + # todo this needs investigating fixing + - run: pnpm install --no-frozen-lockfile - run: pnpm lint - run: pnpm check-build - run: nohup pnpm prod-start & diff --git a/package.json b/package.json index e8d9f137..6c601a4c 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "jszip": "^3.10.1", "lit": "^2.8.0", "lodash-es": "^4.17.21", + "minecraft-assets": "^1.9.1", "minecraft-data": "^3.0.0", "net-browserify": "github:zardoy/prismarinejs-net-browserify", "peerjs": "^1.5.0", @@ -79,7 +80,7 @@ "npm-run-all": "^4.1.5", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", - "prismarine-viewer": "./prismarine-viewer", + "prismarine-viewer": "link:prismarine-viewer", "process": "github:PrismarineJS/node-process", "rimraf": "^5.0.1", "stream-browserify": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e68306ff..dc8d1cd0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,6 +75,9 @@ importers: lodash-es: specifier: ^4.17.21 version: 4.17.21 + minecraft-assets: + specifier: ^1.9.1 + version: 1.9.1 minecraft-data: specifier: 3.45.0 version: 3.45.0 @@ -182,7 +185,7 @@ importers: specifier: ^1.0.1 version: 1.0.1 prismarine-viewer: - specifier: ./prismarine-viewer + specifier: link:prismarine-viewer version: link:prismarine-viewer process: specifier: github:PrismarineJS/node-process @@ -8446,6 +8449,10 @@ packages: resolution: {integrity: sha512-KtvIRd9gcKlxbvrswGv1Ap9k7tVs//QW2ukp+8vJ28miYwkhUmYfjTZyElIG8KUXV/46wL2kDzLH8SJbXQ56Mg==} dev: true + /minecraft-assets@1.9.1: + resolution: {integrity: sha512-vYKN5fhMilPafH0CnmYQBCP8zW0Fn3FVvPM25w7HC2PiXZQsP/p3Yl5QdCKjgqTk1LddNdmrw4notNoE6exVRQ==} + dev: false + /minecraft-data@3.45.0: resolution: {integrity: sha512-LJMKveMXNjQKk48mDEhFgjDQGBAGa0xKDXjsJ865eB2qdFei73vgu1YXQbyK3Zlg5a0cIgfvyHKG8Pf5s6XFqg==} diff --git a/prismarine-viewer/package.json b/prismarine-viewer/package.json index 51a5ff7c..603c1281 100644 --- a/prismarine-viewer/package.json +++ b/prismarine-viewer/package.json @@ -25,6 +25,7 @@ "compression": "^1.7.4", "express": "^4.17.1", "minecraft-data": "^3.0.0", + "minecrafthawkeye": "^1.3.6", "prismarine-block": "^1.7.3", "prismarine-chunk": "^1.22.0", "prismarine-world": "^3.3.1", @@ -45,7 +46,6 @@ "lil-gui": "^0.18.2", "minecraft-assets": "^1.9.0", "minecraft-wrap": "^1.3.0", - "minecrafthawkeye": "^1.2.5", "mineflayer": "^4.0.0", "mineflayer-pathfinder": "^2.0.0", "prismarine-schematic": "^1.2.0",