Replace distromanager, assetguard is probably broken.

2023-02-24 21:02:18 -05:00
parent 45630c068c
commit a22bd32cb1
12 changed files with 280 additions and 1124 deletions
--- a/app/assets/js/scripts/landing.js
+++ b/app/assets/js/scripts/landing.js
@@ -10,8 +10,7 @@ const { MojangRestAPI, getServerStatus }     = require('helios-core/mojang')
 // Internal Requirements
 const DiscordWrapper          = require('./assets/js/discordwrapper')
 const ProcessBuilder          = require('./assets/js/processbuilder')
-const { Util } = require('./assets/js/assetguard')
-const { RestResponseStatus, isDisplayableError } = require('helios-core/common')
+const { RestResponseStatus, isDisplayableError, mcVersionAtLeast } = require('helios-core/common')
 const { stdout } = require('process')

 // Launch Elements
@@ -86,9 +85,9 @@ function setLaunchEnabled(val){
 }

 // Bind launch button
-document.getElementById('launch_button').addEventListener('click', function(e){
+document.getElementById('launch_button').addEventListener('click', async (e) => {
    loggerLanding.info('Launching game..')
-    const mcVersion = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
+    const mcVersion = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()).rawServer.minecraftVersion
    const jExe = ConfigManager.getJavaExecutable(ConfigManager.getSelectedServer())
    if(jExe == null){
        asyncSystemScan(mcVersion)
@@ -111,14 +110,14 @@ document.getElementById('launch_button').addEventListener('click', function(e){
 })

 // Bind settings button
-document.getElementById('settingsMediaButton').onclick = (e) => {
-    prepareSettings()
+document.getElementById('settingsMediaButton').onclick = async e => {
+    await prepareSettings()
    switchView(getCurrentView(), VIEWS.settings)
 }

 // Bind avatar overlay button.
-document.getElementById('avatarOverlay').onclick = (e) => {
-    prepareSettings()
+document.getElementById('avatarOverlay').onclick = async e => {
+    await prepareSettings()
    switchView(getCurrentView(), VIEWS.settings, 500, 500, () => {
        settingsNavItemListener(document.getElementById('settingsNavAccount'), false)
    })
@@ -144,9 +143,9 @@ function updateSelectedServer(serv){
    if(getCurrentView() === VIEWS.settings){
        fullSettingsSave()
    }
-    ConfigManager.setSelectedServer(serv != null ? serv.getID() : null)
+    ConfigManager.setSelectedServer(serv != null ? serv.rawServer.id : null)
    ConfigManager.save()
-    server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.getName() : 'No Server Selected')
+    server_selection_button.innerHTML = '\u2022 ' + (serv != null ? serv.rawServer.name : 'No Server Selected')
    if(getCurrentView() === VIEWS.settings){
        animateSettingsTabRefresh()
    }
@@ -154,9 +153,9 @@ function updateSelectedServer(serv){
 }
 // Real text is set in uibinder.js on distributionIndexDone.
 server_selection_button.innerHTML = '\u2022 Loading..'
-server_selection_button.onclick = (e) => {
+server_selection_button.onclick = async e => {
    e.target.blur()
-    toggleServerSelection(true)
+    await toggleServerSelection(true)
 }

 // Update Mojang Status Color
@@ -220,17 +219,16 @@ const refreshMojangStatuses = async function(){
    document.getElementById('mojang_status_icon').style.color = MojangRestAPI.statusToHex(status)
 }

-const refreshServerStatus = async function(fade = false){
+const refreshServerStatus = async (fade = false) => {
    loggerLanding.info('Refreshing Server Status')
-    const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
+    const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())

    let pLabel = 'SERVER'
    let pVal = 'OFFLINE'

    try {
-        const serverURL = new URL('my://' + serv.getAddress())

-        const servStat = await getServerStatus(47, serverURL.hostname, Number(serverURL.port))
+        const servStat = await getServerStatus(47, serv.hostname, serv.port)
        console.log(servStat)
        pLabel = 'PLAYERS'
        pVal = servStat.players.online + '/' + servStat.players.max
@@ -318,9 +316,9 @@ function asyncSystemScan(mcVersion, launchAfter = true){
        console.log(`\x1b[31m[SysAEx]\x1b[0m ${data}`)
    })

-    const javaVer = Util.mcVersionAtLeast('1.17', mcVersion) ? '17' : '8'
+    const javaVer = mcVersionAtLeast('1.17', mcVersion) ? '17' : '8'
    
-    sysAEx.on('message', (m) => {
+    sysAEx.on('message', async (m) => {

        if(m.context === 'validateJava'){
            if(m.result == null){
@@ -368,7 +366,7 @@ function asyncSystemScan(mcVersion, launchAfter = true){
                // We need to make sure that the updated value is on the settings UI.
                // Just incase the settings UI is already open.
                settingsJavaExecVal.value = m.result
-                populateJavaExecDetails(settingsJavaExecVal.value)
+                await populateJavaExecDetails(settingsJavaExecVal.value)

                if(launchAfter){
                    dlAsync()
@@ -534,7 +532,7 @@ function dlAsync(login = true){
    })

    // Establish communications between the AssetExec and current process.
-    aEx.on('message', (m) => {
+    aEx.on('message', async (m) => {

        if(m.context === 'validate'){
            switch(m.data){
@@ -710,9 +708,9 @@ function dlAsync(login = true){
                    setLaunchDetails('Done. Enjoy the server!')

                    // Init Discord Hook
-                    const distro = DistroManager.getDistribution()
-                    if(distro.discord != null && serv.discord != null){
-                        DiscordWrapper.initRPC(distro.discord, serv.discord)
+                    const distro = await DistroAPI.getDistribution()
+                    if(distro.rawDistribution.discord != null && serv.rawServerdiscord != null){
+                        DiscordWrapper.initRPC(distro.rawDistribution.discord, serv.rawServer.discord)
                        hasRPC = true
                        proc.on('close', (code, signal) => {
                            loggerLaunchSuite.info('Shutting down Discord Rich Presence..')
@@ -741,29 +739,19 @@ function dlAsync(login = true){
    // Validate Forge files.
    setLaunchDetails('Loading server information..')

-    refreshDistributionIndex(true, (data) => {
-        onDistroRefresh(data)
-        serv = data.getServer(ConfigManager.getSelectedServer())
-        aEx.send({task: 'execute', function: 'validateEverything', argsArr: [ConfigManager.getSelectedServer(), DistroManager.isDevMode()]})
-    }, (err) => {
-        loggerLaunchSuite.info('Error while fetching a fresh copy of the distribution index.', err)
-        refreshDistributionIndex(false, (data) => {
+    DistroAPI.refreshDistributionOrFallback()
+        .then(data => {
            onDistroRefresh(data)
-            serv = data.getServer(ConfigManager.getSelectedServer())
-            aEx.send({task: 'execute', function: 'validateEverything', argsArr: [ConfigManager.getSelectedServer(), DistroManager.isDevMode()]})
-        }, (err) => {
-            loggerLaunchSuite.error('Unable to refresh distribution index.', err)
-            if(DistroManager.getDistribution() == null){
-                showLaunchFailure('Fatal Error', 'Could not load a copy of the distribution index. See the console (CTRL + Shift + i) for more details.')
-
-                // Disconnect from AssetExec
-                aEx.disconnect()
-            } else {
-                serv = data.getServer(ConfigManager.getSelectedServer())
-                aEx.send({task: 'execute', function: 'validateEverything', argsArr: [ConfigManager.getSelectedServer(), DistroManager.isDevMode()]})
-            }
+            serv = data.getServerById(ConfigManager.getSelectedServer())
+            aEx.send({task: 'execute', function: 'validateEverything', argsArr: [ConfigManager.getSelectedServer(), DistroAPI.isDevMode()]})
+        })
+        .catch(err => {
+            loggerLaunchSuite.error('Unable to refresh distribution index.', err)
+            showLaunchFailure('Fatal Error', 'Could not load a copy of the distribution index. See the console (CTRL + Shift + i) for more details.')
+
+            // Disconnect from AssetExec
+            aEx.disconnect()
        })
-    })
 }

 /**
@@ -1089,10 +1077,13 @@ function displayArticle(articleObject, index){
 * Load news information from the RSS feed specified in the
 * distribution index.
 */
-function loadNews(){
-    return new Promise((resolve, reject) => {
-        const distroData = DistroManager.getDistribution()
-        const newsFeed = distroData.getRSS()
+async function loadNews(){
+
+    const distroData = await DistroAPI.getDistribution()
+
+    const promise = new Promise((resolve, reject) => {
+        
+        const newsFeed = distroData.rawDistribution.rss
        const newsHost = new URL(newsFeed).origin + '/'
        $.ajax({
            url: newsFeed,
@@ -1147,4 +1138,6 @@ function loadNews(){
            })
        })
    })
+
+    return await promise
 }
--- a/app/assets/js/scripts/login.js
+++ b/app/assets/js/scripts/login.js
@@ -193,10 +193,10 @@ loginButton.addEventListener('click', () => {
        $('.circle-loader').toggleClass('load-complete')
        $('.checkmark').toggle()
        setTimeout(() => {
-            switchView(VIEWS.login, loginViewOnSuccess, 500, 500, () => {
+            switchView(VIEWS.login, loginViewOnSuccess, 500, 500, async () => {
                // Temporary workaround
                if(loginViewOnSuccess === VIEWS.settings){
-                    prepareSettings()
+                    await prepareSettings()
                }
                loginViewOnSuccess = VIEWS.landing // Reset this for good measure.
                loginCancelEnabled(false) // Reset this for good measure.
--- a/app/assets/js/scripts/overlay.js
+++ b/app/assets/js/scripts/overlay.js
@@ -117,8 +117,8 @@ function toggleOverlay(toggleState, dismissable = false, content = 'overlayConte
    }
 }

-function toggleServerSelection(toggleState){
-    prepareServerSelectionList()
+async function toggleServerSelection(toggleState){
+    await prepareServerSelectionList()
    toggleOverlay(toggleState, true, 'serverSelectContent')
 }

@@ -171,11 +171,11 @@ function setDismissHandler(handler){

 /* Server Select View */

-document.getElementById('serverSelectConfirm').addEventListener('click', () => {
+document.getElementById('serverSelectConfirm').addEventListener('click', async () => {
    const listings = document.getElementsByClassName('serverListing')
    for(let i=0; i<listings.length; i++){
        if(listings[i].hasAttribute('selected')){
-            const serv = DistroManager.getDistribution().getServer(listings[i].getAttribute('servid'))
+            const serv = (await DistroAPI.getDistribution()).getServerById(listings[i].getAttribute('servid'))
            updateSelectedServer(serv)
            refreshServerStatus(true)
            toggleOverlay(false)
@@ -184,13 +184,13 @@ document.getElementById('serverSelectConfirm').addEventListener('click', () => {
    }
    // None are selected? Not possible right? Meh, handle it.
    if(listings.length > 0){
-        const serv = DistroManager.getDistribution().getServer(listings[i].getAttribute('servid'))
+        const serv = (await DistroAPI.getDistribution()).getServerById(listings[i].getAttribute('servid'))
        updateSelectedServer(serv)
        toggleOverlay(false)
    }
 })

-document.getElementById('accountSelectConfirm').addEventListener('click', () => {
+document.getElementById('accountSelectConfirm').addEventListener('click', async () => {
    const listings = document.getElementsByClassName('accountListing')
    for(let i=0; i<listings.length; i++){
        if(listings[i].hasAttribute('selected')){
@@ -198,7 +198,7 @@ document.getElementById('accountSelectConfirm').addEventListener('click', () =>
            ConfigManager.save()
            updateSelectedAccount(authAcc)
            if(getCurrentView() === VIEWS.settings) {
-                prepareSettings()
+                await prepareSettings()
            }
            toggleOverlay(false)
            validateSelectedAccount()
@@ -211,7 +211,7 @@ document.getElementById('accountSelectConfirm').addEventListener('click', () =>
        ConfigManager.save()
        updateSelectedAccount(authAcc)
        if(getCurrentView() === VIEWS.settings) {
-            prepareSettings()
+            await prepareSettings()
        }
        toggleOverlay(false)
        validateSelectedAccount()
@@ -267,21 +267,21 @@ function setAccountListingHandlers(){
    })
 }

-function populateServerListings(){
-    const distro = DistroManager.getDistribution()
+async function populateServerListings(){
+    const distro = await DistroAPI.getDistribution()
    const giaSel = ConfigManager.getSelectedServer()
-    const servers = distro.getServers()
+    const servers = distro.servers
    let htmlString = ''
    for(const serv of servers){
-        htmlString += `<button class="serverListing" servid="${serv.getID()}" ${serv.getID() === giaSel ? 'selected' : ''}>
-            <img class="serverListingImg" src="${serv.getIcon()}"/>
+        htmlString += `<button class="serverListing" servid="${serv.rawServer.id}" ${serv.rawServer.id === giaSel ? 'selected' : ''}>
+            <img class="serverListingImg" src="${serv.rawServer.icon}"/>
            <div class="serverListingDetails">
-                <span class="serverListingName">${serv.getName()}</span>
-                <span class="serverListingDescription">${serv.getDescription()}</span>
+                <span class="serverListingName">${serv.rawServer.name}</span>
+                <span class="serverListingDescription">${serv.rawServer.description}</span>
                <div class="serverListingInfo">
-                    <div class="serverListingVersion">${serv.getMinecraftVersion()}</div>
-                    <div class="serverListingRevision">${serv.getVersion()}</div>
-                    ${serv.isMainServer() ? `<div class="serverListingStarWrapper">
+                    <div class="serverListingVersion">${serv.rawServer.minecraftVersion}</div>
+                    <div class="serverListingRevision">${serv.rawServer.version}</div>
+                    ${serv.rawServer.mainServer ? `<div class="serverListingStarWrapper">
                        <svg id="Layer_1" viewBox="0 0 107.45 104.74" width="20px" height="20px">
                            <defs>
                                <style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-miterlimit:10;}</style>
@@ -313,8 +313,8 @@ function populateAccountListings(){

 }

-function prepareServerSelectionList(){
-    populateServerListings()
+async function prepareServerSelectionList(){
+    await populateServerListings()
    setServerListingHandlers()
 }

--- a/app/assets/js/scripts/settings.js
+++ b/app/assets/js/scripts/settings.js
@@ -69,7 +69,7 @@ function bindFileSelectors(){
            if(!res.canceled) {
                ele.previousElementSibling.value = res.filePaths[0]
                if(isJavaExecSel) {
-                    populateJavaExecDetails(ele.previousElementSibling.value)
+                    await populateJavaExecDetails(ele.previousElementSibling.value)
                }
            }
        }
@@ -123,9 +123,10 @@ function initSettingsValidators(){
 /**
 * Load configuration values onto the UI. This is an automated process.
 */
-function initSettingsValues(){
+async function initSettingsValues(){
    const sEls = document.getElementById('settingsContainer').querySelectorAll('[cValue]')
-    Array.from(sEls).map((v, index, arr) => {
+
+    for(const v of sEls) {
        const cVal = v.getAttribute('cValue')
        const serverDependent = v.hasAttribute('serverDependent') // Means the first argument is the server id.
        const gFn = ConfigManager['get' + cVal]
@@ -139,7 +140,7 @@ function initSettingsValues(){
                    // Special Conditions
                    if(cVal === 'JavaExecutable'){
                        v.value = gFn.apply(null, gFnOpts)
-                        populateJavaExecDetails(v.value)
+                        await populateJavaExecDetails(v.value)
                    } else if (cVal === 'DataDirectory'){
                        v.value = gFn.apply(null, gFnOpts)
                    } else if(cVal === 'JVMOptions'){
@@ -168,8 +169,8 @@ function initSettingsValues(){
                }
            }
        }
+    }

-    })
 }

 /**
@@ -416,8 +417,8 @@ ipcRenderer.on(MSFT_OPCODE.REPLY_LOGIN, (_, ...arguments_) => {
            const authCode = queryMap.code
            AuthManager.addMicrosoftAccount(authCode).then(value => {
                updateSelectedAccount(value)
-                switchView(getCurrentView(), viewOnClose, 500, 500, () => {
-                    prepareSettings()
+                switchView(getCurrentView(), viewOnClose, 500, 500, async () => {
+                    await prepareSettings()
                })
            })
                .catch((displayableError) => {
@@ -713,13 +714,13 @@ const settingsModsContainer = document.getElementById('settingsModsContainer')
 /**
 * Resolve and update the mods on the UI.
 */
-function resolveModsForUI(){
+async function resolveModsForUI(){
    const serv = ConfigManager.getSelectedServer()

-    const distro = DistroManager.getDistribution()
+    const distro = await DistroAPI.getDistribution()
    const servConf = ConfigManager.getModConfiguration(serv)

-    const modStr = parseModulesForUI(distro.getServer(serv).getModules(), false, servConf.mods)
+    const modStr = parseModulesForUI(distro.getServerById(serv).modules, false, servConf.mods)

    document.getElementById('settingsReqModsContent').innerHTML = modStr.reqMods
    document.getElementById('settingsOptModsContent').innerHTML = modStr.optMods
@@ -739,17 +740,17 @@ function parseModulesForUI(mdls, submodules, servConf){

    for(const mdl of mdls){

-        if(mdl.getType() === DistroManager.Types.ForgeMod || mdl.getType() === DistroManager.Types.LiteMod || mdl.getType() === DistroManager.Types.LiteLoader){
+        if(mdl.rawModule.type === Type.ForgeMod || mdl.rawModule.type === Type.LiteMod || mdl.rawModule.type === Type.LiteLoader){

-            if(mdl.getRequired().isRequired()){
+            if(mdl.getRequired().value){

-                reqMods += `<div id="${mdl.getVersionlessID()}" class="settingsBaseMod settings${submodules ? 'Sub' : ''}Mod" enabled>
+                reqMods += `<div id="${mdl.getVersionlessMavenIdentifier()}" class="settingsBaseMod settings${submodules ? 'Sub' : ''}Mod" enabled>
                    <div class="settingsModContent">
                        <div class="settingsModMainWrapper">
                            <div class="settingsModStatus"></div>
                            <div class="settingsModDetails">
-                                <span class="settingsModName">${mdl.getName()}</span>
-                                <span class="settingsModVersion">v${mdl.getVersion()}</span>
+                                <span class="settingsModName">${mdl.rawModule.name}</span>
+                                <span class="settingsModVersion">v${mdl.mavenComponents.version}</span>
                            </div>
                        </div>
                        <label class="toggleSwitch" reqmod>
@@ -757,32 +758,32 @@ function parseModulesForUI(mdls, submodules, servConf){
                            <span class="toggleSwitchSlider"></span>
                        </label>
                    </div>
-                    ${mdl.hasSubModules() ? `<div class="settingsSubModContainer">
-                        ${Object.values(parseModulesForUI(mdl.getSubModules(), true, servConf[mdl.getVersionlessID()])).join('')}
+                    ${mdl.subModules.length > 0 ? `<div class="settingsSubModContainer">
+                        ${Object.values(parseModulesForUI(mdl.subModules, true, servConf[mdl.getVersionlessMavenIdentifier()])).join('')}
                    </div>` : ''}
                </div>`

            } else {

-                const conf = servConf[mdl.getVersionlessID()]
+                const conf = servConf[mdl.getVersionlessMavenIdentifier()]
                const val = typeof conf === 'object' ? conf.value : conf

-                optMods += `<div id="${mdl.getVersionlessID()}" class="settingsBaseMod settings${submodules ? 'Sub' : ''}Mod" ${val ? 'enabled' : ''}>
+                optMods += `<div id="${mdl.getVersionlessMavenIdentifier()}" class="settingsBaseMod settings${submodules ? 'Sub' : ''}Mod" ${val ? 'enabled' : ''}>
                    <div class="settingsModContent">
                        <div class="settingsModMainWrapper">
                            <div class="settingsModStatus"></div>
                            <div class="settingsModDetails">
-                                <span class="settingsModName">${mdl.getName()}</span>
-                                <span class="settingsModVersion">v${mdl.getVersion()}</span>
+                                <span class="settingsModName">${mdl.rawModule.name}</span>
+                                <span class="settingsModVersion">v${mdl.mavenComponents.version}</span>
                            </div>
                        </div>
                        <label class="toggleSwitch">
-                            <input type="checkbox" formod="${mdl.getVersionlessID()}" ${val ? 'checked' : ''}>
+                            <input type="checkbox" formod="${mdl.getVersionlessMavenIdentifier()}" ${val ? 'checked' : ''}>
                            <span class="toggleSwitchSlider"></span>
                        </label>
                    </div>
-                    ${mdl.hasSubModules() ? `<div class="settingsSubModContainer">
-                        ${Object.values(parseModulesForUI(mdl.getSubModules(), true, conf.mods)).join('')}
+                    ${mdl.subModules.length > 0 ? `<div class="settingsSubModContainer">
+                        ${Object.values(parseModulesForUI(mdl.subModules, true, conf.mods)).join('')}
                    </div>` : ''}
                </div>`

@@ -858,10 +859,10 @@ let CACHE_DROPIN_MODS
 * Resolve any located drop-in mods for this server and
 * populate the results onto the UI.
 */
-function resolveDropinModsForUI(){
-    const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
-    CACHE_SETTINGS_MODS_DIR = path.join(ConfigManager.getInstanceDirectory(), serv.getID(), 'mods')
-    CACHE_DROPIN_MODS = DropinModUtil.scanForDropinMods(CACHE_SETTINGS_MODS_DIR, serv.getMinecraftVersion())
+async function resolveDropinModsForUI(){
+    const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
+    CACHE_SETTINGS_MODS_DIR = path.join(ConfigManager.getInstanceDirectory(), serv.rawServer.id, 'mods')
+    CACHE_DROPIN_MODS = DropinModUtil.scanForDropinMods(CACHE_SETTINGS_MODS_DIR, serv.rawServer.minecraftVersion)

    let dropinMods = ''

@@ -934,12 +935,12 @@ function bindDropinModFileSystemButton(){
        fsBtn.removeAttribute('drag')
    }

-    fsBtn.ondrop = e => {
+    fsBtn.ondrop = async e => {
        fsBtn.removeAttribute('drag')
        e.preventDefault()

        DropinModUtil.addDropinMods(e.dataTransfer.files, CACHE_SETTINGS_MODS_DIR)
-        reloadDropinMods()
+        await reloadDropinMods()
    }
 }

@@ -971,18 +972,18 @@ function saveDropinModConfiguration(){

 // Refresh the drop-in mods when F5 is pressed.
 // Only active on the mods tab.
-document.addEventListener('keydown', (e) => {
+document.addEventListener('keydown', async (e) => {
    if(getCurrentView() === VIEWS.settings && selectedSettingsTab === 'settingsTabMods'){
        if(e.key === 'F5'){
-            reloadDropinMods()
+            await reloadDropinMods()
            saveShaderpackSettings()
-            resolveShaderpacksForUI()
+            await resolveShaderpacksForUI()
        }
    }
 })

-function reloadDropinMods(){
-    resolveDropinModsForUI()
+async function reloadDropinMods(){
+    await resolveDropinModsForUI()
    bindDropinModsRemoveButton()
    bindDropinModFileSystemButton()
    bindModsToggleSwitch()
@@ -997,9 +998,9 @@ let CACHE_SELECTED_SHADERPACK
 /**
 * Load shaderpack information.
 */
-function resolveShaderpacksForUI(){
-    const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
-    CACHE_SETTINGS_INSTANCE_DIR = path.join(ConfigManager.getInstanceDirectory(), serv.getID())
+async function resolveShaderpacksForUI(){
+    const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())
+    CACHE_SETTINGS_INSTANCE_DIR = path.join(ConfigManager.getInstanceDirectory(), serv.rawServer.id)
    CACHE_SHADERPACKS = DropinModUtil.scanForShaderpacks(CACHE_SETTINGS_INSTANCE_DIR)
    CACHE_SELECTED_SHADERPACK = DropinModUtil.getEnabledShaderpack(CACHE_SETTINGS_INSTANCE_DIR)

@@ -1058,13 +1059,13 @@ function bindShaderpackButton() {
        spBtn.removeAttribute('drag')
    }

-    spBtn.ondrop = e => {
+    spBtn.ondrop = async e => {
        spBtn.removeAttribute('drag')
        e.preventDefault()

        DropinModUtil.addShaderpacks(e.dataTransfer.files, CACHE_SETTINGS_INSTANCE_DIR)
        saveShaderpackSettings()
-        resolveShaderpacksForUI()
+        await resolveShaderpacksForUI()
    }
 }

@@ -1073,19 +1074,19 @@ function bindShaderpackButton() {
 /**
 * Load the currently selected server information onto the mods tab.
 */
-function loadSelectedServerOnModsTab(){
-    const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
+async function loadSelectedServerOnModsTab(){
+    const serv = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer())

    for(const el of document.getElementsByClassName('settingsSelServContent')) {
        el.innerHTML = `
-            <img class="serverListingImg" src="${serv.getIcon()}"/>
+            <img class="serverListingImg" src="${serv.rawServer.icon}"/>
            <div class="serverListingDetails">
-                <span class="serverListingName">${serv.getName()}</span>
-                <span class="serverListingDescription">${serv.getDescription()}</span>
+                <span class="serverListingName">${serv.rawServer.name}</span>
+                <span class="serverListingDescription">${serv.rawServer.description}</span>
                <div class="serverListingInfo">
-                    <div class="serverListingVersion">${serv.getMinecraftVersion()}</div>
-                    <div class="serverListingRevision">${serv.getVersion()}</div>
-                    ${serv.isMainServer() ? `<div class="serverListingStarWrapper">
+                    <div class="serverListingVersion">${serv.rawServer.minecraftVersion}</div>
+                    <div class="serverListingRevision">${serv.rawServer.version}</div>
+                    ${serv.rawServer.mainServer ? `<div class="serverListingStarWrapper">
                        <svg id="Layer_1" viewBox="0 0 107.45 104.74" width="20px" height="20px">
                            <defs>
                                <style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-miterlimit:10;}</style>
@@ -1103,9 +1104,9 @@ function loadSelectedServerOnModsTab(){

 // Bind functionality to the server switch button.
 Array.from(document.getElementsByClassName('settingsSwitchServerButton')).forEach(el => {
-    el.addEventListener('click', (e) => {
+    el.addEventListener('click', async e => {
        e.target.blur()
-        toggleServerSelection(true)
+        await toggleServerSelection(true)
    })
 })

@@ -1123,8 +1124,8 @@ function saveAllModConfigurations(){
 * server is changed.
 */
 function animateSettingsTabRefresh(){
-    $(`#${selectedSettingsTab}`).fadeOut(500, () => {
-        prepareSettings()
+    $(`#${selectedSettingsTab}`).fadeOut(500, async () => {
+        await prepareSettings()
        $(`#${selectedSettingsTab}`).fadeIn(500)
    })
 }
@@ -1132,15 +1133,15 @@ function animateSettingsTabRefresh(){
 /**
 * Prepare the Mods tab for display.
 */
-function prepareModsTab(first){
-    resolveModsForUI()
-    resolveDropinModsForUI()
-    resolveShaderpacksForUI()
+async function prepareModsTab(first){
+    await resolveModsForUI()
+    await resolveDropinModsForUI()
+    await resolveShaderpacksForUI()
    bindDropinModsRemoveButton()
    bindDropinModFileSystemButton()
    bindShaderpackButton()
    bindModsToggleSwitch()
-    loadSelectedServerOnModsTab()
+    await loadSelectedServerOnModsTab()
 }

 /**
@@ -1348,8 +1349,8 @@ function populateMemoryStatus(){
 * 
 * @param {string} execPath The executable path to populate against.
 */
-function populateJavaExecDetails(execPath){
-    const jg = new JavaGuard(DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion())
+async function populateJavaExecDetails(execPath){
+    const jg = new JavaGuard((await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()).rawServer.minecraftVersion)
    jg._validateJavaBinary(execPath).then(v => {
        if(v.valid){
            const vendor = v.vendor != null ? ` (${v.vendor})` : ''
@@ -1364,18 +1365,18 @@ function populateJavaExecDetails(execPath){
    })
 }

-function populateJavaReqDesc() {
-    const mcVer = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
-    if(Util.mcVersionAtLeast('1.17', mcVer)) {
+async function populateJavaReqDesc() {
+    const mcVer = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()).rawServer.minecraftVersion
+    if(mcVersionAtLeast('1.17', mcVer)) {
        settingsJavaReqDesc.innerHTML = 'Requires Java 17 x64.'
    } else {
        settingsJavaReqDesc.innerHTML = 'Requires Java 8 x64.'
    }
 }

-function populateJvmOptsLink() {
-    const mcVer = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer()).getMinecraftVersion()
-    if(Util.mcVersionAtLeast('1.17', mcVer)) {
+async function populateJvmOptsLink() {
+    const mcVer = (await DistroAPI.getDistribution()).getServerById(ConfigManager.getSelectedServer()).rawServer.minecraftVersion
+    if(mcVersionAtLeast('1.17', mcVer)) {
        settingsJvmOptsLink.innerHTML = 'Available Options for Java 17 (HotSpot VM)'
        settingsJvmOptsLink.href = 'https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html#extra-options-for-java'
    } else {
@@ -1387,11 +1388,11 @@ function populateJvmOptsLink() {
 /**
 * Prepare the Java tab for display.
 */
-function prepareJavaTab(){
+async function prepareJavaTab(){
    bindRangeSlider()
    populateMemoryStatus()
-    populateJavaReqDesc()
-    populateJvmOptsLink()
+    await populateJavaReqDesc()
+    await populateJvmOptsLink()
 }

 /**
@@ -1567,17 +1568,17 @@ function prepareUpdateTab(data = null){
  * 
  * @param {boolean} first Whether or not it is the first load.
  */
-function prepareSettings(first = false) {
+async function prepareSettings(first = false) {
    if(first){
        setupSettingsTabs()
        initSettingsValidators()
        prepareUpdateTab()
    } else {
-        prepareModsTab()
+        await prepareModsTab()
    }
-    initSettingsValues()
+    await initSettingsValues()
    prepareAccountsTab()
-    prepareJavaTab()
+    await prepareJavaTab()
    prepareAboutTab()
 }

--- a/app/assets/js/scripts/uibinder.js
+++ b/app/assets/js/scripts/uibinder.js
@@ -4,10 +4,11 @@
 */
 // Requirements
 const path          = require('path')
+const { Type }      = require('helios-distribution-types')

 const AuthManager   = require('./assets/js/authmanager')
 const ConfigManager = require('./assets/js/configmanager')
-const DistroManager = require('./assets/js/distromanager')
+const { DistroAPI } = require('./assets/js/distromanager')
 const Lang          = require('./assets/js/langloader')

 let rscShouldLoad = false
@@ -40,10 +41,10 @@ let currentView
 */
 function switchView(current, next, currentFadeTime = 500, nextFadeTime = 500, onCurrentFade = () => {}, onNextFade = () => {}){
    currentView = next
-    $(`${current}`).fadeOut(currentFadeTime, () => {
-        onCurrentFade()
-        $(`${next}`).fadeIn(nextFadeTime, () => {
-            onNextFade()
+    $(`${current}`).fadeOut(currentFadeTime, async () => {
+        await onCurrentFade()
+        $(`${next}`).fadeIn(nextFadeTime, async () => {
+            await onNextFade()
        })
    })
 }
@@ -57,15 +58,15 @@ function getCurrentView(){
    return currentView
 }

-function showMainUI(data){
+async function showMainUI(data){

    if(!isDev){
        loggerAutoUpdater.info('Initializing..')
        ipcRenderer.send('autoUpdateAction', 'initAutoUpdater', ConfigManager.getAllowPrerelease())
    }

-    prepareSettings(true)
-    updateSelectedServer(data.getServer(ConfigManager.getSelectedServer()))
+    await prepareSettings(true)
+    updateSelectedServer(data.getServerById(ConfigManager.getSelectedServer()))
    refreshServerStatus()
    setTimeout(() => {
        document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
@@ -133,7 +134,7 @@ function showFatalStartupError(){
 * @param {Object} data The distro index object.
 */
 function onDistroRefresh(data){
-    updateSelectedServer(data.getServer(ConfigManager.getSelectedServer()))
+    updateSelectedServer(data.getServerById(ConfigManager.getSelectedServer()))
    refreshServerStatus()
    initNews()
    syncModConfigurations(data)
@@ -149,10 +150,10 @@ function syncModConfigurations(data){

    const syncedCfgs = []

-    for(let serv of data.getServers()){
+    for(let serv of data.servers){

-        const id = serv.getID()
-        const mdls = serv.getModules()
+        const id = serv.rawServer.id
+        const mdls = serv.modules
        const cfg = ConfigManager.getModConfiguration(id)

        if(cfg != null){
@@ -161,20 +162,20 @@ function syncModConfigurations(data){
            const mods = {}

            for(let mdl of mdls){
-                const type = mdl.getType()
+                const type = mdl.rawModule.type

-                if(type === DistroManager.Types.ForgeMod || type === DistroManager.Types.LiteMod || type === DistroManager.Types.LiteLoader){
-                    if(!mdl.getRequired().isRequired()){
-                        const mdlID = mdl.getVersionlessID()
+                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
+                    if(!mdl.getRequired().value){
+                        const mdlID = mdl.getVersionlessMavenIdentifier()
                        if(modsOld[mdlID] == null){
-                            mods[mdlID] = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                            mods[mdlID] = scanOptionalSubModules(mdl.subModules, mdl)
                        } else {
-                            mods[mdlID] = mergeModConfiguration(modsOld[mdlID], scanOptionalSubModules(mdl.getSubModules(), mdl), false)
+                            mods[mdlID] = mergeModConfiguration(modsOld[mdlID], scanOptionalSubModules(mdl.subModules, mdl), false)
                        }
                    } else {
-                        if(mdl.hasSubModules()){
-                            const mdlID = mdl.getVersionlessID()
-                            const v = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                        if(mdl.subModules.length > 0){
+                            const mdlID = mdl.getVersionlessMavenIdentifier()
+                            const v = scanOptionalSubModules(mdl.subModules, mdl)
                            if(typeof v === 'object'){
                                if(modsOld[mdlID] == null){
                                    mods[mdlID] = v
@@ -197,15 +198,15 @@ function syncModConfigurations(data){
            const mods = {}

            for(let mdl of mdls){
-                const type = mdl.getType()
-                if(type === DistroManager.Types.ForgeMod || type === DistroManager.Types.LiteMod || type === DistroManager.Types.LiteLoader){
-                    if(!mdl.getRequired().isRequired()){
-                        mods[mdl.getVersionlessID()] = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                const type = mdl.rawModule.type
+                if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
+                    if(!mdl.getRequired().value){
+                        mods[mdl.getVersionlessMavenIdentifier()] = scanOptionalSubModules(mdl.subModules, mdl)
                    } else {
-                        if(mdl.hasSubModules()){
-                            const v = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                        if(mdl.subModules.length > 0){
+                            const v = scanOptionalSubModules(mdl.subModules, mdl)
                            if(typeof v === 'object'){
-                                mods[mdl.getVersionlessID()] = v
+                                mods[mdl.getVersionlessMavenIdentifier()] = v
                            }
                        }
                    }
@@ -232,8 +233,8 @@ function syncModConfigurations(data){
 function ensureJavaSettings(data) {

    // Nothing too fancy for now.
-    for(const serv of data.getServers()){
-        ConfigManager.ensureJavaConfig(serv.getID(), serv.getMinecraftVersion())
+    for(const serv of data.servers){
+        ConfigManager.ensureJavaConfig(serv.rawServer.id, serv.rawServer.minecraftVersion)
    }

    ConfigManager.save()
@@ -251,17 +252,17 @@ function scanOptionalSubModules(mdls, origin){
        const mods = {}

        for(let mdl of mdls){
-            const type = mdl.getType()
+            const type = mdl.rawModule.type
            // Optional types.
-            if(type === DistroManager.Types.ForgeMod || type === DistroManager.Types.LiteMod || type === DistroManager.Types.LiteLoader){
+            if(type === Type.ForgeMod || type === Type.LiteMod || type === Type.LiteLoader){
                // It is optional.
-                if(!mdl.getRequired().isRequired()){
-                    mods[mdl.getVersionlessID()] = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                if(!mdl.getRequired().value){
+                    mods[mdl.getVersionlessMavenIdentifier()] = scanOptionalSubModules(mdl.subModules, mdl)
                } else {
                    if(mdl.hasSubModules()){
-                        const v = scanOptionalSubModules(mdl.getSubModules(), mdl)
+                        const v = scanOptionalSubModules(mdl.subModules, mdl)
                        if(typeof v === 'object'){
-                            mods[mdl.getVersionlessID()] = v
+                            mods[mdl.getVersionlessMavenIdentifier()] = v
                        }
                    }
                }
@@ -272,13 +273,13 @@ function scanOptionalSubModules(mdls, origin){
            const ret = {
                mods
            }
-            if(!origin.getRequired().isRequired()){
-                ret.value = origin.getRequired().isDefault()
+            if(!origin.getRequired().value){
+                ret.value = origin.getRequired().def
            }
            return ret
        }
    }
-    return origin.getRequired().isDefault()
+    return origin.getRequired().def
 }

 /**
@@ -323,18 +324,6 @@ function mergeModConfiguration(o, n, nReq = false){
    return n
 }

-function refreshDistributionIndex(remote, onSuccess, onError){
-    if(remote){
-        DistroManager.pullRemote()
-            .then(onSuccess)
-            .catch(onError)
-    } else {
-        DistroManager.pullLocal()
-            .then(onSuccess)
-            .catch(onError)
-    }
-}
-
 async function validateSelectedAccount(){
    const selectedAcc = ConfigManager.getSelectedAccount()
    if(selectedAcc != null){
@@ -429,14 +418,14 @@ function setSelectedAccount(uuid){
 }

 // Synchronous Listener
-document.addEventListener('readystatechange', function(){
+document.addEventListener('readystatechange', async () => {

    if (document.readyState === 'interactive' || document.readyState === 'complete'){
        if(rscShouldLoad){
            rscShouldLoad = false
            if(!fatalStartupError){
-                const data = DistroManager.getDistribution()
-                showMainUI(data)
+                const data = await DistroAPI.getDistribution()
+                await showMainUI(data)
            } else {
                showFatalStartupError()
            }
@@ -446,13 +435,13 @@ document.addEventListener('readystatechange', function(){
 }, false)

 // Actions that must be performed after the distribution index is downloaded.
-ipcRenderer.on('distributionIndexDone', (event, res) => {
+ipcRenderer.on('distributionIndexDone', async (event, res) => {
    if(res) {
-        const data = DistroManager.getDistribution()
+        const data = await DistroAPI.getDistribution()
        syncModConfigurations(data)
        ensureJavaSettings(data)
        if(document.readyState === 'interactive' || document.readyState === 'complete'){
-            showMainUI(data)
+            await showMainUI(data)
        } else {
            rscShouldLoad = true
        }
@@ -467,11 +456,10 @@ ipcRenderer.on('distributionIndexDone', (event, res) => {
 })

 // Util for development
-function devModeToggle() {
-    DistroManager.setDevMode(true)
-    DistroManager.pullLocal().then((data) => {
-        ensureJavaSettings(data)
-        updateSelectedServer(data.getServers()[0])
-        syncModConfigurations(data)
-    })
+async function devModeToggle() {
+    DistroAPI.toggleDevMode(true)
+    const data = await DistroAPI.getDistributionLocalLoadOnly()
+    ensureJavaSettings(data)
+    updateSelectedServer(data.getServers()[0])
+    syncModConfigurations(data)
 }