🔥 Re-add servers codes

Author: lucas-luchack

app/assets/js/scripts/landing.js

@@ -102,30 +102,32 @@ function setLaunchEnabled(val){
 
 // Bind launch button
 document.getElementById('launch_button').addEventListener('click', async e => {
-    loggerLanding.info('Launching game..')
-    try {
-        const server = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
-        const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
-        if(jExe == null){
-            await asyncSystemScan(server.effectiveJavaOptions)
-        } else {
+    if(await checkCurrentServer(true)){
+        loggerLanding.info('Launching game..')
+        try {
+            const server = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
+            const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
+            if(jExe == null){
+                await asyncSystemScan(server.effectiveJavaOptions)
+            } else {
 
-            setLaunchDetails(Lang.queryJS('landing.launch.pleaseWait'))
-            toggleLaunchArea(true)
-            setLaunchPercentage(0, 100)
+                setLaunchDetails(Lang.queryJS('landing.launch.pleaseWait'))
+                toggleLaunchArea(true)
+                setLaunchPercentage(0, 100)
 
-            const details = await validateSelectedJvm(ensureJavaDirIsRoot(jExe), server.effectiveJavaOptions.supported)
-            if(details != null){
-                loggerLanding.info('Jvm Details', details)
-                await dlAsync()
+                const details = await validateSelectedJvm(ensureJavaDirIsRoot(jExe), server.effectiveJavaOptions.supported)
+                if(details != null){
+                    loggerLanding.info('Jvm Details', details)
+                    await dlAsync()
 
-            } else {
-                await asyncSystemScan(server.effectiveJavaOptions)
+                } else {
+                    await asyncSystemScan(server.effectiveJavaOptions)
+                }
             }
+        } catch(err) {
+            loggerLanding.error('Unhandled error in during launch process.', err)
+            showLaunchFailure('Error During Launch', 'See console (CTRL + Shift + i) for more details.')
         }
-    } catch(err) {
-        loggerLanding.error('Unhandled error in during launch process.', err)
-        showLaunchFailure('Error During Launch', 'See console (CTRL + Shift + i) for more details.')
     }
 })
 
@@ -640,6 +642,39 @@ async function dlAsync(login = true) {
 
 }
 
+/**
+ * Checks the current server to ensure that they still have permission to play it (checking server code, if applicable) and open up an error overlay if specified
+ * @Param {boolean} whether or not to show the error overlay
+ */
+async function checkCurrentServer(errorOverlay = true){
+    const selectedServId = ConfigManager.getSelectedServer()
+    if(selectedServId){
+        const selectedServ = (await DistroAPI.getDistribution()).getServerById(selectedServId)
+        if(selectedServ){
+            if(selectedServ.rawServer.serverCode && selectedServ.rawServer.serverCode !== ''){
+                if(!ConfigManager.getServerCodes().includes(selectedServ.rawServer.serverCode)){
+                    if(errorOverlay){
+                        setOverlayContent(
+                            'Serveur actuel restreint !',
+                            'Il semble que vous n\'ayez plus le code serveur requis pour accéder à ce serveur ! Veuillez changer de serveur pour jouer. <br/><br/> Si vous pensez qu\'il s\'agit d\'une erreur, veuillez contacter l\'administrateur du serveur.',
+                            'Changer de serveur',
+                        )
+                        setOverlayHandler(() => {
+                            toggleServerSelection(true)
+                        })
+                        setDismissHandler(() => {
+                            toggleOverlay(false)
+                        })
+                        toggleOverlay(true, true)
+                    }
+                    return false
+                }
+            }
+        }
+        return true
+    }
+}
+
 /**
  * News Loading Functions
  */

app/assets/js/scripts/overlay.js

@@ -273,6 +273,9 @@ async function populateServerListings(){
     const servers = distro.servers
     let htmlString = ''
     for(const serv of servers){
+        if(serv.rawServer.serverCode && !ConfigManager.getServerCodes().includes(serv.rawServer.serverCode)){
+            continue
+        }
         htmlString += `<button class="serverListing" servid="${serv.rawServer.id}" ${serv.rawServer.id === giaSel ? 'selected' : ''}>
             <img class="serverListingImg" src="${serv.rawServer.icon}"/>
             <div class="serverListingDetails">

app/assets/js/scripts/settings.js

@@ -142,6 +142,8 @@ async function initSettingsValues(){
                         await populateJavaExecDetails(v.value)
                     } else if (cVal === 'DataDirectory'){
                         v.value = gFn.apply(null, gFnOpts)
+                    } else if (cVal === 'ServerCode'){
+                        v.value = gFn()
                     } else if(cVal === 'JVMOptions'){
                         v.value = gFn.apply(null, gFnOpts).join(' ')
                     } else {
@@ -460,6 +462,8 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => {
                 ConfigManager.getServerCodes().push(code)
                 ConfigManager.save()
                 prepareLauncherTab()
+            } else {
+                console.warn('Server code already exists or is empty!')
             }
         }
     }
@@ -722,8 +726,8 @@ function prepareAccountsTab() {
 /**
  * Prepare the launcher tab for display.
  */
- function prepareLauncherTab() {
-    resolveServerCodesForUI()
+async function prepareLauncherTab() {
+    await resolveServerCodesForUI()
     bindServerCodeButtons()
 }
 
@@ -929,11 +933,11 @@ async function resolveDropinModsForUI(){
     document.getElementById('settingsDropinModsContent').innerHTML = dropinMods
 }
 
-function resolveServerCodesForUI(){
+async function resolveServerCodesForUI(){
     /* Server Codes */
     let servCodes = ''
-    /* for(let servCode of ConfigManager.getServerCodes()){
-        const servs = DistroManager.getDistribution().getServersFromCode(servCode)
+    for(let servCode of ConfigManager.getServerCodes()){
+        const servs = (await DistroAPI.getDistribution()).getServersFromCode(servCode)
         const valid = servs && servs.length
         servCodes +=
             `
@@ -953,23 +957,21 @@ function resolveServerCodesForUI(){
                     </div>
                 </div>
             `
-    } */
+    }
 
     document.getElementById('settingsServerCodesListContent').innerHTML = servCodes
 
     /* Server Names List */
     for(let ele of document.getElementsByClassName('settingsServerCodeServerNamesContent')){
         servNames = ''
         const code = ele.getAttribute('code')
-        const servs = DistroManager.getDistribution().getServersFromCode(code)
+        const servs = (await DistroAPI.getDistribution()).getServersFromCode(code)
         const valid = servs && servs.length
-        loggerSettings.log('valid: ' + valid)
         if(valid){
             for(let serv of servs){
-                loggerSettings.log('server: ' + serv.getName())
                 servNames +=
                     `
-                    <span class="settingsServerCodeServerName">${serv.getName()}</span> 
+                    <span class="settingsServerCodeServerName">${serv.rawServer.name}</span> 
                     `
             }
         } else {
@@ -1675,6 +1677,7 @@ async function prepareSettings(first = false) {
     prepareAccountsTab()
     await prepareJavaTab()
     prepareAboutTab()
+    await prepareLauncherTab()
 }
 
 // Prepare the settings UI on startup.