mmlio 依赖安装

Author: clansty

AquaMai

@@ -33,11 +33,10 @@ public record GameModInfo(
         string BundledAquaMaiVersion,
         bool IsJudgeDisplay4BInstalled,
         bool IsHidConflictExist,
-        AquaMaiSignatureV2.VerifyResult? Signature
+        AquaMaiSignatureV2.VerifyResult? Signature,
+        bool IsMmlLibInstalled
     );
 
-    private static readonly string[] HidModPaths = [@"Mods\Mai2InputMod.dll", @"Mods\hid_input_lib.dll", "hid_input_lib.dll", "mai2io.dll"];
-
     [HttpGet]
     public GameModInfo GetGameModInfo()
     {
@@ -56,7 +55,7 @@ public GameModInfo GetGameModInfo()
             sig = AquaMaiSignatureV2.VerifySignature(System.IO.File.ReadAllBytes(ModPaths.AquaMaiDllInstalledPath));
         }
 
-        return new GameModInfo(IsMelonInstalled(), aquaMaiInstalled, aquaMaiVersion, aquaMaiBuiltinVersion!, GetIsJudgeDisplay4BInstalled(), GetIsHidConflictExist(), sig);
+        return new GameModInfo(IsMelonInstalled(), aquaMaiInstalled, aquaMaiVersion, aquaMaiBuiltinVersion!, GetIsJudgeDisplay4BInstalled(), GetIsHidConflictExist(), sig, GetIsMmlLibInstalled());
     }
 
     [NonAction]
@@ -68,6 +67,10 @@ private static bool GetIsJudgeDisplay4BInstalled()
         return filesShouldBeInstalled.Select(file => Path.Combine(StaticSettings.SkinAssetsDir, Path.GetFileName(file))).All(System.IO.File.Exists);
     }
 
+    #region ADX HID 冲突检测和删除
+
+    private static readonly string[] HidModPaths = [@"Mods\Mai2InputMod.dll", @"Mods\hid_input_lib.dll", "hid_input_lib.dll", "mai2io.dll"];
+
     [NonAction]
     private static bool GetIsHidConflictExist()
     {
@@ -94,6 +97,45 @@ public void DeleteHidConflict()
         }
     }
 
+    #endregion
+
+    [NonAction]
+    private static bool GetIsMmlLibInstalled()
+    {
+        if (System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, "ADXHIDIOMod.dll")))
+        {
+            return false;
+        }
+        if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll")))
+        {
+            return false;
+        }
+        if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll")))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    [HttpPost]
+    public void InstallMmlLibs()
+    {
+        if (GetIsMmlLibInstalled()) return;
+        if (System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, "ADXHIDIOMod.dll")))
+        {
+            System.IO.File.Delete(Path.Combine(StaticSettings.GamePath, "ADXHIDIOMod.dll"));
+        }
+        if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll")))
+        {
+            System.IO.File.Copy(Path.Combine(StaticSettings.exeDir, @"hidapi.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\hidapi.dll"));
+        }
+        if (!System.IO.File.Exists(Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll")))
+        {
+            System.IO.File.Copy(Path.Combine(StaticSettings.exeDir, @"libadxhid.dll"), Path.Combine(StaticSettings.GamePath, @"Sinmai_Data\Plugins\libadxhid.dll"));
+        }
+    }
+
     [HttpPost]
     public void InstallJudgeDisplay4B()
     {

MaiChartManager/Controllers/Mod/InstallationController.cs

@@ -113,6 +113,7 @@ export interface GameModInfo {
   isJudgeDisplay4BInstalled?: boolean;
   isHidConflictExist?: boolean;
   signature?: VerifyResult;
+  isMmlLibInstalled?: boolean;
 }
 
 export interface GenreAddRequest {
@@ -1342,6 +1343,20 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params,
       }),
 
+    /**
+     * No description
+     *
+     * @tags Installation
+     * @name InstallMmlLibs
+     * @request POST:/MaiChartManagerServlet/InstallMmlLibsApi
+     */
+    InstallMmlLibs: (params: RequestParams = {}) =>
+      this.request<void, any>({
+        path: `/MaiChartManagerServlet/InstallMmlLibsApi`,
+        method: "POST",
+        ...params,
+      }),
+
     /**
      * No description
      *

MaiChartManager/Front/src/client/apiGen.ts

@@ -21,7 +21,8 @@ const ConfigSection = defineComponent({
   setup(props, { emit }) {
     const { t, te } = useI18n();
 
-    const CustomPanel = getSectionPanelOverride(props.section.path!);
+    const CustomPanel = getSectionPanelOverride(props.section.path!)
+    const customPanelPosition: 'top' | 'bottom' | 'override' = comments.customPanelPosition[props.section.path!] || 'override';
     const comment = computed(() => {
       const localeKey = 'mod.commentOverrides.' + props.section.path!.replace(/\./g, '_');
       if (te(localeKey)) {
@@ -53,14 +54,16 @@ const ConfigSection = defineComponent({
           {comment.value}
         </NFlex>
       </NFormItem>}
-      {props.sectionState.enabled && (
-        CustomPanel ?
+      {props.sectionState.enabled && <>
+        {customPanelPosition === 'top' && <CustomPanel entryStates={props.entryStates} sectionState={props.sectionState} section={props.section}/>}
+        {(CustomPanel && customPanelPosition === 'override') ?
           <CustomPanel entryStates={props.entryStates} sectionState={props.sectionState} section={props.section}/> :
           !!props.section.entries?.length && <NFlex vertical class="p-l-15 max-[900px]:p-l-10 max-[500px]:p-l-5!">
             {props.section.entries?.filter(it => !it.attribute?.hideWhenDefault || (it.attribute?.hideWhenDefault && !props.entryStates[it.path!].isDefault))
               .map((entry) => <ConfigEntry key={entry.path!} entry={entry} entryState={props.entryStates[entry.path!]}/>)}
-          </NFlex>
-      )}
+          </NFlex>}
+        {customPanelPosition === 'bottom' && <CustomPanel entryStates={props.entryStates} sectionState={props.sectionState} section={props.section}/>}
+        </>}
     </NFlex>;
   },
 });

MaiChartManager/Front/src/components/ModManager/AquaMaiConfigurator.tsx

@@ -28,3 +28,6 @@ sectionNameEn:
   高级设置: Advanced Settings
   过新过热: Too New Too Hot
   不建议关闭: Not Recommend to Disable
+
+customPanelPosition:
+  GameSystem.MaimollerIO: top

MaiChartManager/Front/src/components/ModManager/modComments.yaml

@@ -0,0 +1,32 @@
+import api from '@/client/api';
+import { t } from '@/locales';
+import { globalCapture, modInfo, updateModInfo } from '@/store/refs';
+import { useAsyncState } from '@vueuse/core';
+import { NFlex, NButton } from 'naive-ui';
+import { defineComponent, PropType, ref, computed, watch } from 'vue';
+
+export default defineComponent({
+  // props: {
+  // },
+  setup(props, { emit }) {
+    const install = useAsyncState(async () => {
+      await api.InstallMmlLibs();
+      await updateModInfo();
+    }, undefined, {
+      immediate: false,
+      onError(e) {
+        globalCapture(e, t('mod.mmlIo.installFailed'));
+      },
+    })
+
+    return () => <div class="">
+      {!modInfo.value?.isMmlLibInstalled ? <NFlex align="center" class="m-l-35">
+        <span class="c-orange">{t('mod.mmlIo.notInstalled')}</span>
+        <NButton secondary onClick={() => install.execute()} loading={install.isLoading.value}>{t('mod.mmlIo.oneClickInstall')}</NButton>
+      </NFlex>
+        : <NFlex align="center" class="m-l-35">
+          <span class="c-green-6">{t('mod.mmlIo.installed')}</span>
+        </NFlex>}
+    </div>;
+  },
+});

MaiChartManager/Front/src/components/ModManager/sectionPanelOverride/GameSystem.MaimollerIO/index.tsx

@@ -364,7 +364,12 @@ mod:
     title: 社区贡献功能
     description: |-
       此功能由社区成员贡献，可能无法获得与核心功能相同级别的技术支持
-      如遇技术问题，我们会尽力协助，但可能无法提供即时支持
+      如遇技术问题，我们会尽力协调处理
+  mmlIo:
+    notInstalled: 依赖库未安装或存在冲突
+    oneClickInstall: 一键安装
+    installed: 已正确安装
+    installFailed: 安装 Maimoller 依赖库时出现错误
 tools:
   title: 工具
   audioConvert: 音频转换（ACB + AWB）