Skip to content

Commit bfa1cac

Browse files
committed
fix: adjust UI display on mods and install
1 parent cc98d5b commit bfa1cac

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

src/renderer/assets/locales/en.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"importSave": "Import Save",
349349
"installAssets": {
350350
"": "Install Asset Files",
351-
"assets": "Install Asset {hash}",
351+
"asset": "Install Asset {hash}",
352352
"assetsJson": "Check Assets Index File"
353353
},
354354
"installAuthlibInjector": "Install authlib-injector",
@@ -524,7 +524,7 @@
524524
"version": "Minecraft Version"
525525
},
526526
"mod": {
527-
"acceptVersion": "Accept Minecraft {version} with loader {loaderVersion}",
527+
"acceptVersion": "Accept Minecraft {version}",
528528
"backToAllMods": "Back to All Mods",
529529
"compatible": "Compatible Mod.",
530530
"deletion": "Deleting Mod",

src/renderer/assets/locales/ru.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"importSave": "Импортировать сохранение",
349349
"installAssets": {
350350
"": "Установить файлы Asset",
351-
"assets": "Установить Asset {hash}",
351+
"asset": "Установить Asset {hash}",
352352
"assetsJson": "Проверить индекс файл Assets"
353353
},
354354
"installAuthlibInjector": "Установить authlib-injector",
@@ -523,7 +523,7 @@
523523
"version": "Версия Minecraft"
524524
},
525525
"mod": {
526-
"acceptVersion": "Принять Minecraft {version} с загрузчиком {loaderVersion}",
526+
"acceptVersion": "Принять Minecraft {version}",
527527
"backToAllMods": "Вернуться ко всем модам",
528528
"compatible": "Совместимый мод.",
529529
"deletion": "Удаление мода",

src/renderer/assets/locales/zh-CN.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
"importSave": "导入存档",
329329
"installAssets": {
330330
"": "下载游戏资源文件",
331-
"assets": "下载资源文件%{hash}",
331+
"asset": "下载资源文件%{hash}",
332332
"assetsJson": "下载资源文件目录"
333333
},
334334
"installAuthlibInjector": "安装 authlib-injector",
@@ -505,7 +505,7 @@
505505
"version": "Minecraft 版本"
506506
},
507507
"mod": {
508-
"acceptVersion": "需要 Minecraft {version} 和 Forge {loaderVersion}",
508+
"acceptVersion": "需要 Minecraft {version}",
509509
"backToAllMods": "返回所有 Mods",
510510
"compatible": "可用于当前版本。",
511511
"deletion": "删除 Mod",

src/renderer/windows/main/pages/InstancesPagePreviewCard.vue

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<template>
22
<v-card
33
v-draggable-card
4+
v-ripple
45
color="grey darken-3 draggable-card"
56
hover
67
dark

src/renderer/windows/main/pages/ModSettingPageCard.vue

+11-4
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ export default defineComponent({
8686
},
8787
setup(props, context) {
8888
const { minecraft, forge } = useInstanceVersionBase();
89-
const { compatible: mcCompatible } = useCompatible(computed(() => props.source.acceptVersion), minecraft, true);
90-
const { compatible: loaderCompatible } = useCompatible(computed(() => props.source.acceptLoaderVersion), forge, false);
89+
const { compatible: mcCompatible } = useCompatible(computed(() => props.source.dependencies.minecraft), minecraft, true);
90+
const { compatible: loaderCompatible } = useCompatible(computed(() => props.source.dependencies.forge ?? ''), forge, false);
9191
const { open } = useContextMenu();
9292
const { openInBrowser, showItemInDirectory } = useService('BaseService');
9393
const { searchProjectAndRoute, goProjectAndRoute } = useCurseforgeRoute();
@@ -122,8 +122,15 @@ export default defineComponent({
122122
});
123123
124124
const compatibleText = computed(() => {
125-
let acceptVersionText = $t('mod.acceptVersion', { version: props.source.acceptVersion, loaderVersion: props.source.acceptLoaderVersion });
126-
let compatibleText = compatible.value === 'unknown'
125+
const deps = props.source.dependencies;
126+
let acceptVersionText = $t('mod.acceptVersion', { version: deps.minecraft });
127+
if (deps.forge) {
128+
acceptVersionText += `, Forge ${deps.forge}`;
129+
}
130+
if (deps.fabricLoader) {
131+
acceptVersionText += `, FabricLoader ${deps.fabricLoader}`;
132+
}
133+
const compatibleText = compatible.value === 'unknown'
127134
? $t('mod.nocompatible')
128135
: compatible.value
129136
? $t('mod.compatible')

src/renderer/windows/main/pages/ResourcePackPreviewPage.vue

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ export default defineComponent({
8989
},
9090
})).sort((a, b) => a.name.localeCompare(b.name));
9191
}).finally(() => {
92-
console.log('done');
9392
loading.value = false;
9493
});
9594
function filterItem(r: BlockStateJson) {

0 commit comments

Comments
 (0)