artegoser/pimi-launcher-core
1
0
Fork 0
mirror of https://github.com/artegoser/pimi-launcher-core.git synced 2025-02-23 20:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

clean up classpaths, deprecating options.forge.path to options.forge

Browse source
This commit is contained in:
Pierce 2019-05-04 21:57:12 -04:00
parent ebefa405a0
commit 5748b386e3
5 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/events.js
View file

@ -1,3 +1,7 @@
const event = require('events');
module.exports = new event.EventEmitter();
const event = new (require('events')).EventEmitter();
event.on('newListener', event => {
if(event === 'start') {
process.emitWarning('The \'start\' event is deprecated. Use \'data\' instead.', 'DeprecationWarning');
}
});
module.exports = event;

11
components/handler.js
View file

@ -266,6 +266,17 @@ module.exports.getClasses = function (options, version) {
});
};
module.exports.cleanUp = async function(array) {
const newArray = [];
for(let argument in array) {
if(newArray.includes(array[argument])) continue;
newArray.push(array[argument]);
}
return newArray;
};
module.exports.getLaunchOptions = function (version, modification, options) {
return new Promise(resolve => {
let type = modification || version;

8
components/launcher.js
View file

@ -32,8 +32,9 @@ module.exports = async function (options) {
let forge = null;
let custom = null;
if(options.forge) {
if(options.forge.path) process.emitWarning('\'options.forge.path\' will be deprecated. Use \'options.forge\' instead');
event.emit('debug', '[MCLC]: Detected Forge in options, getting dependencies');
forge = await handler.getForgeDependencies(options.root, versionFile, options.forge.path);
forge = await handler.getForgeDependencies(options.root, versionFile, options.forge.path || options.forge);
}
if(options.version.custom) {
event.emit('debug', '[MCLC]: Detected custom in options, setting custom version file');
@ -56,17 +57,18 @@ module.exports = async function (options) {
if(options.customArgs) jvm = jvm.concat(options.customArgs);
const classes = await handler.getClasses(options, versionFile);
const classPaths = ['-cp'];
let classPaths = ['-cp'];
const separator = options.os === "windows" ? ";" : ":";
event.emit('debug', `[MCLC]: Using ${separator} to separate class paths`);
if(forge) {
event.emit('debug', '[MCLC]: Setting Forge class paths');
classPaths.push(`${options.forge.path}${separator}${forge.paths.join(separator)}${separator}${classes.join(separator)};${mcPath}`);
classPaths.push(`${options.forge.path || options.forge}${separator}${forge.paths.join(separator)}${separator}${classes.join(separator)};${mcPath}`);
classPaths.push(forge.forge.mainClass)
} else {
classPaths.push(`${mcPath}${separator}${classes.join(separator)}`);
classPaths.push(versionFile.mainClass || custom.mainClass);
}
classPaths = await handler.cleanUp(classPaths);
// Download version's assets
event.emit('debug', '[MCLC]: Attempting to download assets');