From 256c87d25134b759d34cd1e3d710d66233757c5a Mon Sep 17 00:00:00 2001 From: IkyMax Date: Sun, 7 Apr 2024 16:38:19 -0600 Subject: [PATCH] Scripts now use limbo-core --- app/assets/js/authmanager.js | 8 ++++---- app/assets/js/configmanager.js | 4 ++-- app/assets/js/discordwrapper.js | 2 +- app/assets/js/distromanager.js | 2 +- app/assets/js/preloader.js | 4 ++-- app/assets/js/processbuilder.js | 4 ++-- app/assets/js/scripts/landing.js | 8 ++++---- app/assets/js/scripts/uicore.js | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/assets/js/authmanager.js b/app/assets/js/authmanager.js index 5a24f30a..065f4ac0 100644 --- a/app/assets/js/authmanager.js +++ b/app/assets/js/authmanager.js @@ -10,10 +10,10 @@ */ // Requirements const ConfigManager = require('./configmanager') -const { LoggerUtil } = require('helios-core') -const { RestResponseStatus } = require('helios-core/common') -const { MojangRestAPI, MojangErrorCode } = require('helios-core/mojang') -const { MicrosoftAuth, MicrosoftErrorCode } = require('helios-core/microsoft') +const { LoggerUtil } = require('limbo-core') +const { RestResponseStatus } = require('limbo-core/common') +const { MojangRestAPI, MojangErrorCode } = require('limbo-core/mojang') +const { MicrosoftAuth, MicrosoftErrorCode } = require('limbo-core/microsoft') const { AZURE_CLIENT_ID } = require('./ipcconstants') const Lang = require('./langloader') diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864fe..fd1abd8b 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -1,5 +1,5 @@ const fs = require('fs-extra') -const { LoggerUtil } = require('helios-core') +const { LoggerUtil } = require('limbo-core') const os = require('os') 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 dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.limbostudios') const launcherDir = require('@electron/remote').app.getPath('userData') diff --git a/app/assets/js/discordwrapper.js b/app/assets/js/discordwrapper.js index 11ed053b..7688de46 100644 --- a/app/assets/js/discordwrapper.js +++ b/app/assets/js/discordwrapper.js @@ -1,5 +1,5 @@ // Work in progress -const { LoggerUtil } = require('helios-core') +const { LoggerUtil } = require('limbo-core') const logger = LoggerUtil.getLogger('DiscordWrapper') diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 8ae8ca0c..bb03b6f5 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -1,4 +1,4 @@ -const { DistributionAPI } = require('helios-core/common') +const { DistributionAPI } = require('limbo-core/common') const ConfigManager = require('./configmanager') diff --git a/app/assets/js/preloader.js b/app/assets/js/preloader.js index 95ead733..99950fcd 100644 --- a/app/assets/js/preloader.js +++ b/app/assets/js/preloader.js @@ -6,9 +6,9 @@ const path = require('path') const ConfigManager = require('./configmanager') const { DistroAPI } = require('./distromanager') const LangLoader = require('./langloader') -const { LoggerUtil } = require('helios-core') +const { LoggerUtil } = require('limbo-core') // eslint-disable-next-line no-unused-vars -const { HeliosDistribution } = require('helios-core/common') +const { HeliosDistribution } = require('limbo-core/common') const logger = LoggerUtil.getLogger('Preloader') diff --git a/app/assets/js/processbuilder.js b/app/assets/js/processbuilder.js index 0e955621..9416b2d1 100644 --- a/app/assets/js/processbuilder.js +++ b/app/assets/js/processbuilder.js @@ -2,8 +2,8 @@ const AdmZip = require('adm-zip') const child_process = require('child_process') const crypto = require('crypto') const fs = require('fs-extra') -const { LoggerUtil } = require('helios-core') -const { getMojangOS, isLibraryCompatible, mcVersionAtLeast } = require('helios-core/common') +const { LoggerUtil } = require('limbo-core') +const { getMojangOS, isLibraryCompatible, mcVersionAtLeast } = require('limbo-core/common') const { Type } = require('helios-distribution-types') const os = require('os') const path = require('path') diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index fe1ffa70..66ae5ad6 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -6,18 +6,18 @@ const { URL } = require('url') const { MojangRestAPI, getServerStatus -} = require('helios-core/mojang') +} = require('limbo-core/mojang') const { RestResponseStatus, isDisplayableError, validateLocalFile -} = require('helios-core/common') +} = require('limbo-core/common') const { FullRepair, DistributionIndexProcessor, MojangIndexProcessor, downloadFile -} = require('helios-core/dl') +} = require('limbo-core/dl') const { validateSelectedJvm, ensureJavaDirIsRoot, @@ -25,7 +25,7 @@ const { discoverBestJvmInstallation, latestOpenJDK, extractJdk -} = require('helios-core/java') +} = require('limbo-core/java') // Internal Requirements const DiscordWrapper = require('./assets/js/discordwrapper') diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js index 9aacf9a9..8b63717e 100644 --- a/app/assets/js/scripts/uicore.js +++ b/app/assets/js/scripts/uicore.js @@ -9,7 +9,7 @@ const $ = require('jquery') const {ipcRenderer, shell, webFrame} = require('electron') const remote = require('@electron/remote') const isDev = require('./assets/js/isdev') -const { LoggerUtil } = require('helios-core') +const { LoggerUtil } = require('limbo-core') const Lang = require('./assets/js/langloader') const loggerUICore = LoggerUtil.getLogger('UICore') diff --git a/package-lock.json b/package-lock.json index ef79b0b6..39c1d82a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "got": "^11.8.5", "helios-distribution-types": "^1.3.0", "jquery": "^3.7.1", - "limbo-core": "~1.0.0", + "limbo-core": "~2.2.0", "lodash.merge": "^4.6.2", "semver": "^7.6.0", "toml": "^3.0.0" @@ -3233,9 +3233,9 @@ } }, "node_modules/limbo-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/limbo-core/-/limbo-core-1.0.0.tgz", - "integrity": "sha512-IdF9BacvmTE/hVsAQbijJFmrZZjo/yIS+jPJCFqNbszqFioE6mobodruNn36kq6tsGAKIBVjpk5DRgDpIwoUsw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/limbo-core/-/limbo-core-2.2.0.tgz", + "integrity": "sha512-fm/X85r470XIKaWRuAO6CEjM3s5RBr23wjoPQo6twC3T1HJSRfipTwFG3xpPGwiyN6Qr+PDsTkfZH9WbR3t+wg==", "dependencies": { "fastq": "^1.17.1", "fs-extra": "^11.2.0", diff --git a/package.json b/package.json index 1e906fd2..95ed8d68 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "fs-extra": "^11.1.1", "github-syntax-dark": "^0.5.0", "got": "^11.8.5", - "limbo-core": "~1.0.0", + "limbo-core": "~2.2.0", "helios-distribution-types": "^1.3.0", "jquery": "^3.7.1", "lodash.merge": "^4.6.2",