Scripts now use limbo-core

This commit is contained in:
IkyMax 2024-04-07 16:38:19 -06:00
parent f2e1a24c5a
commit 256c87d251
10 changed files with 22 additions and 22 deletions

View File

@ -10,10 +10,10 @@
*/ */
// Requirements // Requirements
const ConfigManager = require('./configmanager') const ConfigManager = require('./configmanager')
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
const { RestResponseStatus } = require('helios-core/common') const { RestResponseStatus } = require('limbo-core/common')
const { MojangRestAPI, MojangErrorCode } = require('helios-core/mojang') const { MojangRestAPI, MojangErrorCode } = require('limbo-core/mojang')
const { MicrosoftAuth, MicrosoftErrorCode } = require('helios-core/microsoft') const { MicrosoftAuth, MicrosoftErrorCode } = require('limbo-core/microsoft')
const { AZURE_CLIENT_ID } = require('./ipcconstants') const { AZURE_CLIENT_ID } = require('./ipcconstants')
const Lang = require('./langloader') const Lang = require('./langloader')

View File

@ -1,5 +1,5 @@
const fs = require('fs-extra') const fs = require('fs-extra')
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
const os = require('os') const os = require('os')
const path = require('path') const path = require('path')
@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager')
const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME)
const dataPath = path.join(sysRoot, '.helioslauncher') const dataPath = path.join(sysRoot, '.limbostudios')
const launcherDir = require('@electron/remote').app.getPath('userData') const launcherDir = require('@electron/remote').app.getPath('userData')

View File

@ -1,5 +1,5 @@
// Work in progress // Work in progress
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
const logger = LoggerUtil.getLogger('DiscordWrapper') const logger = LoggerUtil.getLogger('DiscordWrapper')

View File

@ -1,4 +1,4 @@
const { DistributionAPI } = require('helios-core/common') const { DistributionAPI } = require('limbo-core/common')
const ConfigManager = require('./configmanager') const ConfigManager = require('./configmanager')

View File

@ -6,9 +6,9 @@ const path = require('path')
const ConfigManager = require('./configmanager') const ConfigManager = require('./configmanager')
const { DistroAPI } = require('./distromanager') const { DistroAPI } = require('./distromanager')
const LangLoader = require('./langloader') const LangLoader = require('./langloader')
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
const { HeliosDistribution } = require('helios-core/common') const { HeliosDistribution } = require('limbo-core/common')
const logger = LoggerUtil.getLogger('Preloader') const logger = LoggerUtil.getLogger('Preloader')

View File

@ -2,8 +2,8 @@ const AdmZip = require('adm-zip')
const child_process = require('child_process') const child_process = require('child_process')
const crypto = require('crypto') const crypto = require('crypto')
const fs = require('fs-extra') const fs = require('fs-extra')
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
const { getMojangOS, isLibraryCompatible, mcVersionAtLeast } = require('helios-core/common') const { getMojangOS, isLibraryCompatible, mcVersionAtLeast } = require('limbo-core/common')
const { Type } = require('helios-distribution-types') const { Type } = require('helios-distribution-types')
const os = require('os') const os = require('os')
const path = require('path') const path = require('path')

View File

@ -6,18 +6,18 @@ const { URL } = require('url')
const { const {
MojangRestAPI, MojangRestAPI,
getServerStatus getServerStatus
} = require('helios-core/mojang') } = require('limbo-core/mojang')
const { const {
RestResponseStatus, RestResponseStatus,
isDisplayableError, isDisplayableError,
validateLocalFile validateLocalFile
} = require('helios-core/common') } = require('limbo-core/common')
const { const {
FullRepair, FullRepair,
DistributionIndexProcessor, DistributionIndexProcessor,
MojangIndexProcessor, MojangIndexProcessor,
downloadFile downloadFile
} = require('helios-core/dl') } = require('limbo-core/dl')
const { const {
validateSelectedJvm, validateSelectedJvm,
ensureJavaDirIsRoot, ensureJavaDirIsRoot,
@ -25,7 +25,7 @@ const {
discoverBestJvmInstallation, discoverBestJvmInstallation,
latestOpenJDK, latestOpenJDK,
extractJdk extractJdk
} = require('helios-core/java') } = require('limbo-core/java')
// Internal Requirements // Internal Requirements
const DiscordWrapper = require('./assets/js/discordwrapper') const DiscordWrapper = require('./assets/js/discordwrapper')

View File

@ -9,7 +9,7 @@ const $ = require('jquery')
const {ipcRenderer, shell, webFrame} = require('electron') const {ipcRenderer, shell, webFrame} = require('electron')
const remote = require('@electron/remote') const remote = require('@electron/remote')
const isDev = require('./assets/js/isdev') const isDev = require('./assets/js/isdev')
const { LoggerUtil } = require('helios-core') const { LoggerUtil } = require('limbo-core')
const Lang = require('./assets/js/langloader') const Lang = require('./assets/js/langloader')
const loggerUICore = LoggerUtil.getLogger('UICore') const loggerUICore = LoggerUtil.getLogger('UICore')

8
package-lock.json generated
View File

@ -20,7 +20,7 @@
"got": "^11.8.5", "got": "^11.8.5",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"limbo-core": "~1.0.0", "limbo-core": "~2.2.0",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"semver": "^7.6.0", "semver": "^7.6.0",
"toml": "^3.0.0" "toml": "^3.0.0"
@ -3233,9 +3233,9 @@
} }
}, },
"node_modules/limbo-core": { "node_modules/limbo-core": {
"version": "1.0.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/limbo-core/-/limbo-core-1.0.0.tgz", "resolved": "https://registry.npmjs.org/limbo-core/-/limbo-core-2.2.0.tgz",
"integrity": "sha512-IdF9BacvmTE/hVsAQbijJFmrZZjo/yIS+jPJCFqNbszqFioE6mobodruNn36kq6tsGAKIBVjpk5DRgDpIwoUsw==", "integrity": "sha512-fm/X85r470XIKaWRuAO6CEjM3s5RBr23wjoPQo6twC3T1HJSRfipTwFG3xpPGwiyN6Qr+PDsTkfZH9WbR3t+wg==",
"dependencies": { "dependencies": {
"fastq": "^1.17.1", "fastq": "^1.17.1",
"fs-extra": "^11.2.0", "fs-extra": "^11.2.0",

View File

@ -32,7 +32,7 @@
"fs-extra": "^11.1.1", "fs-extra": "^11.1.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"got": "^11.8.5", "got": "^11.8.5",
"limbo-core": "~1.0.0", "limbo-core": "~2.2.0",
"helios-distribution-types": "^1.3.0", "helios-distribution-types": "^1.3.0",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",