From d72754ac49a4cbea9274924c0680dd0c093b19e9 Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Fri, 11 Nov 2022 20:21:59 +0900 Subject: [PATCH 1/8] npm to pnpm --- package-lock.json | 13 ------------- pnpm-lock.yaml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 13 deletions(-) delete mode 100644 package-lock.json create mode 100644 pnpm-lock.yaml diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 5ef35147..00000000 --- a/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "texture", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@actions/core": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz", - "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA==" - } - } -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml new file mode 100644 index 00000000..7a0afc13 --- /dev/null +++ b/pnpm-lock.yaml @@ -0,0 +1,32 @@ +lockfileVersion: 5.4 + +specifiers: + '@actions/core': ^1.2.6 + +dependencies: + '@actions/core': 1.10.0 + +packages: + + /@actions/core/1.10.0: + resolution: {integrity: sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==} + dependencies: + '@actions/http-client': 2.0.1 + uuid: 8.3.2 + dev: false + + /@actions/http-client/2.0.1: + resolution: {integrity: sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==} + dependencies: + tunnel: 0.0.6 + dev: false + + /tunnel/0.0.6: + resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==} + engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} + dev: false + + /uuid/8.3.2: + resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} + hasBin: true + dev: false From d89b8b90edd45e7131e105bbef971ca9c859fd51 Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Fri, 11 Nov 2022 20:22:03 +0900 Subject: [PATCH 2/8] Update .gitignore --- .gitignore | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af04f743..f79aac93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,136 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + .DS_store .github -node_modules/ models.csv fetch.bat -first_fetch.bat \ No newline at end of file +first_fetch.bat From f8ba7024c27bf5a483e26e8c4d87134896ccc42a Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Fri, 11 Nov 2022 20:23:47 +0900 Subject: [PATCH 3/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dcf79603..5b4b9a27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: new release -# Controls when the action will run. +# Controls when the action will run. on: # Allows you to run this workflow manually from the Actions tab From 3ba1c2a1544373bee7724e7326ad05403539f328 Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Fri, 11 Nov 2022 20:26:09 +0900 Subject: [PATCH 4/8] Update main.yml --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b4b9a27..2868c7be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,10 +26,10 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: '12.x' - - name: install dependencies + node-version: '16.x' + - name: install dependencies(pnpm) run: | - npm ci + pnpm install --frozen-lockfile - name: build texture pack id: build run: | @@ -53,7 +53,7 @@ jobs: run: | shasum ./release.zip | cut -c 1-40 > hash - name: Upload Release Asset - id: upload-release-asset + id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f75df4cd4b5bc912cc00003b5cf36c2334d5c3a0 Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Fri, 11 Nov 2022 20:27:35 +0900 Subject: [PATCH 5/8] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2868c7be..2897e7d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,8 @@ jobs: uses: actions/setup-node@v1 with: node-version: '16.x' + - name: Setup pnpm + uses: pnpm/action-setup@v2.2.2 - name: install dependencies(pnpm) run: | pnpm install --frozen-lockfile From 050d895317827eae4923f4819e34346d37320685 Mon Sep 17 00:00:00 2001 From: Nakatai-0322 Date: Sun, 13 Nov 2022 11:46:30 +0900 Subject: [PATCH 6/8] Update main.yml --- .github/workflows/main.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2897e7d6..201eb251 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,10 +28,24 @@ jobs: with: node-version: '16.x' - name: Setup pnpm - uses: pnpm/action-setup@v2.2.2 + uses: pnpm/action-setup@v2 + with: + version: 7 + - name: Get pnpm store directory + id: pnpm-cache + run: | + echo "::set-output name=pnpm_cache_dir::$(pnpm store path)" + + - name: Setup pnpm cache + uses: actions/cache@v3 + with: + path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- - name: install dependencies(pnpm) run: | - pnpm install --frozen-lockfile + pnpm i --frozen-lockfile - name: build texture pack id: build run: | From 555522f22043d303687212eed8724e6c88e7d8f6 Mon Sep 17 00:00:00 2001 From: Alpha9n <42644369+Alpha9n@users.noreply.github.com> Date: Sat, 24 Dec 2022 21:04:57 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=82=B9=E3=83=9E?= =?UTF-8?q?=E3=82=B9=E3=83=97=E3=83=AC=E3=82=BC=E3=83=B3=E3=83=88=E9=96=A2?= =?UTF-8?q?=E9=80=A3=E3=81=AE=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minecraft/models/foods/seafoods/uni.json | 609 ++++++++++++++++++ pack/assets/minecraft/models/item/cookie.json | 3 +- 2 files changed, 611 insertions(+), 1 deletion(-) create mode 100644 pack/assets/minecraft/models/foods/seafoods/uni.json diff --git a/pack/assets/minecraft/models/foods/seafoods/uni.json b/pack/assets/minecraft/models/foods/seafoods/uni.json new file mode 100644 index 00000000..76d62b21 --- /dev/null +++ b/pack/assets/minecraft/models/foods/seafoods/uni.json @@ -0,0 +1,609 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/beehive_end", + "1": "block/orange_concrete_powder", + "particle": "block/beehive_end" + }, + "elements": [ + { + "from": [2, 3, 2], + "to": [14, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "from": [1, 1, 1], + "to": [2, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "south": {"uv": [15, 0, 16, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 1, 1], + "to": [15, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 1, 14], + "to": [14, 5, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "south": {"uv": [1, 0, 15, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#0"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [2, 1, 1], + "to": [14, 5, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]}, + "faces": { + "north": {"uv": [1, 0, 15, 5], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "south": {"uv": [1, 0, 15, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 4], "texture": "#missing"}, + "up": {"uv": [1, 0, 15, 1], "texture": "#0"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#0"} + } + }, + { + "from": [2, 4.5, 1], + "to": [4, 5.5, 4], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [2, 5, 3.25], + "to": [4, 6, 6.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [4.25, 4.25, 1.25], + "to": [6.25, 5.25, 4.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [6.25, 5.25, 1.75], + "to": [8.25, 6.25, 4.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [5, 4.75, 3.25], + "to": [7, 5.75, 6.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [3, 5.25, 3.75], + "to": [5, 6.25, 6.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [7, 4.5, 0.75], + "to": [9, 5.5, 3.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [9.25, 4.25, 1.25], + "to": [11.25, 5.25, 4.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [7.25, 5.5, 4.75], + "to": [9.25, 6.5, 7.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [8.25, 5.25, 3.75], + "to": [10.25, 6.25, 6.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [10.25, 5.5, 4.25], + "to": [12.25, 6.5, 7.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [10.25, 5, 2], + "to": [12.25, 6, 5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [12.25, 4.75, 2.25], + "to": [14.25, 5.75, 5.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [12, 5.75, 4.5], + "to": [14, 6.75, 7.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [12, 6.5, 6.75], + "to": [14, 7.5, 9.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [9.75, 5.75, 4.75], + "to": [11.75, 6.75, 7.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [7.75, 6.75, 5.25], + "to": [9.75, 7.75, 8.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [9, 6.25, 6.75], + "to": [11, 7.25, 9.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [11, 6.75, 7.25], + "to": [13, 7.75, 10.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [7, 6, 4.25], + "to": [9, 7, 7.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [4.75, 5.75, 4.75], + "to": [6.75, 6.75, 7.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [5.75, 6.75, 7.25], + "to": [7.75, 7.75, 10.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [3.75, 7, 7.75], + "to": [5.75, 8, 10.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [3.75, 6.5, 5.5], + "to": [5.75, 7.5, 8.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [1.75, 6.25, 5.75], + "to": [3.75, 7.25, 8.75], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 4, 3]}, + "faces": { + "north": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "east": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "south": {"uv": [2, 0, 0, 1], "texture": "#1"}, + "west": {"uv": [3, 0, 0, 1], "texture": "#1"}, + "up": {"uv": [3, 0, 0, 4], "texture": "#1"}, + "down": {"uv": [3, 0, 0, 4], "texture": "#1"} + } + }, + { + "from": [2, 7.25, 7.25], + "to": [4, 8.25, 10.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [2, 7.75, 9.5], + "to": [4, 8.75, 12.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [7, 7.75, 8], + "to": [9, 8.75, 11], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [5, 7.5, 9.5], + "to": [7, 8.5, 12.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [3, 8, 10], + "to": [5, 9, 13], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [7, 7.25, 7], + "to": [9, 8.25, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [9.25, 7, 7.5], + "to": [11.25, 8, 10.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [7.25, 8.25, 10.25], + "to": [9.25, 9.25, 13.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [9.25, 8, 10], + "to": [11.25, 9, 13], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [11.5, 8.25, 10], + "to": [13.5, 9.25, 13], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [10.25, 7.75, 8.25], + "to": [12.25, 8.75, 11.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + }, + { + "from": [12.25, 7.5, 8.5], + "to": [14.25, 8.5, 11.5], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 4, 3]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#1"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#1"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [70, 0, 0], + "translation": [-1.75, 1.75, 1.75], + "scale": [0.33, 0.33, 0.33] + }, + "thirdperson_lefthand": { + "rotation": [70, 0, 0], + "translation": [-1.75, 1.75, 1.75], + "scale": [0.33, 0.33, 0.33] + }, + "firstperson_righthand": { + "translation": [2.5, 4.25, 0] + }, + "firstperson_lefthand": { + "translation": [2.5, 4.25, 0] + }, + "ground": { + "translation": [0, 5.5, 0], + "scale": [0.49, 0.49, 0.49] + }, + "gui": { + "rotation": [32, 29, 0], + "translation": [0, 2.25, 0], + "scale": [0.72, 0.72, 0.72] + }, + "head": { + "translation": [0, -23.75, 0], + "scale": [1.19, 1.19, 1.19] + }, + "fixed": { + "rotation": [90, 0, -180], + "translation": [0, 0, -6.75] + } + }, + "groups": [ + { + "name": "box", + "origin": [8, 0.5, 8], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [0, 1, 2, 3, 4] + }, + { + "name": "uni", + "origin": [3, 4, 3], + "color": 0, + "nbt": "{}", + "armAnimationEnabled": false, + "children": [5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41] + } + ] +} \ No newline at end of file diff --git a/pack/assets/minecraft/models/item/cookie.json b/pack/assets/minecraft/models/item/cookie.json index 4f88a2e6..d45ffa3e 100644 --- a/pack/assets/minecraft/models/item/cookie.json +++ b/pack/assets/minecraft/models/item/cookie.json @@ -15,6 +15,7 @@ {"predicate": {"custom_model_data":8}, "model":"foods/cut_fruits/melon"}, {"predicate": {"custom_model_data":9}, "model":"foods/cut_fruits/pineapple"}, {"predicate": {"custom_model_data":10}, "model":"foods/pumpkin_candy"}, - {"predicate": {"custom_model_data":11}, "model":"foods/jellyfish/water_jellyfish"} + {"predicate": {"custom_model_data":11}, "model":"foods/jellyfish/water_jellyfish"}, + {"predicate": {"custom_model_data":12}, "model":"foods/seafoods/uni"} ] } From 0f7029ba361957253a4ca1b062d99d2b0203e747 Mon Sep 17 00:00:00 2001 From: Alpha9n <42644369+Alpha9n@users.noreply.github.com> Date: Sat, 24 Dec 2022 21:12:22 +0900 Subject: [PATCH 8/8] Update pack.mcmeta --- pack/pack.mcmeta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack/pack.mcmeta b/pack/pack.mcmeta index 4ea7cec7..e4e5250d 100644 --- a/pack/pack.mcmeta +++ b/pack/pack.mcmeta @@ -1,7 +1,7 @@ { "pack":{ "pack_format": 6, - "pack_version": "v1.17.7", - "description": "F-Tex %pack_version% §6ハロウィン§eアップデート" + "pack_version": "v1.18.0", + "description": "F-Tex %pack_version% §cクリスマス§aアップデート" } }