ForgeWrapper support, ESLint added

This commit is contained in:
Pierce 2020-05-28 22:39:13 -04:00
parent 9e21e8189c
commit 99b7ff2367
9 changed files with 2446 additions and 767 deletions

View file

@ -1,143 +1,143 @@
const request = require('request');
const uuid = require('uuid/v1');
let api_url = "https://authserver.mojang.com";
const request = require('request')
const uuid = require('uuid/v1')
let api_url = 'https://authserver.mojang.com'
module.exports.getAuth = function (username, password) {
return new Promise((resolve, reject) => {
if (!password) {
const user = {
access_token: uuid(),
client_token: uuid(),
uuid: uuid(),
name: username,
user_properties: JSON.stringify({})
};
return new Promise((resolve, reject) => {
if (!password) {
const user = {
access_token: uuid(),
client_token: uuid(),
uuid: uuid(),
name: username,
user_properties: JSON.stringify({})
}
return resolve(user);
}
return resolve(user)
}
const requestObject = {
url: api_url + "/authenticate",
json: {
agent: {
name: "Minecraft",
version: 1
},
username: username,
password: password,
clientToken: uuid(),
requestUser: true
}
};
const requestObject = {
url: api_url + '/authenticate',
json: {
agent: {
name: 'Minecraft',
version: 1
},
username: username,
password: password,
clientToken: uuid(),
requestUser: true
}
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error);
if (!body || !body.selectedProfile) {
return reject("Validation error: " + response.statusMessage);
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error)
if (!body || !body.selectedProfile) {
return reject(new Error('Validation error: ' + response.statusMessage))
}
const userProfile = {
access_token: body.accessToken,
client_token: body.clientToken,
uuid: body.selectedProfile.id,
name: body.selectedProfile.name,
selected_profile: body.selectedProfile,
user_properties: JSON.stringify(body.user.properties || {})
};
const userProfile = {
access_token: body.accessToken,
client_token: body.clientToken,
uuid: body.selectedProfile.id,
name: body.selectedProfile.name,
selected_profile: body.selectedProfile,
user_properties: JSON.stringify(body.user.properties || {})
}
resolve(userProfile);
});
});
};
resolve(userProfile)
})
})
}
module.exports.validate = function (access_token, client_token) {
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + "/validate",
json: {
"accessToken": access_token,
"clientToken": client_token
}
};
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + '/validate',
json: {
accessToken: access_token,
clientToken: client_token
}
}
request.post(requestObject, async function (error, response, body) {
if (error) return reject(error);
request.post(requestObject, async function (error, response, body) {
if (error) return reject(error)
if (!body) resolve(true);
else reject(body);
});
});
};
if (!body) resolve(true)
else reject(body)
})
})
}
module.exports.refreshAuth = function (accessToken, clientToken, selectedProfile) {
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + "/refresh",
json: {
"accessToken": accessToken,
"clientToken": clientToken,
"selectedProfile": selectedProfile,
"requestUser": true
}
};
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + '/refresh',
json: {
accessToken: accessToken,
clientToken: clientToken,
selectedProfile: selectedProfile,
requestUser: true
}
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error);
if (!body || !body.selectedProfile) {
return reject("Validation error: " + response.statusMessage);
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error)
if (!body || !body.selectedProfile) {
return reject(new Error('Validation error: ' + response.statusMessage))
}
const userProfile = {
access_token: body.accessToken,
client_token: uuid(),
uuid: body.selectedProfile.id,
name: body.selectedProfile.name,
user_properties: JSON.stringify(body.user.properties || {})
};
const userProfile = {
access_token: body.accessToken,
client_token: uuid(),
uuid: body.selectedProfile.id,
name: body.selectedProfile.name,
user_properties: JSON.stringify(body.user.properties || {})
}
resolve(userProfile);
});
});
};
resolve(userProfile)
})
})
}
module.exports.invalidate = function (accessToken, clientToken) {
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + "/invalidate",
json: {
"accessToken": accessToken,
"clientToken": clientToken
}
};
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + '/invalidate',
json: {
accessToken: accessToken,
clientToken: clientToken
}
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error);
request.post(requestObject, function (error, response, body) {
if (error) return reject(error)
if (!body) resolve(true);
else reject(body);
});
});
};
if (!body) resolve(true)
else reject(body)
})
})
}
module.exports.signOut = function (username, password) {
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + "/signout",
json: {
"username": username,
"password": password
}
};
return new Promise((resolve, reject) => {
const requestObject = {
url: api_url + '/signout',
json: {
username: username,
password: password
}
}
request.post(requestObject, function (error, response, body) {
if (error) return reject(error);
request.post(requestObject, function (error, response, body) {
if (error) return reject(error)
if (!body) resolve(true);
else reject(body);
});
});
};
if (!body) resolve(true)
else reject(body)
})
})
}
module.exports.changeApiUrl = function(url) {
api_url = url;
}
module.exports.changeApiUrl = function (url) {
api_url = url
}

BIN
components/fw.jar Normal file

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -1,140 +1,146 @@
const child = require('child_process');
const path = require('path');
const handler = require('./handler');
const fs = require('fs');
const EventEmitter = require('events').EventEmitter;
const child = require('child_process')
const path = require('path')
const Handler = require('./handler')
const fs = require('fs')
const EventEmitter = require('events').EventEmitter
class MCLCore extends EventEmitter {
constructor() {
super();
async launch (options = this.options) {
this.options = options
this.options.root = path.resolve(this.options.root)
this.options.overrides = {
...this.options.overrides,
url: {
meta: 'https://launchermeta.mojang.com',
resource: 'https://resources.download.minecraft.net',
mavenForge: 'http://files.minecraftforge.net/maven/',
defaultRepoForge: 'https://libraries.minecraft.net/',
fallbackMaven: 'https://search.maven.org/remotecontent?filepath=',
...this.options.overrides
? this.options.overrides.url
: undefined
}
}
// ForgeWrapper fork that is maintained on a side repo (https://github.com/Pierce01/ForgeWrapper)
this.options.forgeWrapper = {
jar: path.join(__dirname, 'fw.jar'),
version: '1.4.1-mclc'
}
async launch(options) {
this.options = options;
this.options.root = path.resolve(this.options.root);
this.options.overrides = {
...this.options.overrides,
url: {
meta: "https://launchermeta.mojang.com",
resource: "https://resources.download.minecraft.net",
mavenForge: "http://files.minecraftforge.net/maven/",
defaultRepoForge: "https://libraries.minecraft.net/",
fallbackMaven: "https://search.maven.org/remotecontent?filepath=",
...this.options.overrides ? this.options.overrides.url : undefined
}
};
this.handler = new Handler(this)
this.handler = new handler(this);
// Lets the events register. our magic switch!
await void(0);
if (fs.existsSync(path.join(__dirname, '..', 'package.json'))) {
this.emit('debug', `[MCLC]: MCLC version ${JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'), { encoding: 'utf8' })).version}`)
} else { this.emit('debug', '[MCLC]: Package JSON not found, skipping MCLC version check.') }
const java = await this.handler.checkJava(this.options.javaPath || 'java')
if (!java.run) {
this.emit('debug', `[MCLC]: Couldn't start Minecraft due to: ${java.message}`)
this.emit('close', 1)
return null
}
if(fs.existsSync(path.join(__dirname,'..', 'package.json'))) {
this.emit('debug', `[MCLC]: MCLC version ${JSON.parse(fs.readFileSync(path.join(__dirname,'..', 'package.json'), { encoding: 'utf8' })).version}`);
} else { this.emit('debug', `[MCLC]: Package JSON not found, skipping MCLC version check.`); }
const java = await this.handler.checkJava(this.options.javaPath || 'java');
if(!java.run) {
this.emit('debug', `[MCLC]: Couldn't start Minecraft due to: ${java.message}`);
this.emit('close', 1);
return null;
}
if (!fs.existsSync(this.options.root)) {
this.emit('debug', '[MCLC]: Attempting to create root folder')
fs.mkdirSync(this.options.root)
}
if(!fs.existsSync(this.options.root)) {
this.emit('debug', '[MCLC]: Attempting to create root folder');
fs.mkdirSync(this.options.root);
}
if (this.options.clientPackage) {
this.emit('debug', `[MCLC]: Extracting client package to ${this.options.root}`)
await this.handler.extractPackage()
}
if(this.options.clientPackage) {
this.emit('debug', `[MCLC]: Extracting client package to ${this.options.root}`);
await this.handler.extractPackage();
}
if (this.options.installer) {
// So the forge installer can run without breaking :)
const profilePath = path.join(this.options.root, 'launcher_profiles.json')
if (!fs.existsSync(profilePath)) { fs.writeFileSync(profilePath, JSON.stringify({}, null, 4)) }
await this.handler.runInstaller(this.options.installer)
}
if(this.options.installer) {
// So the forge installer can run without breaking :)
const profilePath = path.join(this.options.root, 'launcher_profiles.json');
if(!fs.existsSync(profilePath))
fs.writeFileSync(profilePath, JSON.stringify({}, null, 4));
await this.handler.runInstaller(this.options.installer)
}
const directory = this.options.overrides.directory || path.join(this.options.root, 'versions', this.options.version.number)
this.options.directory = directory
const directory = this.options.overrides.directory || path.join(this.options.root, 'versions', this.options.version.number);
this.options.directory = directory;
// Version JSON for the main launcher folder
const versionFile = await this.handler.getVersion()
const mcPath = this.options.overrides.minecraftJar || (this.options.version.custom
? path.join(this.options.root, 'versions', this.options.version.custom, `${this.options.version.custom}.jar`)
: path.join(directory, `${this.options.version.number}.jar`))
const nativePath = await this.handler.getNatives()
// Version JSON for the main launcher folder
const versionFile = await this.handler.getVersion();
const mcPath = this.options.overrides.minecraftJar || (this.options.version.custom ? path.join(this.options.root, 'versions', this.options.version.custom , `${this.options.version.custom}.jar`):
path.join(directory, `${this.options.version.number}.jar`));
const nativePath = await this.handler.getNatives();
if (!fs.existsSync(mcPath)) {
this.emit('debug', '[MCLC]: Attempting to download Minecraft version jar')
await this.handler.getJar()
}
if (!fs.existsSync(mcPath)) {
this.emit('debug', '[MCLC]: Attempting to download Minecraft version jar');
await this.handler.getJar();
}
let forge = null
let custom = null
if (this.options.forge) {
this.options.forge = path.resolve(this.options.forge)
let forge = null;
let custom = null;
if(this.options.forge) {
this.emit('debug', '[MCLC]: Detected Forge in options, getting dependencies');
forge = await this.handler.getForgeDependenciesLegacy();
}
if(this.options.version.custom) {
this.emit('debug', '[MCLC]: Detected custom in options, setting custom version file');
custom = JSON.parse(fs.readFileSync(path.join(this.options.root, 'versions', this.options.version.custom, `${this.options.version.custom}.json`), { encoding: 'utf8' }));
}
this.emit('debug', '[MCLC]: Detected Forge in options, getting dependencies')
forge = await this.handler.getForgeDependenciesLegacy()
if (forge === false) custom = await this.handler.getForgedWrapped()
}
if (this.options.version.custom || custom) {
this.emit('debug', '[MCLC]: Detected custom in options, setting custom version file')
custom = custom || JSON.parse(fs.readFileSync(path.join(this.options.root, 'versions', this.options.version.custom, `${this.options.version.custom}.json`), { encoding: 'utf8' }))
}
const args = [];
const args = []
// Jvm
let jvm = [
'-XX:-UseAdaptiveSizePolicy',
'-XX:-OmitStackTraceInFastThrow',
'-Dfml.ignorePatchDiscrepancies=true',
'-Dfml.ignoreInvalidMinecraftCertificates=true',
// Jvm
let jvm = [
'-XX:-UseAdaptiveSizePolicy',
'-XX:-OmitStackTraceInFastThrow',
'-Dfml.ignorePatchDiscrepancies=true',
'-Dfml.ignoreInvalidMinecraftCertificates=true',
`-Djava.library.path=${nativePath}`,
`-Xmx${this.options.memory.max}M`,
`-Xms${this.options.memory.min}M`
];
if(this.handler.getOS() === 'osx') {
if(parseInt(versionFile.id.split('.')[1]) > 12) jvm.push(await this.handler.getJVM());
} else jvm.push(await this.handler.getJVM());
]
if (this.handler.getOS() === 'osx') {
if (parseInt(versionFile.id.split('.')[1]) > 12) jvm.push(await this.handler.getJVM())
} else jvm.push(await this.handler.getJVM())
if(this.options.customArgs) jvm = jvm.concat(this.options.customArgs);
if (this.options.customArgs) jvm = jvm.concat(this.options.customArgs)
const classes = this.options.overrides.classes || await handler.cleanUp(await this.handler.getClasses());
let classPaths = ['-cp'];
const separator = this.handler.getOS() === "windows" ? ";" : ":";
this.emit('debug', `[MCLC]: Using ${separator} to separate class paths`);
if(forge) {
this.emit('debug', '[MCLC]: Setting Forge class paths');
classPaths.push(`${path.resolve(this.options.forge)}${separator}${forge.paths.join(separator)}${separator}${classes.join(separator)}${separator}${mcPath}`);
classPaths.push(forge.forge.mainClass)
} else {
const file = custom || versionFile;
// So mods like fabric work.
const jar = fs.existsSync(mcPath) ? `${separator}${mcPath}` : `${separator}${path.join(directory, `${this.options.version.number}.jar`)}`;
classPaths.push(`${classes.join(separator)}${jar}`);
classPaths.push(file.mainClass);
}
// Download version's assets
this.emit('debug', '[MCLC]: Attempting to download assets');
await this.handler.getAssets();
// Launch options. Thank you Lyrus for the reformat <3
const modification = forge ? forge.forge : null || custom ? custom : null;
const launchOptions = await this.handler.getLaunchOptions(modification);
const launchArguments = args.concat(jvm, classPaths, launchOptions);
this.emit('arguments', launchArguments);
this.emit('debug', `[MCLC]: Launching with arguments ${launchArguments.join(' ')}`);
const minecraft = child.spawn(this.options.javaPath ? this.options.javaPath : 'java', launchArguments,
{cwd: this.options.overrides.cwd || this.options.root});
minecraft.stdout.on('data', (data) => this.emit('data', data.toString('utf-8')));
minecraft.stderr.on('data', (data) => this.emit('data', data.toString('utf-8')));
minecraft.on('close', (code) => this.emit('close', code));
return minecraft;
const classes = this.options.overrides.classes || await Handler.cleanUp(await this.handler.getClasses(custom))
const classPaths = ['-cp']
const separator = this.handler.getOS() === 'windows' ? ';' : ':'
this.emit('debug', `[MCLC]: Using ${separator} to separate class paths`)
if (forge) {
this.emit('debug', '[MCLC]: Setting Forge class paths')
classPaths.push(`${path.resolve(this.options.forge)}${separator}${forge.paths.join(separator)}${separator}${classes.join(separator)}${separator}${mcPath}`)
classPaths.push(forge.forge.mainClass)
} else {
const file = custom || versionFile
// So mods like fabric work.
const jar = fs.existsSync(mcPath)
? `${separator}${mcPath}`
: `${separator}${path.join(directory, `${this.options.version.number}.jar`)}`
classPaths.push(`${classes.join(separator)}${jar}`)
classPaths.push(file.mainClass)
}
// Download version's assets
this.emit('debug', '[MCLC]: Attempting to download assets')
await this.handler.getAssets()
// Launch options. Thank you Lyrus for the reformat <3
const modification = forge ? forge.forge : null || custom ? custom : null
const launchOptions = await this.handler.getLaunchOptions(modification)
const launchArguments = args.concat(jvm, classPaths, launchOptions)
this.emit('arguments', launchArguments)
this.emit('debug', `[MCLC]: Launching with arguments ${launchArguments.join(' ')}`)
const minecraft = child.spawn(this.options.javaPath ? this.options.javaPath : 'java', launchArguments,
{ cwd: this.options.overrides.cwd || this.options.root })
minecraft.stdout.on('data', (data) => this.emit('data', data.toString('utf-8')))
minecraft.stderr.on('data', (data) => this.emit('data', data.toString('utf-8')))
minecraft.on('close', (code) => this.emit('close', code))
return minecraft
}
}
module.exports = MCLCore;
module.exports = MCLCore