From f9eb06c3e725422b64142c17ed28d50481546e31 Mon Sep 17 00:00:00 2001 From: SpikeHD Date: Sat, 23 Apr 2022 21:05:07 -0700 Subject: [PATCH] Change references to anime game to generic references --- README.md | 2 +- languages/en.json | 4 ++-- languages/es.json | 4 ++-- languages/fr.json | 4 ++-- languages/id.json | 4 ++-- languages/nl.json | 4 ++-- languages/pt-br.json | 4 ++-- languages/vie.json | 4 ++-- languages/zh.json | 4 ++-- proxy/proxy.py | 6 +++--- resources/bg/private/1.png | Bin 12441 -> 12406 bytes resources/index.html | 4 ++-- resources/js/helpers.js | 12 ++++++------ resources/js/index.js | 34 +++++++++++++++++----------------- resources/js/onLoad.js | 6 +++--- resources/js/translation.js | 2 +- resources/style/index.css | 2 +- 17 files changed, 50 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 161745a..07def0f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Grasscutter launcher for easily switching between Official and Private servers 1. Download the zip file 2. Extract the zip file somewhere -3. Run `GrassClipper.exe`, install the proxy server, and set your `Genshin Impact Game` folder! +3. Run `GrassClipper.exe`, install the proxy server, and set your game folder! # Setup (for Development) diff --git a/languages/en.json b/languages/en.json index 4d9a21f..cbf092b 100644 --- a/languages/en.json +++ b/languages/en.json @@ -6,7 +6,7 @@ "playPrivate": "Play on Grasscutter", "launchLocalServer": "Launch Local Server", - "genshinFolderSet": "Set \"Genshin Impact Game\" folder", + "gameFolderSet": "Set game folder", "grasscutterFileSet": "Set \"Grasscutter\" .jar file", "folderNotSet": "Not set", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Install", "proxyInstallDeny": "No thanks", - "genshinFolderDialog": "Select Genshin Impact Game folder", + "gameFolderDialog": "Select game folder", "grasscutterFileDialog": "Select Grasscutter server jar file" } diff --git a/languages/es.json b/languages/es.json index bf0dad4..c3cc788 100644 --- a/languages/es.json +++ b/languages/es.json @@ -6,7 +6,7 @@ "playPrivate": "Jugar en Grasscutter", "launchLocalServer": "Iniciar servidor local", - "genshinFolderSet": "Establece el folder \"Genshin Impact Game\"", + "gameFolderSet": "Establece el folder game", "grasscutterFileSet": "Establece el archivo .jar de \"Grasscutter\"", "folderNotSet": "No establecido", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Instalar", "proxyInstallDeny": "No gracias", - "genshinFolderDialog": "Selecciona la carpeta Genshin Impact game", + "gameFolderDialog": "Selecciona la carpeta game", "grasscutterFileDialog": "Selecciona el archivo .jar de Grasscutter" } diff --git a/languages/fr.json b/languages/fr.json index 1aa6707..3eb9246 100644 --- a/languages/fr.json +++ b/languages/fr.json @@ -6,7 +6,7 @@ "playPrivate": "Jouer sur Grasscutter", "launchLocalServer": "Lancer le serveur en local", - "genshinFolderSet": "Définir le dossier \"Genshin Impact Game\"", + "gameFolderSet": "Définir le dossier game", "grasscutterFileSet": "Définir le fichier .jar \"Grasscutter\"", "folderNotSet": "Pas encore défini", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Installer", "proxyInstallDeny": "Non merci", - "genshinFolderDialog": "Sélectionnez le dossier contenant Genshin Impact", + "gameFolderDialog": "Sélectionnez le dossier contenant le game", "grasscutterFileDialog": "Selectionnez le fichier jar du serveur de Grasscutter" } diff --git a/languages/id.json b/languages/id.json index f1f1a8b..5c200f0 100644 --- a/languages/id.json +++ b/languages/id.json @@ -6,7 +6,7 @@ "playPrivate": "Mainkan Grasscutter", "launchLocalServer": "Luncurkan Local Server", - "genshinFolderSet": "Atur folder \"Genshin Impact Game\"", + "gameFolderSet": "Atur folder game", "grasscutterFileSet": "Atur file \"Grasscutter\" .jar", "folderNotSet": "Belum diatur", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Install", "proxyInstallDeny": "Tidak terima kasih", - "genshinFolderDialog": "Pilih folder Genshin Impact Game", + "gameFolderDialog": "Pilih folder game", "grasscutterFileDialog": "Pilih file jar server Grasscutter" } \ No newline at end of file diff --git a/languages/nl.json b/languages/nl.json index c514295..cdbeed2 100644 --- a/languages/nl.json +++ b/languages/nl.json @@ -6,7 +6,7 @@ "playPrivate": "Op Grasscutter spelen", "launchLocalServer": "Lokale server starten", - "genshinFolderSet": "Selecteer de \"Genshin Impact Game\" folder", + "gameFolderSet": "Selecteer de game folder", "grasscutterFileSet": "Selecteer het \"Grasscutter\" .jar bestand", "folderNotSet": "Niet geselecteerd", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Installeren", "proxyInstallDeny": "Nee dank je", - "genshinFolderDialog": "Selecteer de Genshin Impact Game folder", + "gameFolderDialog": "Selecteer de game folder", "grasscutterFileDialog": "Selecteer het Grasscutter server jar bestand" } diff --git a/languages/pt-br.json b/languages/pt-br.json index 48c3ef5..23c3402 100644 --- a/languages/pt-br.json +++ b/languages/pt-br.json @@ -6,7 +6,7 @@ "playPrivate": "Jogar (Grasscutter)", "launchLocalServer": "Abrir Servidor Local", - "genshinFolderSet": "Definir a pasta: \"Genshin Impact Game\" ", + "gameFolderSet": "Definir a game pasta ", "grasscutterFileSet": "Definir o arquivo .jar de \"Grasscutter\" ", "folderNotSet": "Não Definida", @@ -34,6 +34,6 @@ "proxyInstallBtn": "Instalar", "proxyInstallDeny": "Não obrigado", - "genshinFolderDialog": "Selecione a pasta Genshin Impact Game", + "gameFolderDialog": "Selecione a game pasta", "grasscutterFileDialog": "Selecione o arquivo jar do Grasscutter" } \ No newline at end of file diff --git a/languages/vie.json b/languages/vie.json index 0550a2b..31800c3 100644 --- a/languages/vie.json +++ b/languages/vie.json @@ -6,7 +6,7 @@ "playPrivate": "Grasscutter", "launchLocalServer": "Khởi động Grasscutter", - "genshinFolderSet": "Chỉnh địa điểm thư mục \"Genshin Impact Game\"", + "gameFolderSet": "Chỉnh địa điểm thư mục trò chơi", "grasscutterFileSet": "Chỉnh địa điểm file \"Grasscutter\"", "folderNotSet": "Chưa chỉnh file", @@ -35,6 +35,6 @@ "proxyInstallBtn": "Có", "proxyInstallDeny": "Không", - "genshinFolderDialog": "Chọn thư mục có chứa game", + "gameFolderDialog": "Chọn thư mục có chứa trò chơi", "grasscutterFileDialog": "Chọn file Grasscutter" } \ No newline at end of file diff --git a/languages/zh.json b/languages/zh.json index 59fb4e7..1791328 100644 --- a/languages/zh.json +++ b/languages/zh.json @@ -6,7 +6,7 @@ "playPrivate": "在 Grasscutter 上播放", "launchLocalServer": "启动本地服务器", - "genshinFolderSet": "选择 \"原神\" 文件夹", + "gameFolderSet": "选择 \"原神\" 文件夹", "grasscutterFileSet": "选择 \"Grasscutter\" .jar 文件", "folderNotSet": "没有设置原神文件夹或Grasscutter文件", @@ -34,6 +34,6 @@ "proxyInstallBtn": "安装", "proxyInstallDeny": "不用了，谢谢", - "genshinFolderDialog": "选择原神文件夹", + "gameFolderDialog": "选择原神文件夹", "grasscutterFileDialog": "选择Grasscutter服务器jar文件" } diff --git a/proxy/proxy.py b/proxy/proxy.py index eae593f..581b3cb 100644 --- a/proxy/proxy.py +++ b/proxy/proxy.py @@ -6,7 +6,7 @@ ## # -# Genshin Impact script for mitmproxy +# Anime game script for mitmproxy # # https://github.com/MlgmXyysd/ # @@ -24,7 +24,7 @@ import string from mitmproxy import ctx from mitmproxy import http -class MlgmXyysd_Genshin_Impact_Proxy: +class MlgmXyysd_Anime_Game_Proxy: def load(self, loader): loader.add_option( @@ -77,5 +77,5 @@ class MlgmXyysd_Genshin_Impact_Proxy: flow.request.host = REMOTE_HOST addons = [ - MlgmXyysd_Genshin_Impact_Proxy() + MlgmXyysd_Anime_Game_Proxy() ] \ No newline at end of file diff --git a/resources/bg/private/1.png b/resources/bg/private/1.png index 61405603d11d9658d78f0822a24ce3f23689189c..295812c42f32bdf2624e0fddb858b02dcd61af87 100644 GIT binary patch literal 12406 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 Ks~4(TKlyJsi3NxN literal 12441 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 jzit2JtEC3k+faGk529E6da*lyA7E@~W
- - + +
diff --git a/resources/js/helpers.js b/resources/js/helpers.js index bfd99d3..6d83690 100644 --- a/resources/js/helpers.js +++ b/resources/js/helpers.js @@ -5,7 +5,7 @@ */ async function getCfg() { const defaultConf = { - genshinImpactFolder: '', + gamefolder: '', serverFolder: '', lastConnect: '', enableKillswitch: false, @@ -61,15 +61,15 @@ async function proxyIsInstalled() { * * @returns {Promise} */ - async function getGenshinExecName() { - // Scan genshin dir + async function getGameExecName() { + // Scan game dir const config = await getCfg() - const genshinDir = await filesystem.readDirectory(config.genshinImpactFolder) + const gameDir = await filesystem.readDirectory(config.gamefolder) // Find the executable - const genshinExec = genshinDir.find(file => file.entry.endsWith('.exe')) + const gameExec = gameDir.find(file => file.entry.endsWith('.exe')) - return genshinExec.entry + return gameExec.entry } /** diff --git a/resources/js/index.js b/resources/js/index.js index ff967b0..6b68a7e 100644 --- a/resources/js/index.js +++ b/resources/js/index.js @@ -33,9 +33,9 @@ async function enableButtons() { /** * Disable buttons when the game folder is not set */ -async function handleGenshinFolderNotSet() { +async function handleGameNotSet() { // Set buttons to greyed out and disable - document.querySelector('#genshinPath').innerHTML = localeObj.folderNotSet + document.querySelector('#gamePath').innerHTML = localeObj.folderNotSet // Set official server background to default document.querySelector('#firstPanel').style.backgroundImage = `url("../bg/private/default.png")` @@ -68,11 +68,11 @@ async function handleServerNotSet() { /** * Show the game folder under the select button */ -async function displayGenshinFolder() { - const elm = document.querySelector('#genshinPath') +async function displayGameFolder() { + const elm = document.querySelector('#gamePath') const config = await getCfg() - elm.innerHTML = config.genshinImpactFolder + elm.innerHTML = config.gamefolder } /** @@ -126,17 +126,17 @@ async function setBackgroundImage() { await filesystem.createDirectory(NL_CWD + '/resources/bg/official') } - if (config.genshinImpactFolder) { + if (config.gamefolder) { // See if bg folder exists in parent dir - const parentDir = await filesystem.readDirectory(config.genshinImpactFolder + '/..') + const parentDir = await filesystem.readDirectory(config.gamefolder + '/..') if (parentDir.find(dir => dir.entry === 'bg')) { - const officialImages = (await filesystem.readDirectory(config.genshinImpactFolder + '/../bg')).filter(file => file.type === 'FILE') + const officialImages = (await filesystem.readDirectory(config.gamefolder + '/../bg')).filter(file => file.type === 'FILE') if (officialImages.length > 0) { for (const bg of officialImages) { - const path = config.genshinImpactFolder.replace('\\', '/') + '/../bg/' + bg.entry + const path = config.gamefolder.replace('\\', '/') + '/../bg/' + bg.entry // See if the file exists already const currentBgs = (await filesystem.readDirectory(NL_CWD + '/resources/bg/official/')).filter(file => file.type === 'FILE') @@ -259,7 +259,7 @@ async function closeSettings() { settings.style.display = 'none' // In case we installed the proxy server - if (await proxyIsInstalled() && config.genshinImpactFolder) { + if (await proxyIsInstalled() && config.gamefolder) { const playPriv = document.querySelector('#playPrivate') playPriv.classList.remove('disabled') @@ -314,8 +314,8 @@ async function displayServerLaunchSection() { /** * Set the game folder by opening a folder picker */ -async function setGenshinImpactFolder() { - const folder = await Neutralino.os.showFolderDialog(localeObj.genshinFolderDialog) +async function setGameFolder() { + const folder = await Neutralino.os.showFolderDialog(localeObj.gameFolderDialog) // Set the folder in our configuration const config = await getCfg() @@ -325,17 +325,17 @@ async function setGenshinImpactFolder() { const gameFolder = folderList.filter(file => file.entry.includes('Genshin Impact Game')) if (gameFolder.length > 0) { - config.genshinImpactFolder = folder + '\\Genshin Impact Game' + config.gamefolder = folder + '\\Genshin Impact Game' Neutralino.storage.setData('config', JSON.stringify(config)) } else { - config.genshinImpactFolder = folder + config.gamefolder = folder } Neutralino.storage.setData('config', JSON.stringify(config)) // Refresh background and path setBackgroundImage() - displayGenshinFolder() + displayGameFolder() enableButtons() } @@ -362,7 +362,7 @@ async function setGrasscutterFolder() { async function launchOfficial() { const config = await getCfg() - Neutralino.os.execCommand(config.genshinImpactFolder + '/' + await getGenshinExecName()) + Neutralino.os.execCommand(config.gamefolder + '/' + await getGameExecName()) } /** @@ -380,7 +380,7 @@ async function launchPrivate() { Neutralino.storage.setData('config', JSON.stringify(config)) // Pass IP and game folder to the private server launcher - Neutralino.os.execCommand(`${NL_CWD}/scripts/private_server_launch.cmd ${ip} "${config.genshinImpactFolder}/${await getGenshinExecName()}" "${NL_CWD}" ${config.enableKillswitch}`).catch(e => console.log(e)) + Neutralino.os.execCommand(`${NL_CWD}/scripts/private_server_launch.cmd ${ip} "${config.gamefolder}/${await getGameExecName()}" "${NL_CWD}" ${config.enableKillswitch}`).catch(e => console.log(e)) } async function launchLocalServer() { diff --git a/resources/js/onLoad.js b/resources/js/onLoad.js index 3224bb6..48c50b8 100644 --- a/resources/js/onLoad.js +++ b/resources/js/onLoad.js @@ -5,7 +5,7 @@ */ document.addEventListener('DOMContentLoaded', async () => { setBackgroundImage(); - displayGenshinFolder(); + displayGameFolder(); displayServerFolder(); // Set title version @@ -68,8 +68,8 @@ // Ensure we do the translation at the very end, after everything else has loaded await doTranslation() - if (!config.genshinImpactFolder) { - handleGenshinFolderNotSet() + if (!config.gamefolder) { + handleGameNotSet() } if (!config.serverFolder) { diff --git a/resources/js/translation.js b/resources/js/translation.js index 80644f9..712053d 100644 --- a/resources/js/translation.js +++ b/resources/js/translation.js @@ -32,7 +32,7 @@ async function doTranslation() { set('serverLaunch', localeObj.launchLocalServer) // File select buttons - set('genshinFolderSet', localeObj.genshinFolderSet) + set('gameFolderSet', localeObj.gameFolderSet) set('grasscutterFileSet', localeObj.grasscutterFileSet) // Private options diff --git a/resources/style/index.css b/resources/style/index.css index e7d2b6c..8f8c57d 100644 --- a/resources/style/index.css +++ b/resources/style/index.css @@ -304,7 +304,7 @@ body { height: 10%; } -#genshinPath, #serverPath { +#gamePath, #serverPath { color: white; font-size: 14px; }