Merge pull request #3 from YuriXbr/BETA-1.2.0

commit
YuriXbr · Apr 30, 2024 · b30baaf · b30baaf
2 parents 56e3ac6 + 50d3a66
commit b30baaf
Show file tree

Hide file tree

Showing 20 changed files with 620 additions and 482 deletions.
diff --git a/configExample.json b/configExample.json
@@ -1,7 +1,7 @@
 {
     "__DevComments": {
-        "textENUS": "Use this file to change the AutoClicker configurations, tutorial: https://github.com/YuriXbr/LeagueClicker/blob/BETA-1.0.0/README.md",
-        "textPTBR": "Utilize esse arquivo para configurar o autoclicker, tutorial: https://github.com/YuriXbr/LeagueClicker/blob/BETA-1.0.0/README.md"
+        "textENUS": "Use this file to change the AutoClicker configurations, tutorial: https://github.com/YuriXbr/LeagueClicker/",
+        "textPTBR": "Utilize esse arquivo para configurar o autoclicker, tutorial: https://github.com/YuriXbr/LeagueClicker/"
     },
     "keybinds": {
         "recordMousePosition": "CommandOrControl+R",

diff --git a/index.js b/index.js
@@ -1,4 +1,5 @@
 const { app, Menu, Tray, globalShortcut, dialog } = require('electron');
+const { ipcMain, ipcRenderer } = require('electron');
 if (require('electron-squirrel-startup')) app.quit();
 
 const { mouse } = require("@nut-tree/nut-js");
@@ -9,8 +10,20 @@ const localeManager = require('./src/utils/localeManager.js');
 const configManager = require('./src/utils/configManager.js');
 const keyManager = require('./src/utils/keyManager.js');
 const mouseManager = require('./src/utils/mouseManager.js');
+const windowManager = require('./src/utils/windowManager.js');
 const cache = require('./src/configs/cache.js')
 
+app.on('ready', () => {
+    setup();
+    loop();
+});
+
+async function setup() {
+    await configManager.setupConfig();
+    localeManager.setupLocales();
+    await keyManager.setupKeybinds();
+}
+
 
 
 function setup() {
@@ -54,21 +67,31 @@ async function quit() {
     app.quit();
 }
 
-app.on('ready', () => {
-    setup();
-    loop();
-});
-
 app.on('before-quit', (event) => {
+    require('./src/utils/trayManager.js').closeTray();
     console.log("\n\n\nRecorded Positions:\n");
     cache._recordedPositions.forEach((pos, index) => {
         if(pos[0] != undefined) console.log(`index: ${index} ; X: ${pos[0]} Y: ${pos[1]}`);
     });
+    windowManager.closeAllWindows();
 
 });
 
+ipcMain.on('request-config', (event) => {
+    const keybinds = configManager.getConfig().keybinds;
+    console.log("enviando", {keybinds})
+    event.reply('config-response', {keybinds});
+  });
+
+ipcMain.on('update-keybinds', (event, newKeybinds) => {
+    console.log({newKeybinds});
+    configManager.updateToFile('keybinds', newKeybinds);
+    setup();
+
+})
+
 module.exports = {
     setup,
     loop,
     quit,
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "LeagueClicker",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "League Auto Clicker",
   "main": "index.js",
   "scripts": {

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
@@ -1,32 +1,32 @@
-{
-    "code": "en-US",
-    "tray": {
-        "header": "KEYBINDS:",
-        "recordMousePosition": "Record Mouse Position:",
-        "showPositions": "Show Positions",
-        "pauseResumeMacro": "Pause/Resume Macro:",
-        "pauseResumeMouseReading": "Pause/Resume Mouse Reading:",
-        "exit": "Exit:",
-
-        "previewClicks": "Preview Clicks",
-        "startQueue": "Start Queue:",
-        "acceptMatch": "Accept Match:",
-        "closeError1": "Close Error (1):",
-        "closeError2": "Close Error (2):",
-        "buyChampion1": "Buy Champion (1):",
-        "buyChampion2": "Buy Champion (2):",
-        "buyChampion3": "Buy Champion (3):",
-        "buyChampion4": "Buy Champion (4):",
-        "buyChampion5": "Buy Champion (5):",
-        "walkToCenter": "Walk to Center:",
-        "selectCard": "Select Card:",
-        "quitMatch": "Quit Match:",
-        "playAgain": "Play Again:",
-        "extra1": "Extra Position (1):",
-        "extra2": "Extra Position (2):",
-        "extra3": "Extra Position (3):",
-
-        "updateKeybinds": "Update Keybinds",
-        "quit": "Quit"
-    }
-}
+{
+    "code": "en-US",
+    "tray": {
+        "header": "KEYBINDS:",
+        "recordMousePosition": "Record Mouse Position:",
+        "showPositions": "Show Positions",
+        "pauseResumeMacro": "Pause/Resume Macro:",
+        "pauseResumeMouseReading": "Pause/Resume Mouse Reading:",
+        "exit": "Exit:",
+
+        "previewClicks": "Preview Clicks",
+        "startQueue": "Start Queue:",
+        "acceptMatch": "Accept Match:",
+        "closeError1": "Close Error (1):",
+        "closeError2": "Close Error (2):",
+        "buyChampion1": "Buy Champion (1):",
+        "buyChampion2": "Buy Champion (2):",
+        "buyChampion3": "Buy Champion (3):",
+        "buyChampion4": "Buy Champion (4):",
+        "buyChampion5": "Buy Champion (5):",
+        "walkToCenter": "Walk to Center:",
+        "selectCard": "Select Card:",
+        "quitMatch": "Quit Match:",
+        "playAgain": "Play Again:",
+        "extra1": "Extra Position (1):",
+        "extra2": "Extra Position (2):",
+        "extra3": "Extra Position (3):",
+
+        "updateKeybinds": "Update Keybinds",
+        "quit": "Quit"
+    }
+}
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
@@ -1,32 +1,32 @@
-{
-    "code": "es-ES",
-    "tray": {
-        "header": "ATAJOS DE TECLADO:",
-        "recordMousePosition": "Grabar posición del ratón:",
-        "showPositions": "Mostrar posiciones",
-        "pauseResumeMacro": "Pausar/Reanudar Macro:",
-        "pauseResumeMouseReading": "Pausar/Reanudar Lectura del Ratón:",
-        "exit": "Salir:",
-
-        "previewClicks": "Previsualizar Clicks",
-        "startQueue": "Iniciar Cola:",
-        "acceptMatch": "Aceptar Partida:",
-        "closeError1": "Cerrar Error (1):",
-        "closeError2": "Cerrar Error (2):",
-        "buyChampion1": "Comprar Campeón (1):",
-        "buyChampion2": "Comprar Campeón (2):",
-        "buyChampion3": "Comprar Campeón (3):",
-        "buyChampion4": "Comprar Campeón (4):",
-        "buyChampion5": "Comprar Campeón (5):",
-        "walkToCenter": "Caminar al Centro:",
-        "selectCard": "Seleccionar Carta:",
-        "quitMatch": "Salir de la Partida:",
-        "playAgain": "Jugar de Nuevo:",
-        "extra1": "Posición Extra (1):",
-        "extra2": "Posición Extra (2):",
-        "extra3": "Posición Extra (3):",
-
-        "updateKeybinds": "Actualizar Atajos",
-        "quit": "Salir"
-    }
-}
+{
+    "code": "es-ES",
+    "tray": {
+        "header": "ATAJOS DE TECLADO:",
+        "recordMousePosition": "Grabar posición del ratón:",
+        "showPositions": "Mostrar posiciones",
+        "pauseResumeMacro": "Pausar/Reanudar Macro:",
+        "pauseResumeMouseReading": "Pausar/Reanudar Lectura del Ratón:",
+        "exit": "Salir:",
+
+        "previewClicks": "Previsualizar Clicks",
+        "startQueue": "Iniciar Cola:",
+        "acceptMatch": "Aceptar Partida:",
+        "closeError1": "Cerrar Error (1):",
+        "closeError2": "Cerrar Error (2):",
+        "buyChampion1": "Comprar Campeón (1):",
+        "buyChampion2": "Comprar Campeón (2):",
+        "buyChampion3": "Comprar Campeón (3):",
+        "buyChampion4": "Comprar Campeón (4):",
+        "buyChampion5": "Comprar Campeón (5):",
+        "walkToCenter": "Caminar al Centro:",
+        "selectCard": "Seleccionar Carta:",
+        "quitMatch": "Salir de la Partida:",
+        "playAgain": "Jugar de Nuevo:",
+        "extra1": "Posición Extra (1):",
+        "extra2": "Posición Extra (2):",
+        "extra3": "Posición Extra (3):",
+
+        "updateKeybinds": "Actualizar Atajos",
+        "quit": "Salir"
+    }
+}
diff --git a/src/locales/pt-BR.json b/src/locales/pt-BR.json
@@ -1,33 +1,32 @@
-{
-    "code": "pt-BR" ,
-    "tray": {
-        "header": "TECLAS DE ATALHO:",
-        "recordMousePosition": "Gravar posição do mouse",
-        "showPositions": "Mostrar posições",
-        "pauseResumeMacro": "Pausar/Resumir Macro",
-        "pauseResumeMouseReading": "Pausar/Resumir Leitura do mouse",
-        "exit": "Sair",
-
-        "previewClicks": "Testar Cliques",
-        "startQueue": "Iniciar Fila:",
-        "acceptMatch": "Aceitar Partida:",
-        "closeError1": "Fechar Erro (1):",
-        "closeError2": "Fechar Erro (2):",
-        "buyChampion1": "Comprar Campeão (1):",
-        "buyChampion2": "Comprar Campeão (2):",
-        "buyChampion3": "Comprar Campeão (3):",
-        "buyChampion4": "Comprar Campeão (4):",
-        "buyChampion5": "Comprar Campeão (5):",
-        "walkToCenter": "Andar Para o Centro:",
-        "selectCard": "Selecionar Carta:",
-        "quitMatch": "sair da Partida:",
-        "playAgain": "Jogar Novamente:",
-        "extra1": "Posição Extra (1):",
-        "extra2": "Posição Extra (2):",
-        "extra3": "Posição Extra (3):",
-
-        "updateKeybinds": "Atualizar atalhos",
-        "quit": "Sair"
-    }
-
+{
+    "code": "pt-BR" ,
+    "tray": {
+        "header": "TECLAS DE ATALHO:",
+        "recordMousePosition": "Gravar posição do mouse",
+        "showPositions": "Mostrar posições",
+        "pauseResumeMacro": "Pausar/Resumir Macro",
+        "pauseResumeMouseReading": "Pausar/Resumir Leitura do mouse",
+        "exit": "Sair",
+
+        "previewClicks": "Testar Cliques",
+        "startQueue": "Iniciar Fila:",
+        "acceptMatch": "Aceitar Partida:",
+        "closeError1": "Fechar Erro (1):",
+        "closeError2": "Fechar Erro (2):",
+        "buyChampion1": "Comprar Campeão (1):",
+        "buyChampion2": "Comprar Campeão (2):",
+        "buyChampion3": "Comprar Campeão (3):",
+        "buyChampion4": "Comprar Campeão (4):",
+        "buyChampion5": "Comprar Campeão (5):",
+        "walkToCenter": "Andar Para o Centro:",
+        "selectCard": "Selecionar Carta:",
+        "quitMatch": "sair da Partida:",
+        "playAgain": "Jogar Novamente:",
+        "extra1": "Posição Extra (1):",
+        "extra2": "Posição Extra (2):",
+        "extra3": "Posição Extra (3):",
+
+        "updateKeybinds": "Atualizar atalhos",
+        "quit": "Sair"
+    }
 }
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
@@ -1,32 +1,32 @@
-{
-    "code": "ru-RU",
-    "tray": {
-        "header": "ГОРЯЧИЕ КЛАВИШИ:",
-        "recordMousePosition": "Записать положение мыши:",
-        "showPositions": "Показать позиции",
-        "pauseResumeMacro": "Приостановить/Возобновить макрос:",
-        "pauseResumeMouseReading": "Приостановить/Возобновить чтение мыши:",
-        "exit": "Выйти:",
-
-        "previewClicks": "Предварительный просмотр кликов",
-        "startQueue": "Начать очередь:",
-        "acceptMatch": "Принять матч:",
-        "closeError1": "Закрыть ошибку (1):",
-        "closeError2": "Закрыть ошибку (2):",
-        "buyChampion1": "Купить чемпиона (1):",
-        "buyChampion2": "Купить чемпиона (2):",
-        "buyChampion3": "Купить чемпиона (3):",
-        "buyChampion4": "Купить чемпиона (4):",
-        "buyChampion5": "Купить чемпиона (5):",
-        "walkToCenter": "Идти в центр:",
-        "selectCard": "Выбрать карту:",
-        "quitMatch": "Выйти из матча:",
-        "playAgain": "Играть снова:",
-        "extra1": "Дополнительное положение (1):",
-        "extra2": "Дополнительное положение (2):",
-        "extra3": "Дополнительное положение (3):",
-
-        "updateKeybinds": "Обновить горячие клавиши",
-        "quit": "Выйти"
-    }
-}
+{
+    "code": "ru-RU",
+    "tray": {
+        "header": "ГОРЯЧИЕ КЛАВИШИ:",
+        "recordMousePosition": "Записать положение мыши:",
+        "showPositions": "Показать позиции",
+        "pauseResumeMacro": "Приостановить/Возобновить макрос:",
+        "pauseResumeMouseReading": "Приостановить/Возобновить чтение мыши:",
+        "exit": "Выйти:",
+
+        "previewClicks": "Предварительный просмотр кликов",
+        "startQueue": "Начать очередь:",
+        "acceptMatch": "Принять матч:",
+        "closeError1": "Закрыть ошибку (1):",
+        "closeError2": "Закрыть ошибку (2):",
+        "buyChampion1": "Купить чемпиона (1):",
+        "buyChampion2": "Купить чемпиона (2):",
+        "buyChampion3": "Купить чемпиона (3):",
+        "buyChampion4": "Купить чемпиона (4):",
+        "buyChampion5": "Купить чемпиона (5):",
+        "walkToCenter": "Идти в центр:",
+        "selectCard": "Выбрать карту:",
+        "quitMatch": "Выйти из матча:",
+        "playAgain": "Играть снова:",
+        "extra1": "Дополнительное положение (1):",
+        "extra2": "Дополнительное положение (2):",
+        "extra3": "Дополнительное положение (3):",
+
+        "updateKeybinds": "Обновить горячие клавиши",
+        "quit": "Выйти"
+    }
+}
diff --git a/src/modals/defaultConfig.js b/src/modals/defaultConfig.js
@@ -1,7 +1,7 @@
 defaultconfig = {
     __DevComments: {
-        textENUS: "Use this file to change the AutoClicker configurations, tutorial: https://github.com/YuriXbr/LeagueClicker/blob/BETA-1.0.0/README.md",
-        textPTBR: "Utilize esse arquivo para configurar o autoclicker, tutorial: https://github.com/YuriXbr/LeagueClicker/blob/BETA-1.0.0/README.md" 
+        textENUS: "Use this file to change the AutoClicker configurations, tutorial: https://github.com/YuriXbr/LeagueClicker/",
+        textPTBR: "Utilize esse arquivo para configurar o autoclicker, tutorial: https://github.com/YuriXbr/LeagueClicker/" 
     },
     keybinds: {
         recordMousePosition: 'CommandOrControl+R',