Просмотр исходного кода

integrated toolbox settings, some changes

SaltyMonkey лет назад: 6
Родитель
Сommit
f11abae491

+ 8 - 5
.manifest.js

@@ -6,8 +6,8 @@
 // ignore these files for making manifest
 const IGNORED_FILES = [
 	"package-lock.json",
-	"module.json",
 	"manifest.json",
+	"settings.json",
 	"manifest-generator.js",
 	"manifest-generator.bat",
 	"manifest-generator.exe",
@@ -55,11 +55,14 @@ modulejson.disableAutoUpdate = false;
 
 modulejson.name = "fps-manager";
 modulejson.options = {
-	niceName: "FPM",
-	guiName: "FPS Manager",
+	"niceName": "FPM",
+	"guiName": "FPS Manager",
+	"settingsVersion": 1,
+	"settingsFile": "./settings.json",
+	"settingsMigrator": "./data/migrationData.js"
 };
 modulejson.author = "SaltyMonkey";
-modulejson.description = "FPS Manager is modern and extremely customizable module for Tera Toolbox which can help to solve annoynce by some ingame messages and fps drops.";
+modulejson.description = "FPS Manager is modern and extremely customizable module for Tera Toolbox which can help to solve annoyance by some ingame messages and fps drops.";
 modulejson.servers = ["https://raw.githubusercontent.com/SaltyMonkey/fps-manager/master/"];
 modulejson.supportUrl = ["https://github.com/SaltyMonkey/fps-manager/issues"];
 
@@ -141,7 +144,7 @@ function jsonify(obj) {
 	obj = JSON.stringify(obj, null, "    ");
 	let lists = obj.match(/\[[^]+?\].*/igm);
 	if (lists) for (let list of lists) {
-		obj = obj.substring(0,obj.indexOf(list)) + list.replace(/[ \n\t]*/igm, "") + obj.substring(obj.indexOf(list) + list.length);
+		obj = obj.substring(0, obj.indexOf(list)) + list.replace(/[ \n\t]*/igm, "") + obj.substring(obj.indexOf(list) + list.length);
 	}
 	return obj;
 }

+ 24 - 0
data/migrationData.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const DefaultSettings = {
+	"enableCommands": true,
+	"customCommandTag": "",
+	"interactiveMode": true,
+	"debugMode": false,
+	"applyTriggers": true,
+	"classBasedPresets": true,
+	"trackPresetsChanges": true
+};
+
+module.exports = function MigrateSettings(from_ver, to_ver, settings) {
+	if (from_ver === undefined) {
+		// Migrate legacy config file
+		return {...DefaultSettings, ...settings};
+	} else if (from_ver === null) {
+		// No config file exists, use default settings
+		return DefaultSettings;
+	} else {
+		// Migrate from older version (using the new system) to latest one
+		throw new Error("So far there is only one settings version and this should never be reached!");
+	}
+};

+ 0 - 0
data/settingsData.js


+ 2 - 2
lib/helpers/enums.js

@@ -31,8 +31,8 @@ exports.RAW_HOOK_MODE = Object.freeze(
  */
 exports.HOOK_SETTINGS = Object.freeze(
 	{
-		"LAST": {"order": 99999, "filter": {"fake": false, "modified": null}},
-		"FIRST": {"order": -10000, "filter": {"fake": false}}
+		"LAST": { "order": 99999, "filter": { "fake": false, "modified": null } },
+		"FIRST": { "order": -10000, "filter": { "fake": false } }
 	}
 );
 

+ 1 - 1
lib/helpers/utils.js

@@ -33,7 +33,7 @@ exports.arraysIntersect = (arr1, arr2) => {
 */
 exports.stringHasIntersect = (string, arr) => {
 	arr.forEach(item => {
-		if(string.indexOf(item) !== -1) return true;
+		if (string.indexOf(item) !== -1) return true;
 	});
 	return false;
 };

+ 5 - 5
lib/helpers/watchdog.js

@@ -6,22 +6,22 @@ class Watchdog {
 		let fkYouNodeJs = false;
 		const debounce = 500;
 
-		if(!fs.existsSync(path) || typeof changeCallback !== "function")
+		if (!fs.existsSync(path) || typeof changeCallback !== "function")
 			throw new Error("All shit here fucked");
 
 		// eslint-disable-next-line no-unused-vars
 		const listener = (eventType, filename) => {
-			if(fkYouNodeJs || !type.includes(eventType)) return;
+			if (fkYouNodeJs || !type.includes(eventType)) return;
 			fkYouNodeJs = true;
-			setTimeout(() => { fkYouNodeJs = false;}, debounce);
-			setImmediate(() => {changeCallback();});
+			setTimeout(() => { fkYouNodeJs = false; }, debounce);
+			setImmediate(() => { changeCallback(); });
 		};
 
 		fs.watch(path, listener);
 	}
 
 	close() {
-		if(this.fsWatcher) this.fsWatcher.close();
+		if (this.fsWatcher) this.fsWatcher.close();
 	}
 }
 module.exports = Watchdog;

+ 9 - 9
lib/unitControl.js

@@ -22,8 +22,8 @@ class unitControl {
 
 		console.log("DEBUG: unitControl -> constructor");
 
-		if(deps.data.settings.customCommandTag && deps.data.settings.customCommandTag.length)
-			prefixes.push(deps.data.settings.customCommandTag);
+		if(deps.mod.settings.customCommandTag && deps.mod.settings.customCommandTag.length)
+			prefixes.push(deps.mod.settings.customCommandTag);
 
 		const infoHandler = () => {
 			deps.mod.command.message("FPS Manager information.");
@@ -34,18 +34,18 @@ class unitControl {
 		};
 
 		const autoSettingHandler = () => {
-			deps.data.settings.applyTriggers = !deps.data.settings.applyTriggers;
-			deps.mod.command.message(`Triggers ${deps.data.settings.applyTriggers ? "a" : "dea"}ctivated.`);
+			deps.mod.settings.applyTriggers = !deps.mod.settings.applyTriggers;
+			deps.mod.command.message(`Triggers ${deps.mod.settings.applyTriggers ? "a" : "dea"}ctivated.`);
 		};
 
 		const classBasedPresetSettingHandler = () => {
-			deps.data.settings.classBasedPresets = !deps.data.settings.classBasedPresets;
-			deps.mod.command.message(`Class based presets will be ${deps.data.settings.classBasedPresets ? "a" : "dea"}ctivated after relog.`);
+			deps.mod.settings.classBasedPresets = !deps.mod.settings.classBasedPresets;
+			deps.mod.command.message(`Class based presets will be ${deps.mod.settings.classBasedPresets ? "a" : "dea"}ctivated after relog.`);
 		};
 
 		const debugSettingsHandler = () => {
-			deps.data.settings.debugMode = !deps.data.settings.debugMode;
-			deps.mod.command.message(`Debug ${deps.data.settings.debugMode ? "a" : "dea"}ctivated.`);
+			deps.mod.settings.debugMode = !deps.mod.settings.debugMode;
+			deps.mod.command.message(`Debug ${deps.mod.settings.debugMode ? "a" : "dea"}ctivated.`);
 		};
 
 		const activeModeHandler = (str) => {
@@ -75,7 +75,7 @@ class unitControl {
 			"debug": debugSettingsHandler
 		};
 
-		if(deps.data.settings.enableCommands)
+		if(deps.mod.settings.enableCommands)
 			deps.mod.command.add(prefixes, commands);
 	}
 }

+ 1 - 3
lib/unitFps.js

@@ -351,7 +351,7 @@ class unitFps {
 		mod.hook(...proto.getData("S_DESPAWN_DROPITEM"), HOOK_SETTINGS.LAST, dropHandler.bind(null, ENTITY_HOOK_TYPE.DESPAWN));
 
 		//-------------------------------------
-		// Cleanup hooks for entities
+		// Cleanup hooks for hidden entities
 		//-------------------------------------
 		mod.hook(...proto.getData("S_SOCIAL"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
 		mod.hook(...proto.getData("S_USER_STATUS"), HOOK_SETTINGS.LAST, dropIfBlockedHandler);
@@ -399,13 +399,11 @@ class unitFps {
 			if (data.prevMode.blockCollections !== data.activeMode.blockCollections) {
 				switch (data.activeMode.blockCollections) {
 					case (true):
-						// eslint-disable-next-line no-unused-vars
 						for (const value of tracker.collections.values()) {
 							mod.send(...proto.getData("S_DESPAWN_COLLECTION"), value);
 						}
 						break;
 					case (false):
-						// eslint-disable-next-line no-unused-vars
 						for (const value of tracker.collections.values()) {
 							mod.send(...proto.getData("S_SPAWN_COLLECTION"), value);
 						}

+ 4 - 8
lib/unitState.js

@@ -42,7 +42,6 @@ class unitState extends EventEmitter {
 		
 		Object.assign(this, {
 			//main properties for state management
-			"settings": {}, //mod settings
 			"presets": {}, // all loaded per class presets
 			"preset": {}, //current chosen preset
 			"activeMode": undefined,
@@ -78,9 +77,6 @@ class unitState extends EventEmitter {
 
 	Init() {
 		console.log("DEBUG: unitState -> Init");
-		
-		this.settings = utils.loadJson(utils.getFullPath(__dirname, "../settings/settings.json"));
-		if (!this.settings) throw new Error("Settings file can't be loaded! Critical error. ");
 
 		this.availableClasses.forEach(x => {
 			this.presets[x] = utils.loadJson(utils.getFullPath(__dirname, `../settings/presets/${x}.json`));
@@ -93,7 +89,7 @@ class unitState extends EventEmitter {
 		this.smtsSet = new Set(...staticData.blockedSmt);
 
 		this.__mod.hook("S_LOGIN", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
-			this.preset = this.settings["classBasedPresets"]
+			this.preset = this.__mod.settings["classBasedPresets"]
 				? (this.presets[this.__mod.game.me.class] || this.presets["common"])
 				: this.presets["common"];
 
@@ -103,7 +99,7 @@ class unitState extends EventEmitter {
 		});
 
 		this.__mod.hook(...this.__proto.getData("S_LOAD_TOPO"), HOOK_SETTINGS.FIRST, (event) => {
-			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
+			if (!this.__mod.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
 			
 			this.prevMode = rfdc(this.activeMode);
 		
@@ -123,7 +119,7 @@ class unitState extends EventEmitter {
 		});
 
 		this.__mod.hook("S_FIELD_EVENT_ON_ENTER", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
-			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
+			if (!this.__mod.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
 			
 			this.prevMode = rfdc(this.activeMode);
 			
@@ -132,7 +128,7 @@ class unitState extends EventEmitter {
 		});
 
 		this.__mod.hook("S_FIELD_EVENT_ON_LEAVE", RAW_HOOK_MODE.EVENT, HOOK_SETTINGS.FIRST, () => {
-			if (!this.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
+			if (!this.__mod.settings["applyTrigger"] || equal(this.prevMode, this.activeMode)) return;
 			
 			this.activeMode = rfdc(this.prevMode);
 			

+ 9 - 9
lib/unitTracker.js

@@ -84,6 +84,8 @@ class unitTracker {
 		};
 
 		const updateAngle = (data, w) => data.loc.w = w;
+		
+		const updateLoc = (data, loc) => data.loc = loc;
 
 		const updateAngleHandler = (event) => {
 			let gameId = event.gameId;
@@ -92,24 +94,22 @@ class unitTracker {
 			else if (this.summons.has(gameId)) this.summons.set(gameId, updateAngle(this.summons.get(gameId), event.w));
 		};
 
+		
 		const userLocationHandler = (event) => {
 			if (this.users.has(event.gameId)) {
-				let data = this.users.get(event.gameId);
-				data.loc = event.loc;
-				this.users.set(event.gameId, data);
+				this.users.set(event.gameId, updateLoc(this.users.get(event.gameId), event.loc));
 			}
 		};
 
 		const npcLocationHandler = (event) => {
 			if (this.npcs.has(event.gameId)) {
-				let data = this.npcs.get(event.gameId);
-				data.loc = event.loc;
-				this.npcs.set(event.gameId, data);
+				this.npcs.set(event.gameId, updateLoc(this.npcs.get(event.gameId), event.loc));
 			}
 			else if (this.summons.has(event.gameId)) {
-				let data = this.summons.get(event.gameId);
-				data.loc = event.loc;
-				this.summons.set(event.gameId, data);
+				this.summons.set(event.gameId, updateLoc(this.summons.get(event.gameId), event.loc));
+			}
+			else if (this.servants.has(event.gameId)) {
+				this.servants.set(event.gameId, updateLoc(this.servants.get(event.gameId), event.loc));
 			}
 		};