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

Merge pull request #8 from Kaseaa/revert-7-master

Revert "classic support"
Kasea лет назад: 7
Родитель
Сommit
b9ce977bd7
3 измененных файлов с 122 добавлено и 132 удалено
  1. 107 107
      index.js
  2. 6 15
      manifest.json
  3. 9 10
      module.json

+ 107 - 107
index.js

@@ -1,107 +1,107 @@
-const path = require('path');
-const fs = require('fs');
-
-if(!fs.existsSync(path.join(__dirname, './data'))) {
-    fs.mkdirSync(path.join(__dirname, './data'));
-}
-
-function getJsonData(pathToFile) {
-    try {
-        return JSON.parse(fs.readFileSync(path.join(__dirname, pathToFile)));
-    }catch(e) {
-        return undefined;
-    }
-}
-
-function saveJsonData(pathToFile, data) {
-    fs.writeFileSync(path.join(__dirname, pathToFile), JSON.stringify(data, null, "    "));
-}
-
-function getPacketInfo(payload) {
-    let tmp = payload.toString('hex');
-    return {
-        length: tmp.slice(0, 4),
-        opcode: tmp.slice(4, 8),
-        payload: tmp.slice(8)
-    };
-}
-
-class KeybindSaver {
-    constructor(dispatch) {
-        const command = dispatch.command;
-        let acceptServer = 0,
-            acceptClient = false,
-            settingsPath;
-
-        function cmdKeybind(arg) {
-            if(!arg) {
-                command.message(`You need to include a file path(look in data folder)`);
-                return;
-            }
-
-            let data;
-            if(arg.toLowerCase() === "lock") {
-                data = getJsonData(settingsPath);
-                if(!data.lock) data.lock = false;
-                data.lock = !data.lock;
-                command.message(`Keybind lock has been set to ${data.lock}.`);
-            }else {
-                data = getJsonData(`./data/${arg}.json`);
-                if(!data) {
-                    command.message(`Invalid file name`);
-                    return;
-                }
-                command.message(`Keybind transferred, relog to get them.`);
-            }
-            saveJsonData(settingsPath, data);
-        }
-        command.add(['keybinds', 'key', 'set', 'settings'], cmdKeybind);
-
-        function sLoadClientSetting(key, opcode, payload, incoming, fake) {
-            if(acceptServer > 0 && !fake) {
-                acceptServer--;
-                let data = getJsonData(settingsPath);
-                if(data && data[key]) {
-                    let newPayload = Buffer.from(`${data[key].length}${getPacketInfo(payload).opcode}${data[key].payload}`, 'hex');
-                    if(newPayload.toString() === payload.toString()) return true;
-                    setTimeout(()=> {command.message(`Your keybinds/settings were reset, fixing it. Note: One(or more) glyph page might be fucked`)}, 5000);
-                    dispatch.toClient(newPayload);
-                    return false;
-                }else{
-                    saveJsonData(settingsPath, Object.assign({}, data || {}, JSON.parse(`{ "${key}": ${JSON.stringify(getPacketInfo(payload))} }`)));
-                }
-            }
-        }
-        dispatch.hook('S_LOAD_CLIENT_ACCOUNT_SETTING', 'raw', sLoadClientSetting.bind(null, 'accountSettings'));
-        dispatch.hook('S_LOAD_CLIENT_USER_SETTING', 'raw', sLoadClientSetting.bind(null, 'userSettings'));
-
-        function cSaveClientSetting(key, opcode, payload, incoming, fake) {
-            if(acceptClient && !fake) {
-                let data = getJsonData(settingsPath);
-                if(data.lock) return;
-                saveJsonData(settingsPath, Object.assign({}, data || {}, JSON.parse(`{ "${key}": ${JSON.stringify(getPacketInfo(payload))} }`)));
-            }
-        }
-        dispatch.hook('C_SAVE_CLIENT_ACCOUNT_SETTING', 'raw', cSaveClientSetting.bind(null, 'accountSettings'));
-        dispatch.hook('C_SAVE_CLIENT_USER_SETTING', 'raw', cSaveClientSetting.bind(null, 'userSettings'));
-
-        function noMoreAccept() {
-            acceptClient = false;
-        }
-        dispatch.hook('S_RETURN_TO_LOBBY', 'raw', noMoreAccept);
-        dispatch.hook('S_LOAD_TOPO', 'raw', noMoreAccept);
-
-        function acceptNow() {
-            acceptClient = true;
-        }
-        dispatch.hook('C_LOAD_TOPO_FIN', 'raw', acceptNow);
-
-        mod.game.on('enter_game', () => {
-            settingsPath = `./data/${mod.game.me.name}-${mod.game.serverId}.json`;
-            acceptServer = 2;
-        });
-    }
-}
-
-
-module.exports = KeybindSaver;
+const path = require('path');
+const fs = require('fs');
+
+if(!fs.existsSync(path.join(__dirname, './data'))) {
+    fs.mkdirSync(path.join(__dirname, './data'));
+}
+
+function getJsonData(pathToFile) {
+    try {
+        return JSON.parse(fs.readFileSync(path.join(__dirname, pathToFile)));
+    }catch(e) {
+        return undefined;
+    }
+}
+
+function saveJsonData(pathToFile, data) {
+    fs.writeFileSync(path.join(__dirname, pathToFile), JSON.stringify(data, null, "    "));
+}
+
+function getPacketInfo(payload) {
+    let tmp = payload.toString('hex');
+    return {
+        length: tmp.slice(0, 4),
+        opcode: tmp.slice(4, 8),
+        payload: tmp.slice(8)
+    };
+}
+
+class KeybindSaver {
+    constructor(dispatch) {
+        const command = dispatch.command;
+        let acceptServer = 0,
+            acceptClient = false,
+            settingsPath;
+
+        function cmdKeybind(arg) {
+            if(!arg) {
+                command.message(`You need to include a file path(look in data folder)`);
+                return;
+            }
+
+            let data;
+            if(arg.toLowerCase() === "lock") {
+                data = getJsonData(settingsPath);
+                if(!data.lock) data.lock = false;
+                data.lock = !data.lock;
+                command.message(`Keybind lock has been set to ${data.lock}.`);
+            }else {
+                data = getJsonData(`./data/${arg}.json`);
+                if(!data) {
+                    command.message(`Invalid file name`);
+                    return;
+                }
+                command.message(`Keybind transferred, relog to get them.`);
+            }
+            saveJsonData(settingsPath, data);
+        }
+        command.add(['keybinds', 'key', 'set', 'settings'], cmdKeybind);
+
+        function sLoadClientSetting(key, opcode, payload, incoming, fake) {
+            if(acceptServer > 0 && !fake) {
+                acceptServer--;
+                let data = getJsonData(settingsPath);
+                if(data && data[key]) {
+                    let newPayload = Buffer.from(`${data[key].length}${getPacketInfo(payload).opcode}${data[key].payload}`, 'hex');
+                    if(newPayload.toString() === payload.toString()) return true;
+                    setTimeout(()=> {command.message(`Your keybinds/settings were reset, fixing it. Note: One(or more) glyph page might be fucked`)}, 5000);
+                    dispatch.toClient(newPayload);
+                    return false;
+                }else{
+                    saveJsonData(settingsPath, Object.assign({}, data || {}, JSON.parse(`{ "${key}": ${JSON.stringify(getPacketInfo(payload))} }`)));
+                }
+            }
+        }
+        dispatch.hook('S_LOAD_CLIENT_ACCOUNT_SETTING', 'raw', sLoadClientSetting.bind(null, 'accountSettings'));
+        dispatch.hook('S_LOAD_CLIENT_USER_SETTING', 'raw', sLoadClientSetting.bind(null, 'userSettings'));
+
+        function cSaveClientSetting(key, opcode, payload, incoming, fake) {
+            if(acceptClient && !fake) {
+                let data = getJsonData(settingsPath);
+                if(data.lock) return;
+                saveJsonData(settingsPath, Object.assign({}, data || {}, JSON.parse(`{ "${key}": ${JSON.stringify(getPacketInfo(payload))} }`)));
+            }
+        }
+        dispatch.hook('C_SAVE_CLIENT_ACCOUNT_SETTING', 'raw', cSaveClientSetting.bind(null, 'accountSettings'));
+        dispatch.hook('C_SAVE_CLIENT_USER_SETTING', 'raw', cSaveClientSetting.bind(null, 'userSettings'));
+
+        function noMoreAccept() {
+            acceptClient = false;
+        }
+        dispatch.hook('S_RETURN_TO_LOBBY', 'raw', noMoreAccept);
+        dispatch.hook('S_LOAD_TOPO', 'raw', noMoreAccept);
+
+        function acceptNow() {
+            acceptClient = true;
+        }
+        dispatch.hook('C_LOAD_TOPO_FIN', 'raw', acceptNow);
+
+        dispatch.hook('S_LOGIN', 10, e=> {
+            settingsPath = `./data/${e.name}-${e.serverId}.json`;
+            acceptServer = 2;
+        });
+    }
+}
+
+
+module.exports = KeybindSaver;

+ 6 - 15
manifest.json

@@ -1,16 +1,7 @@
-{
-	"files": {
-		"README.md": "d4b18e5f4b0ddf97422fb4b7b15a027efd1ceaba153316619fb3a45fb491efbd",
-		"index.js": "a5e4e971a14ae5f3982ab6245bbaba53a211d9a5f874cd7cdc79f81c80718391",
-		"module.json": "f5b0a8659043360262582c0596295c99fc024402215b9ae9e28ac4255d264e4c"
-	},
-	"defs": {
-		"C_LOAD_TOPO_FIN": "raw",
-		"C_SAVE_CLIENT_ACCOUNT_SETTING": "raw",
-		"C_SAVE_CLIENT_USER_SETTING": "raw",
-		"S_LOAD_CLIENT_ACCOUNT_SETTING": "raw",
-		"S_LOAD_CLIENT_USER_SETTING": "raw",
-		"S_LOAD_TOPO": "raw",
-		"S_RETURN_TO_LOBBY": "raw"
-	}
+{
+    "files": {
+        "index.js": "1a1b2d754997501f439cfca2bf80924d8088d9d9dc4937d38b28801f5efdf98b",
+        "README.md": "d4b18e5f4b0ddf97422fb4b7b15a027efd1ceaba153316619fb3a45fb491efbd"
+    },
+    "defs": {}
 }

+ 9 - 10
module.json

@@ -1,11 +1,10 @@
 {
-	"disableAutoUpdate": false,
-	"servers": ["https://raw.githubusercontent.com/Kaseaa/Tera-Settings-Saver/master/"],
-	"supportUrl": "https://github.com/Kaseaa/Tera-Settings-Saver/issues",
-	"author": "Kasea",
-	"name": "tera-settings-saver",
-	"options": {
-		"guiName": "Setting saver"
-	},
-	"description": "Saves your settings"
-}
+    "servers": ["https://raw.githubusercontent.com/Kaseaa/Tera-Settings-Saver/master/"],
+    "supportUrl": "https://github.com/Kaseaa/Tera-Settings-Saver/issues",
+    "author": "Kasea",
+    "name": "tera-settings-saver",
+    "options": {
+        "guiName": "Setting saver"
+    },
+    "description": "Saves your settings"
+}