支持扩展导入 mspm 文件

这样就可以制作与 1.x 完全兼容的双版本模组/扩展了,之前只能制作兼容的插件/扩展如果要判断是否是 2.x 版本可以通过检查 fetchSelf 是否为 undefined 来确定
MajsoulPlus · Aug 17, 2019 · ca55180 · ca55180
1 parent f3df0ec
commit ca55180
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,4 +76,5 @@ data/
 # exported files
 *.mspr
 *.mspe
+*.mspm
 *.mspt
diff --git a/assets/bin/icon.png b/assets/bin/icon.png
diff --git a/package.json b/package.json
@@ -33,29 +33,30 @@
       "ext": [
         "mspr",
         "mspe",
+        "mspm",
         "mspt"
       ],
       "description": "Majsoul Plus ResourcePack/Extension/Tool",
-      "icon": "assets/bin/icon.png"
+      "icon": "assets/bin/icons/icon.ico"
     },
     "dmg": {
       "artifactName": "Majsoul_Plus-${platform}-${arch}.${ext}"
     },
     "mac": {
-      "icon": "assets/bin/icon.png",
+      "icon": "assets/bin/icons/icon.icns",
       "artifactName": "Majsoul_Plus-${platform}-${arch}.${ext}",
       "darkModeSupport": true
     },
     "win": {
-      "icon": "assets/bin/icon.png",
+      "icon": "assets/bin/icons/icon.ico",
       "target": [
         "nsis",
         "portable",
         "zip"
       ]
     },
     "linux": {
-      "icon": "assets/bin/icon.png",
+      "icon": "assets/bin/icons/icon.png",
       "category": "Game",
       "target": [
         "tar.gz",
@@ -64,18 +65,23 @@
       "fileAssociations": [
         {
           "ext": "mspr",
-          "description": "Majsoul Plus ResourcePack/Extension/Tool",
-          "icon": "assets/bin/icon.png"
+          "description": "Majsoul Plus ResourcePack",
+          "icon": "assets/bin/icons/icon.ico"
         },
         {
           "ext": "mspe",
-          "description": "Majsoul Plus ResourcePack/Extension/Tool",
-          "icon": "assets/bin/icon.png"
+          "description": "Majsoul Plus Extension",
+          "icon": "assets/bin/icons/icon.ico"
+        },
+        {
+          "ext": "mspm",
+          "description": "Majsoul Plus Extension",
+          "icon": "assets/bin/icons/icon.ico"
         },
         {
           "ext": "mspt",
-          "description": "Majsoul Plus ResourcePack/Extension/Tool",
-          "icon": "assets/bin/icon.png"
+          "description": "Majsoul Plus Tool",
+          "icon": "assets/bin/icons/icon.ico"
         }
       ]
     }

diff --git a/src/manager/main.ts b/src/manager/main.ts
@@ -123,6 +123,7 @@ class ResourceManager {
           const type = {
             '.mspr': 'resourcepack',
             '.mspe': 'extension',
+            '.mspm': 'extension',
             '.mspt': 'tool'
           }[ext]
           if (type) {
@@ -189,21 +190,19 @@ class ResourceManager {
             },
             {
               name: i18n.text.manager.fileTypeMSPE(),
-              extensions: ['mspe']
+              extensions: ['mspe', 'mspm']
             },
             {
               name: i18n.text.manager.fileTypeMSPT(),
               extensions: ['mspt']
             }
-          ].filter(
-            ext =>
-              ext.extensions[0] ===
-              {
-                ResourcePack: 'mspr',
-                Extension: 'mspe',
-                Tool: 'mspt'
-              }[type]
-          ),
+          ].filter(ext => {
+            return {
+              ResourcePack: ['mspr'],
+              Extension: ['mspe', 'mspm'],
+              Tool: ['mspt']
+            }[type].includes(ext.extensions[0])
+          }),
           properties: ['openFile', 'multiSelections']
         },
         files => {

diff --git a/src/manager/majsoul_plus_manager.d.ts b/src/manager/majsoul_plus_manager.d.ts
@@ -22,7 +22,7 @@ declare namespace MajsoulPlus_Manager {
 
   // 导出包的信息
   export interface ExportInfo {
-    extend: string
+    extend: string[]
     typeText: string
   }
 

diff --git a/src/manager/pages/Extensions.ts b/src/manager/pages/Extensions.ts
@@ -4,7 +4,7 @@ import CardList from '../ui/CardList'
 class Extension extends CardList {
   protected getExportInfo() {
     return {
-      extend: 'mspe',
+      extend: ['mspe', 'mspm'],
       typeText: i18n.text.manager.fileTypeMSPE()
     }
   }

diff --git a/src/manager/pages/ResourcePacks.ts b/src/manager/pages/ResourcePacks.ts
@@ -4,7 +4,7 @@ import CardList from '../ui/CardList'
 class ResourcePack extends CardList {
   protected getExportInfo() {
     return {
-      extend: 'mspr',
+      extend: ['mspr'],
       typeText: i18n.text.manager.fileTypeMSPR()
     }
   }

diff --git a/src/manager/pages/Tools.ts b/src/manager/pages/Tools.ts
@@ -24,7 +24,7 @@ class Tool extends CardList {
 
   getExportInfo() {
     return {
-      extend: 'mspt',
+      extend: ['mspt'],
       typeText: i18n.text.manager.fileTypeMSPT()
     }
   }

diff --git a/src/manager/ui/CardList.ts b/src/manager/ui/CardList.ts
@@ -102,7 +102,7 @@ export default class CardList {
       filters: [
         {
           name: typeText,
-          extensions: [extend]
+          extensions: extend
         }
       ],
       defaultPath: `${exp.metadata.name}(${id}) - ${

diff --git a/src/utilities/openFile.ts b/src/utilities/openFile.ts
@@ -28,6 +28,7 @@ class OpenFile extends Utility {
       const type = {
         '.mspr': 'resourcepack',
         '.mspe': 'extension',
+        '.mspm': 'extension',
         '.mspt': 'tool'
       }[ext]
       if (type) {