Use detected Factorio version

Remove Factorio_version from the config file and use the detected
version of Factorio instead.
This commit is contained in:
Hornwitser committed 2019-11-21 22:25:11 +01:00
1 parent 27fc68da0f
commit fcae3ef0c1
5 files changed
+20 -7

No files matched your search

+7
View File
@@ -443,6 +443,13 @@ class FactorioServer extends events.EventEmitter {
this._state = "init";
}
/**
* The version of Factorio that was detected
*/
get version() {
return this._version;
}
_attachStdio() {
this._server.stdout.on('data', chunk => { this._stdout.data(chunk); });
this._server.stdout.on('close', () => { this._stdout.end(); });
+4 -4
View File
@@ -38,7 +38,7 @@ async function listMods(config, instance) {
return new Promise((resolve, reject) => {
const instances = require("./../getInstances")(config).sync();
if (instances.includes(instance.name)) {
factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), config.factorio_version);
factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), instance.server.version);
factorioAPI.authenticate({
username: config.username,
token: config.token,
@@ -68,7 +68,7 @@ async function listMods(config, instance) {
});
} else {
// list shared mods in /sharedMods/
factorioAPI.init(false, 'sharedMods/', '', config.factorio_version);
factorioAPI.init(false, 'sharedMods/', '', instance.server.version);
factorioAPI.authenticate({
username: config.username,
token: config.token,
@@ -140,7 +140,7 @@ async function addMod(config, term, instance) {
if (term && term.length > 0) {
if (term.includes("mods.factorio.com/mods/")) { // https://mods.factorio.com/mods/Danielv123/ChooChoo
// treat it as a link download
factorioAPI.init(false, modDirectory, "", config.factorio_version);
factorioAPI.init(false, modDirectory, "", instance.server.version);
factorioAPI.authenticate({
username: config.username,
token: config.token,
@@ -185,7 +185,7 @@ async function addMod(config, term, instance) {
}
} else {
// treat it as a search and download the top result
factorioAPI.init(false, modDirectory, "", config.factorio_version);
factorioAPI.init(false, modDirectory, "", instance.server.version);
factorioAPI.authenticate({
username: config.username,
token: config.token,