nanakura/moeka-project
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

fix(pixi-live2d-display): should ignore items_pinned_to_model.json file

Browse Source
This commit is contained in:
Neko Ayaka
2026-03-10 19:23:35 +08:00
parent 9cee673a9b
commit f42c56e769
3 changed files with 154 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/pixi-live2d-display.patch
+144
View File
@@ -0,0 +1,144 @@
diff --git a/core/README.md b/core/README.md
deleted file mode 100644
index ad383747237ee1a22ce39d01fbc7e77ac94b8e47..0000000000000000000000000000000000000000
diff --git a/core/live2d.d.ts b/core/live2d.d.ts
deleted file mode 100644
index 0283512ed1c9ea01d7dd1b67b76d660237b453e8..0000000000000000000000000000000000000000
diff --git a/cubism/.vscode/extensions.json b/cubism/.vscode/extensions.json
deleted file mode 100644
index fda5ad57b9567b939382ba15fb1d3b9f1fecf77e..0000000000000000000000000000000000000000
diff --git a/cubism/.vscode/tasks.json b/cubism/.vscode/tasks.json
deleted file mode 100644
index 7cd3fffed85da69d5af154f63480bce8766a038f..0000000000000000000000000000000000000000
diff --git a/dist/cubism2.es.js b/dist/cubism2.es.js
index 0d40d5d40533881d154e3c2cdda9b360c57eaaa6..8dbdb1b36e2da42da264dc3533523e61745102f7 100644
--- a/dist/cubism2.es.js
+++ b/dist/cubism2.es.js
@@ -1373,7 +1373,7 @@ const _FileLoader = class {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -1458,7 +1458,7 @@ const _ZipLoader = class {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
diff --git a/dist/cubism2.js b/dist/cubism2.js
index c3db490f8dbfdd63ad40648fe0e0325604f22e95..4b452db0b109ba7deaddf397ef351ae7bcfe145c 100644
--- a/dist/cubism2.js
+++ b/dist/cubism2.js
@@ -1373,7 +1373,7 @@ var __async = (__this, __arguments, generator) => {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -1458,7 +1458,7 @@ var __async = (__this, __arguments, generator) => {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
diff --git a/dist/cubism4.es.js b/dist/cubism4.es.js
index f21619f5794c00542bb2a9df340e50d4453a0367..38bd069a5d1ec37380c376c2ff2d7fed9c0042b2 100644
--- a/dist/cubism4.es.js
+++ b/dist/cubism4.es.js
@@ -5012,7 +5012,7 @@ const _FileLoader = class {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -5097,7 +5097,7 @@ const _ZipLoader = class {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
diff --git a/dist/cubism4.js b/dist/cubism4.js
index 03c1fb2b32b3b908a8b0e604aa3ee50aa9130169..99fc587e3ca7e6f433099e13f33e0e480a10c25a 100644
--- a/dist/cubism4.js
+++ b/dist/cubism4.js
@@ -5012,7 +5012,7 @@ var __async = (__this, __arguments, generator) => {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -5097,7 +5097,7 @@ var __async = (__this, __arguments, generator) => {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
diff --git a/dist/index.es.js b/dist/index.es.js
index f969d304f346c4e420b6798dbd4dec81b902a5e4..7e6b4d3ef53f1ea0648030899de9debd291fc551 100644
--- a/dist/index.es.js
+++ b/dist/index.es.js
@@ -1373,7 +1373,7 @@ const _FileLoader = class {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -1458,7 +1458,7 @@ const _ZipLoader = class {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
diff --git a/dist/index.js b/dist/index.js
index bc3d800c45889979190175cc88cdd8251feb9b5e..d1a660708ff81e1379f173709a32c6f4aa16696a 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1373,7 +1373,7 @@ var __async = (__this, __arguments, generator) => {
}
static createSettings(files) {
return __async(this, null, function* () {
- const settingsFile = files.find((file) => file.name.endsWith("model.json") || file.name.endsWith("model3.json"));
+ const settingsFile = files.find((file) => !file.name.endsWith("items_pinned_to_model.json") && (file.name.endsWith("model.json") || file.name.endsWith("model3.json")));
if (!settingsFile) {
throw new TypeError("Settings file not found");
}
@@ -1458,7 +1458,7 @@ var __async = (__this, __arguments, generator) => {
static createSettings(reader) {
return __async(this, null, function* () {
const filePaths = yield _ZipLoader.getFilePaths(reader);
- const settingsFilePath = filePaths.find((path) => path.endsWith("model.json") || path.endsWith("model3.json"));
+ const settingsFilePath = filePaths.find((path) => !path.endsWith("items_pinned_to_model.json") && (path.endsWith("model.json") || path.endsWith("model3.json")));
if (!settingsFilePath) {
throw new Error("Settings file not found");
}
pnpm-lock.yaml
Generated
+8 -5
View File
@@ -270,6 +270,9 @@ patchedDependencies:
mineflayer@4.33.0:
hash: 03a5a80439dece74f880cf754f7317b3c9e4c5dbc6488eba67c36ab4fbfbea3a
path: patches/mineflayer@4.33.0.patch
pixi-live2d-display:
hash: 122ac09349321d5bfe9d9817aa095cd1c9c4132af86345aa9e27ba8b63dadf2c
path: patches/pixi-live2d-display.patch
srvx@0.9.8:
hash: f0151386fdcbcb6f53833cf8f66926ef2eb31b71a2782d6e0960dec832ef108d
path: patches/srvx@0.9.8.patch
@@ -2913,7 +2916,7 @@ importers:
version: 4.2.0(5af797a0b5bd919a06578c24a7479046)
pixi-live2d-display:
specifier: ^0.4.0
version: 0.4.0(0736f5bd67d2e4de7e9fff36ad63fa2e)
version: 0.4.0(patch_hash=122ac09349321d5bfe9d9817aa095cd1c9c4132af86345aa9e27ba8b63dadf2c)(0736f5bd67d2e4de7e9fff36ad63fa2e)
three:
specifier: ^0.183.1
version: 0.183.1
@@ -3226,7 +3229,7 @@ importers:
version: 14.1.0(vue@3.5.29(typescript@5.9.3))
'@wxt-dev/module-vue':
specifier: ^1.0.3
version: 1.0.3(vite@7.3.1(@types/node@24.10.14)(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))(wxt@0.20.18(@types/node@24.10.14)(canvas@3.2.1)(eslint@9.39.3(jiti@2.6.1))(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(rollup@4.59.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
version: 1.0.3(vite@8.0.0-beta.15(@types/node@24.10.14)(esbuild@0.27.2)(jiti@2.6.1)(less@4.5.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))(wxt@0.20.18(@types/node@24.10.14)(canvas@3.2.1)(eslint@9.39.3(jiti@2.6.1))(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(rollup@4.59.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
nanoid:
specifier: ^5.1.6
version: 5.1.6
@@ -24102,9 +24105,9 @@ snapshots:
'@types/filesystem': 0.0.36
'@types/har-format': 1.2.16
'@wxt-dev/module-vue@1.0.3(vite@7.3.1(@types/node@24.10.14)(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))(wxt@0.20.18(@types/node@24.10.14)(canvas@3.2.1)(eslint@9.39.3(jiti@2.6.1))(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(rollup@4.59.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
'@wxt-dev/module-vue@1.0.3(vite@8.0.0-beta.15(@types/node@24.10.14)(esbuild@0.27.2)(jiti@2.6.1)(less@4.5.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))(wxt@0.20.18(@types/node@24.10.14)(canvas@3.2.1)(eslint@9.39.3(jiti@2.6.1))(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(rollup@4.59.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
dependencies:
'@vitejs/plugin-vue': 6.0.4(vite@7.3.1(@types/node@24.10.14)(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))
'@vitejs/plugin-vue': 6.0.4(vite@8.0.0-beta.15(@types/node@24.10.14)(esbuild@0.27.2)(jiti@2.6.1)(less@4.5.1)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.29(typescript@5.9.3))
wxt: 0.20.18(@types/node@24.10.14)(canvas@3.2.1)(eslint@9.39.3(jiti@2.6.1))(jiti@2.6.1)(less@4.5.1)(lightningcss@1.31.1)(rollup@4.59.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
transitivePeerDependencies:
- vite
@@ -29620,7 +29623,7 @@ snapshots:
- '@pixi/settings'
- '@pixi/utils'
pixi-live2d-display@0.4.0(0736f5bd67d2e4de7e9fff36ad63fa2e):
pixi-live2d-display@0.4.0(patch_hash=122ac09349321d5bfe9d9817aa095cd1c9c4132af86345aa9e27ba8b63dadf2c)(0736f5bd67d2e4de7e9fff36ad63fa2e):
dependencies:
'@pixi/core': 6.5.10(@pixi/constants@6.5.10)(@pixi/extensions@6.5.10)(@pixi/math@6.5.10)(@pixi/runner@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/ticker@6.5.10(@pixi/extensions@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))
'@pixi/display': 6.5.10(@pixi/constants@6.5.10)(@pixi/math@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10))(@pixi/utils@6.5.10(@pixi/constants@6.5.10)(@pixi/settings@6.5.10(@pixi/constants@6.5.10)))
pnpm-workspace.yaml
+2
View File
@@ -25,7 +25,9 @@ overrides:
patchedDependencies:
mineflayer-pathfinder: patches/mineflayer-pathfinder.patch
mineflayer@4.33.0: patches/mineflayer@4.33.0.patch
pixi-live2d-display: patches/pixi-live2d-display.patch
srvx@0.9.8: patches/srvx@0.9.8.patch
catalog:
'@capacitor/cli': ^8.1.0
'@capacitor/core': ^8.1.0