Skip to content

Commit 7f13b1c

Browse files
committed
Update package.json and improve confirmation dialog messages in modpack settings
1 parent 91aa210 commit 7f13b1c

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
},
5252
"peerDependencies": {
5353
"vue": "^3.4"
54-
}
55-
}
54+
},
55+
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
56+
}

src/components/modpack/settings.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ export default defineNuxtComponent({
123123
},
124124
methods: {
125125
reinstallModpack() {
126-
if (window.confirm("Voulez-vous vraiment réinstaller le modpack ?")) {
126+
if (window.confirm('Voulez-vous vraiment réinstaller le modpack ?')) {
127127
//TODO: fix this
128128
window.electron.reinstallModpack(JSON.parse(JSON.stringify(this.modpack)))
129129
}
130130
},
131131
uninstallModpack() {
132-
if (window.confirm("Vous êtes sur le point de supprimer le modpack, êtes-vous sûr ?")) {
132+
if (window.confirm('Vous êtes sur le point de supprimer le modpack, êtes-vous sûr ?')) {
133133
//TODO: fix this
134134
window.electron.uninstallModpack(JSON.parse(JSON.stringify(this.modpack)))
135135
}
@@ -142,13 +142,13 @@ export default defineNuxtComponent({
142142
document.getElementById('file')?.click()
143143
},
144144
async clearFolderDialog() {
145-
this.modpackJava.javaPath = '';
146-
(document.getElementById('file') as HTMLInputElement).value = ''
145+
this.modpackJava.javaPath = ''
146+
;(document.getElementById('file') as HTMLInputElement).value = ''
147147
window.electron.setModpackJavaPath(JSON.parse(JSON.stringify(this.modpack)), '')
148148
this.$nextTick(async () => {
149149
//TODO: fix this
150-
this.modpackJava.javaPath = await window.electron.getModpackJavaPath(JSON.parse(JSON.stringify(this.modpack)));
151-
(document.getElementById('file') as HTMLInputElement).value = this.modpackJava.javaPath
150+
this.modpackJava.javaPath = await window.electron.getModpackJavaPath(JSON.parse(JSON.stringify(this.modpack)))
151+
;(document.getElementById('file') as HTMLInputElement).value = this.modpackJava.javaPath
152152
})
153153
},
154154
async selectFolderDialog($event: Event) {
@@ -162,7 +162,7 @@ export default defineNuxtComponent({
162162
window.electron.setModpackJavaPath(JSON.parse(JSON.stringify(this.modpack)), this.modpackJava.javaPath)
163163
break
164164
}
165-
}
165+
},
166166
},
167167
async mounted() {
168168
//TODO: fix this

src/electron/events/settings.event.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class SettingsEvent {
1313
public static name = 'SettingsEvent'
1414
public async registerEvents(): Promise<void> {
1515
ipcMain.handle('getModpackJavaPath', (_, modpack: Modpack) => {
16-
return store.get(modpack.name + '_javaPath') || join(process.env.JAVA_HOME!, 'bin', 'java')
16+
return store.get(modpack.name + '_javaPath') || process.env.JAVA_HOME ? join(`${process.env.JAVA_HOME}`, 'bin', 'java') : ''
1717
})
1818
ipcMain.on('setModpackJavaPath', (_, modpack: Modpack, val) => {
1919
store.set(modpack.name + '_javaPath', val ? join(val, 'java') : null)

0 commit comments

Comments
 (0)