+ This is a test alert
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GrassClipper
- 0.4.5
+ 0.0.0
+
@@ -91,37 +277,59 @@
+
+
+ 
+
+
+
+ 
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+ 
+
+
+
+ 
+
+ A new update is available! Newest version:
+
+
diff --git a/resources/js/alerts.js b/resources/js/alerts.js
new file mode 100644
index 0000000..546ba57
--- /dev/null
+++ b/resources/js/alerts.js
@@ -0,0 +1,19 @@
+function displayAlert(message, clear = 4000) {
+ const alert = document.getElementById('alert')
+ const alertText = document.getElementById('alertText')
+
+ alert.classList.add('show')
+
+ alertText.innerText = message
+
+ setTimeout(() => {
+ hideAlert()
+ }, clear)
+}
+
+function hideAlert() {
+ const alert = document.getElementById('alert')
+ const alertText = document.getElementById('alertText')
+
+ alert.classList.remove('show')
+}
diff --git a/resources/js/authAlert.js b/resources/js/authAlert.js
new file mode 100644
index 0000000..6f2dbf3
--- /dev/null
+++ b/resources/js/authAlert.js
@@ -0,0 +1,45 @@
+let alertTimeout, alertCooldown = 3000
+
+async function displayLoginAlert(message, type, cooldown = null) {
+ displayAuthAlert(message, type, cooldown, 'login')
+}
+
+async function displayRegisterAlert(message, type, cooldown = null) {
+ displayAuthAlert(message, type, cooldown, 'register')
+}
+
+function displayAuthAlert(message, type, cooldown, name) {
+ const elm = document.getElementById(`${name}Alert`)
+ const text = document.getElementById(`${name}AlertText`)
+
+ elm.style.removeProperty('display')
+
+ // Remove classification classes
+ elm.classList.remove('error')
+ elm.classList.remove('success')
+ elm.classList.remove('warn')
+
+ switch(type) {
+ case 'error':
+ elm.classList.add('error')
+ break
+
+ case 'success':
+ elm.classList.add('success')
+ break
+
+ case 'warn':
+ default:
+ elm.classList.add('warn')
+ break
+ }
+
+ text.innerText = message
+
+ clearTimeout(alertTimeout)
+
+ // Disappear after cooldown
+ alertTimeout = setTimeout(() => {
+ elm.style.display = 'none'
+ }, cooldown || alertCooldown)
+}
\ No newline at end of file
diff --git a/resources/js/gcdownloader.js b/resources/js/gcdownloader.js
new file mode 100644
index 0000000..8244c71
--- /dev/null
+++ b/resources/js/gcdownloader.js
@@ -0,0 +1,105 @@
+async function clearGCInstallation() {
+ Neutralino.os.execCommand('del /s /q "./gc"')
+}
+
+async function setDownloadButtonsToLoading() {
+ const stableBtn = document.querySelector('#stableInstall')
+ const devBtn = document.querySelector('#devInstall')
+
+ stableBtn.innerText = localeObj.gcScriptRunning || 'Running...'
+
+ devBtn.innerText = localeObj.gcScriptRunning || 'Running...'
+
+ // Set btns to disabled
+ stableBtn.disabled = true
+ stableBtn.classList.add('disabled')
+
+ devBtn.disabled = true
+ devBtn.classList.add('disabled')
+}
+
+async function resetDownloadButtons() {
+ const stableBtn = document.querySelector('#stableInstall')
+ const devBtn = document.querySelector('#devInstall')
+
+ stableBtn.innerText = localeObj.stableInstall || 'Download'
+ devBtn.innerText = localeObj.devInstall || 'Download'
+
+ // Set btns to enabled
+ stableBtn.disabled = false
+ stableBtn.classList.remove('disabled')
+
+ devBtn.disabled = false
+ devBtn.classList.remove('disabled')
+}
+
+async function downloadGC(branch) {
+ const config = await getCfg()
+
+ // If we are pulling from a new branch, delete the old installation
+ if (config.grasscutterBranch !== branch) await clearGCInstallation()
+
+ // Set current installation in config
+ config.grasscutterBranch = branch
+
+ // Set gc path for people with launcher enabled
+ config.serverFolder = `${NL_CWD}\\gc-${branch}\\grasscutter.jar`
+
+ // Enable server launcher
+ config.serverLaunchPanel = true
+
+ Neutralino.storage.setData('config', JSON.stringify(config))
+
+ setDownloadButtonsToLoading()
+
+ // Keystore for branch (since they can differ)
+ const keystoreUrl = `https://github.com/Grasscutters/Grasscutter/raw/${branch}/keystore.p12`
+
+ // External service that allows un-authed artifact downloading
+ const artiUrl = `https://nightly.link/Grasscutters/Grasscutter/workflows/build/${branch}/Grasscutter.zip`
+
+ // For data files
+ const dataFiles = await axios.get(`https://api.github.com/repos/Grasscutters/Grasscutter/contents/data?ref=${branch}`)
+ const dataList = dataFiles.data
+ .map(file => ({ path: file.path, filename: file.name }))
+ .map(o => ({ url: `https://raw.githubusercontent.com/Grasscutters/Grasscutter/${branch}/${o.path}`, filename: o.filename }))
+
+ // For key files
+ const keyFiles = await axios.get(`https://api.github.com/repos/Grasscutters/Grasscutter/contents/keys?ref=${branch}`)
+ const keyList = keyFiles.data
+ .map(file => ({ path: file.path, filename: file.name }))
+ .map(o => ({ url: `https://raw.githubusercontent.com/Grasscutters/Grasscutter/${branch}/${o.path}`, filename: o.filename }))
+
+ const serverFolderFixed = config.serverFolder.match(/.*\\|.*\//g, '')[0].replace(/\//g, '\\')
+
+ // Ensure data and key folders exist
+
+ console.log(config.serverFolder)
+ console.log(serverFolderFixed)
+
+ await Neutralino.os.execCommand(`mkdir ${serverFolderFixed}\\data`)
+ await Neutralino.os.execCommand(`mkdir ${serverFolderFixed}\\keys`)
+
+ // Download data files
+ for (const o of dataList) {
+ const folder = 'data'
+ await Neutralino.os.execCommand(`powershell Invoke-WebRequest -Uri ${o.url} -OutFile "${serverFolderFixed}\\${folder}\\${o.filename}"`)
+ }
+
+ // Download key files
+ for (const o of keyList) {
+ const folder = 'keys'
+ await Neutralino.os.execCommand(`powershell Invoke-WebRequest -Uri ${o.url} -OutFile "${serverFolderFixed}\\${folder}\\${o.filename}"`)
+ }
+
+ // Run installer
+ createCmdWindow(`.\\scripts\\gc_download.cmd ${artiUrl} ${keystoreUrl} ${branch}`)
+
+ // Fix buttons
+ resetDownloadButtons()
+
+ // Display folder after saving config
+ displayServerFolder()
+ enableServerButton()
+ displayServerLaunchSection()
+}
\ No newline at end of file
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
new file mode 100644
index 0000000..558d91a
--- /dev/null
+++ b/resources/js/helpers.js
@@ -0,0 +1,169 @@
+/**
+ * Get configuration
+ *
+ * @returns {Promise
+
+ A new update is available! Newest version:
+
+ ' introSpan.innerHTML += localeObj.introSen4 + '
' - set('firstTimeInstallBtn', localeObj.proxyInstallBtn) - set('firstTimeDenyBtn', localeObj.proxyInstallDeny) + set('firstTimeInstallBtn', 'proxyInstallBtn') + set('firstTimeDenyBtn', 'proxyInstallDeny') + + // Login section + set('loginSectionTitle', 'authLoginTitle') + set('registerSectionTitle', 'authRegisterTitle') + set('loggingInToIndicator', 'loggingInTo') + set('registeringToIndicator', 'registeringFor') + set('loginUsernameIndicator', 'authUsername') + set('loginPasswordIndicator', 'authPassword') + set('registerUsernameIndicator', 'authUsername') + set('registerPasswordIndicator', 'authPassword') + set('registerConfirmIndicator', 'authConfirmPassword') + set('loginPopupContentBodyBtnLogin', 'authLoginBtn') + set('loginPopupContentBodyBtnRegister', 'authRegisterBtn') + set('noLoginBtn', 'launchWithoutAuth') + + // Downloads section + set('downloadTitle', 'downloadTitle') + set('grassclipperTitle', 'grassclipperTitle') + set('grasscutterTitle', 'grasscutterTitle') + set('installerTitle', 'installerTitle') + set('installerSubtitle', 'installerSubtitle') + set('downloadStable', 'downloadStable') + set('stableSubtitle', 'stableSubtitle') + set('downloadDev', 'downloadDev') + set('devSubtitle', 'devSubtitle') + set('downloadResources', 'downloadResources') + set('resourceSubtitle', 'resourceSubtitle') + set('stableInstall', 'stableInstall') + set('devInstall', 'devInstall') + + // update notification + set('updateNotifText', 'updateNotifText') } \ No newline at end of file diff --git a/resources/js/windowDrag.js b/resources/js/windowDrag.js index 811ca68..642b0f3 100644 --- a/resources/js/windowDrag.js +++ b/resources/js/windowDrag.js @@ -1,22 +1,25 @@ // https://stackoverflow.com/questions/67971689/positioning-the-borderless-window-in-neutralino-js // had to use this since the in-built function breaks the close and minimize buttons -let dragging = false, posX, posY; -let draggable; +let dragging = false, ratio = 1, posX, posY +let draggable -document.addEventListener('DOMContentLoaded', () => { - draggable = document.getElementById('controlBar'); +document.addEventListener('DOMContentLoaded', async () => { + draggable = document.getElementById('controlBar') // Listen to hovers draggable.onmousedown = function (e) { - posX = e.pageX, posY = e.pageY; - dragging = true; + ratio = window.devicePixelRatio + + posX = e.pageX * ratio, posY = e.pageY * ratio + dragging = true } - draggable.onmouseup = function (e) { - dragging = false; + // Patch for monitors with scaling enabled, allows them to detach from the titlebar anywhere + window.onmouseup = function (e) { + dragging = false } document.onmousemove = function (e) { - if (dragging) Neutralino.window.move(e.screenX - posX, e.screenY - posY); + if (dragging) Neutralino.window.move(e.screenX * ratio - posX, e.screenY * ratio - posY) } }) \ No newline at end of file diff --git a/resources/style/index.css b/resources/style/index.css index e7d2b6c..893576f 100644 --- a/resources/style/index.css +++ b/resources/style/index.css @@ -7,6 +7,14 @@ body { font-family: Arial, Helvetica, sans-serif; } +a { + color: #fff; +} + +img { + height: 20px; +} + .darken { filter: brightness(0.6); } @@ -27,13 +35,135 @@ body { margin: 10px; } +#miscDialog span, #firstTimeNotice span { display: block; text-align: center; margin-bottom: 6px; } +#loginPanel { + height: 50%; + width: 32%; +} + +#loginPanel img { + height: 20px; +} + +#loginPopupTitle { + display: flex; + justify-content: space-between; + font-size: 1.2em; + font-weight: bold; +} + +.authBody { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.authBody div { + margin: 6px; +} + +.authBody input { + height: 20px; + background: white; + border: none; + border-bottom: 2px solid #4d4d4d; + + /* border bottom anim */ + transition: border-bottom 0.1s ease-in-out; +} + +.authBody input:focus { + outline: none; + border-bottom: 2px solid #ffc61e; +} + +#loginPopupTitle img { + height: 20px; + margin-bottom: 8px; +} + +#loginPopupTitle img:hover { + filter: invert(85%) sepia(31%) saturate(560%) hue-rotate(329deg) brightness(100%) contrast(92%); + cursor: pointer; +} + +#registerPopupServer, +#loginPopupServer { + font-weight: bold; +} + +#loginSectionTitle, +#registerSectionTitle { + font-weight: normal; + font-size: 1em; +} + +#loginSectionTitle:hover, +#registerSectionTitle:hover { + cursor: pointer; +} + +.selectedTitle { + font-weight: bold !important; + border-bottom: 2px solid #ffc61e; +} + +.authInputs div { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.authInputs div span { + margin-right: 6px; +} + +.error { + background: #e90000; +} + +.warn { + background: #ffc61e; +} + +.success { + background: #00c200; +} + +#registerAlert, +#loginAlert { + display: flex; + justify-content: center; + align-items: center; + border-radius: 5px; + color: #fff; + text-align: center; +} + +#registerAlert img, +#loginAlert img { + height: 20px; + margin: 10px; + filter: invert(100%) sepia(0%) saturate(179%) hue-rotate(253deg) brightness(105%) contrast(101%); +} + +#registerAlert span, +#loginAlert span { + margin: 10px; +} + +#miscDialog, #firstTimeNotice, +#loginPanel, +#downloadPanel, #settingsPanel { display: block; position: absolute; @@ -49,17 +179,21 @@ body { font-family: system-ui; } +#downloadPanel, #settingsPanel { width: 35%; - height: 70%; + height: 80%; + overflow: auto; } +#downloadTitle, #fullSettingsTitle { font-size: 1.5em; font-weight: bold; margin-bottom: 10px; } +#downloadPanelInner, #settingsPanelInner { display: flex; flex-direction: column; @@ -68,16 +202,23 @@ body { padding: 10px 10%; } +.downloadRow, .settingsRow { width: 100%; } +.downloadTitle, .settingTitle { font-size: 1.2em; font-weight: bold; margin-bottom: 10px; } +.downloadTitle { + margin: 6px; +} + +.downloadLabel, .settingLabel { display:inline-block; font-size: 1em; @@ -85,12 +226,14 @@ body { margin: 10px 0px; } +.downloadSubtitle, .settingSubtitle { color: rgb(165, 165, 165); font-size: 0.8em; font-weight: normal; } +.downloadSection, .settingSection { display: flex; flex-direction: row; @@ -98,10 +241,12 @@ body { justify-content: space-between; } +.downloadSection .smolBtn, .settingSection .smolBtn { height: 30px; } +#downloadTitleBar, #settingsTitleBar { display: flex; flex-direction: row; @@ -109,15 +254,18 @@ body { justify-content: space-between; } +#downloadClose, #settingsClose { display: inline-block; transition: filter 0.1s ease-in-out; } +#downloadClose img, #settingsClose img { height: 20px; } +#downloadClose:hover, #settingsClose:hover { filter: invert(85%) sepia(31%) saturate(560%) hue-rotate(329deg) brightness(100%) contrast(92%); cursor: pointer; @@ -127,7 +275,7 @@ body { position: absolute; z-index: 99; padding: 10px; - transform: translate(150px, 420px); + transform: translate(3vw, 420px); background-color: #fff; border-radius: 5px; border: 1px solid #ccc; @@ -276,6 +424,18 @@ body { background: linear-gradient(#ffc61e, #ffd326); } +.openFolderIcon { + display: inline; + height: 20px; + filter: invert(97%) sepia(85%) saturate(12%) hue-rotate(184deg) brightness(103%) contrast(103%); + padding: 10px; +} + +.openFolderIcon:hover { + cursor: pointer; + filter: invert(99%) sepia(0%) saturate(1092%) hue-rotate(172deg) brightness(80%) contrast(103%); +} + #bottomBar { display: flex; justify-content: center; @@ -304,7 +464,13 @@ body { height: 10%; } -#genshinPath, #serverPath { +.bottomSection div div { + display: flex; + flex-direction: row; + height: 100%; +} + +#gamePath, #serverPath { color: white; font-size: 14px; } @@ -336,7 +502,7 @@ body { } #firstPanel { - background-position: -340px; + background-position: -200px; } /* Move the first official button to the position on the png */ @@ -351,6 +517,10 @@ body { display: block; } +#port { + width: 12%; +} + #secondPanel input { margin-bottom: 4px; height: 20px; @@ -393,4 +563,82 @@ body { #serverInput img:hover { cursor: pointer; +} + +#downloadNotif { + z-index: 99; + position: absolute; + + color: #fff; + background: #141414; + border: 1px solid #ccc; + + padding: 1em; + top: 80%; + left: 120%; + width: 20%; + border-radius: 5px; + + text-align: center; + + transition: left 0.5s ease-in-out; +} + +#downloadNotif:hover { + cursor: pointer; + border-color: #fff; +} + +#downloadNotif img { + height: 20px; + vertical-align: middle; + margin-right: 4px; + filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(16deg) brightness(103%) contrast(101%); +} + +#downloadNotif.displayed { + left: 70%; +} + +#newestVersion { + font-weight: bold; +} + +#alert { + display: flex; + justify-content: center; + align-items: center; + + font-weight: bold; + color: #704a1d; + + position: absolute; + top: -100%; + left: 15%; + background: linear-gradient(#ffc61e, #ffd326); + border: 1px solid #704a1d; + border-radius: 6px; + + height: 50px; + width: 70%; + + z-index: 999; + + transition: top 0.15s ease-in-out; +} + +#alert.show { + top: 6%; +} + +#dialogTitle { + font-weight: bold; +} + +#dialogBtns { + display: flex; + justify-content: space-around; + align-items: center; + width: 100%; + margin: 0.6em; } \ No newline at end of file diff --git a/scripts/gc_download.cmd b/scripts/gc_download.cmd new file mode 100644 index 0000000..4e8e3f3 --- /dev/null +++ b/scripts/gc_download.cmd @@ -0,0 +1,58 @@ +@echo off + +set KEYSTORE_URL=%1 +set ARTIFACT_URL=%2 +set BRANCH=%3 +set FOLDER_NAME=".\gc-%BRANCH%" +set FOLDER_NAME=%FOLDER_NAME:"=% + +title GC Download Script + +if not exist "%FOLDER_NAME%" mkdir "%FOLDER_NAME%" +if not exist ".\temp" mkdir ".\temp" + +echo Downloading Grasscutter prebuilt jar... + +:: Download the jar +powershell Invoke-WebRequest -Uri %KEYSTORE_URL% -OutFile ".\temp\gcjar.zip" + +echo Extracting... + +:: Delete old file if there is one there +if exist "%FOLDER_NAME%\grasscutter.jar" del "%FOLDER_NAME%\grasscutter.jar" + +powershell Expand-Archive -Path ".\temp\gcjar.zip" -DestinationPath "%FOLDER_NAME%" -Force + +:: Find the jar file name and rename it, just in case +for %%i in (%FOLDER_NAME%/*) do ( + :: If the extension is jar, rename the file + if %%~xi equ .jar rename "%FOLDER_NAME%\%%i" grasscutter.jar +) + +echo Downloading keystore.p12... + +:: Download the keystore.p12 file +powershell Invoke-WebRequest -Uri %ARTIFACT_URL% -OutFile ".\%FOLDER_NAME%\keystore.p12" + +:: Check java version, this will automatically output some tuff +call .\scripts\javaver.cmd %BRANCH% + +:: Allow resource downloading to be optional, since it takes a while +set REPLY=y +set /p "REPLY=Download server resources? (This can take a while) [y|n]:" +if /i not "%reply%" == "y" goto :finish + +call .\scripts\resources_download.cmd %FOLDER_NAME% + +goto :finish + +:finish + :: Remove temp stuff + del /s /q "./temp" + + echo Done, latest Grasscutter %BRANCH% now downloaded in %FOLDER_NAME% + + pause + + taskkill /f /fi "WINDOWTITLE eq GC Download Script" + diff --git a/scripts/install.cmd b/scripts/install.cmd index 0e29eca..4ccd2f9 100644 --- a/scripts/install.cmd +++ b/scripts/install.cmd @@ -3,11 +3,7 @@ set ORIGIN=%1 set ORIGIN=%ORIGIN:"=% -:: Ensure admin ->nul 2>&1 reg query "HKU\S-1-5-19" || ( - set params = %*:"="""% - cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% 1>nul 2>nul || ( echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/k cd ""%~sdp0"" && %~s0 "%1" ", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && exit /B ) -) +title Grassclipper Installer echo Downloading proxy server... @@ -15,22 +11,22 @@ echo Downloading proxy server... cd "%ORIGIN%" if not exist "%ORIGIN%/ext" mkdir "%ORIGIN%/ext" -if not exist "%ORIGIN%/temp" mkdir "%ORIGIN%/temp" +if not exist "%ORIGIN%/temp" mkdir "%ORIGIN%/temp -:: Begin by retrieving mitmproxy 8.0.0 -powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/8.0.0/mitmproxy-8.0.0-windows.zip -OutFile "%ORIGIN%/temp/mitmproxy-8.0.0-windows.zip" +:: Begin by retrieving mitmproxy 7.0.4 +powershell Invoke-WebRequest -Uri https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-windows.zip -OutFile "'%ORIGIN%\temp\mitmproxy-7.0.4-windows.zip'" echo Extracting... :: Extract from temp/ to ext/ with powershell -powershell Expand-Archive -Path "%ORIGIN%/temp/mitmproxy-8.0.0-windows.zip" -DestinationPath "%ORIGIN%/ext/" -Force +powershell Expand-Archive -Path "'%ORIGIN%\temp\mitmproxy-7.0.4-windows.zip'" -DestinationPath "'%ORIGIN%\ext\'" -Force del /s /q "%ORIGIN%/temp" echo Running proxy server in order to generate certificates... :: Start proxy server -start "Proxy Server" %ORIGIN%/ext/mitmdump.exe --ssl-insecure --set ip=%ip% +start "Proxy Server" "%ORIGIN%\ext\mitmdump.exe" --ssl-insecure --set ip=%ip% :: Allow the proxy server to create the certificates ping 127.0.0.1 -n 6 > nul @@ -41,12 +37,18 @@ taskkill /f /im mitmdump.exe echo Adding ceritifcate... :: Ensure we are elevated for certs ->nul 2>&1 certutil -addstore root %USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer || ( - echo Certificate install failed, ensure the script is running as Administrator and that the path "%USERPROFILE%\.mitmproxy" exists, +>nul 2>&1 certutil -addstore root "%USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer" || ( + echo ============================================================================================================ + echo !! Certificate install failed !! + echo. + echo Please manually run this command as Administrator: + echo certutil -addstore root "%USERPROFILE%\.mitmproxy\mitmproxy-ca-cert.cer" + echo ============================================================================================================ ) echo Done! You can now open GrassClipper.exe! pause -exit /b \ No newline at end of file +taskkill /f /fi "WINDOWTITLE eq Grassclipper Installer" +taskkill /f /fi "WINDOWTITLE eq Administrator: Grassclipper Installer" \ No newline at end of file diff --git a/scripts/javaver.cmd b/scripts/javaver.cmd new file mode 100644 index 0000000..c22093a --- /dev/null +++ b/scripts/javaver.cmd @@ -0,0 +1,70 @@ +@echo off + +set BRANCH=%1 + +echo Checking java version... + +where java >nul 2>nul +if %errorlevel%==1 ( + echo ======================================================================================= + echo No version of Java was found! + + if %BRANCH% EQU stable ( + echo To launch the stable branch server, you must install Java 8 + ) + + if %BRANCH% EQU development ( + echo To launch the development branch server, you must install Java 17 + ) + + echo ======================================================================================= + + exit /b +) + +:: https://stackoverflow.com/questions/5675459/how-to-get-java-version-from-batch-script +for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do ( + @echo Output: %%g + set JAVAVER=%%g +) +set JAVAVER=%JAVAVER:"=% + +for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do ( + set MAJOR=%%v + set MINOR=%%w + set BUILD=%%x +) + +if %BRANCH% EQU stable ( + :: Ensure java 8 + if %MAJOR% EQU 1 ( + if %MINOR% LSS 8 ( + echo ======================================================================================= + echo !! Java version is less than 8 !! + echo Please download Java 8 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= + exit /b + ) + ) + + if %MAJOR% NEQ 1 ( + echo ======================================================================================= + echo !! Java version is not 8 !! + echo Please download Java 8 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= + exit /b + ) +) + +if %BRANCH% EQU development ( + :: Ensure java 17 + if %MAJOR% LSS 17 ( + echo ======================================================================================= + echo !! Java version is less than 17 !! + echo Please download Java 17 to ensure %BRANCH% branch server launches correctly. + echo ======================================================================================= + exit /b + ) +) + +echo Java version is compatible \ No newline at end of file diff --git a/scripts/killswitch.cmd b/scripts/killswitch.cmd index 0c8e8ec..8a1cfd0 100644 --- a/scripts/killswitch.cmd +++ b/scripts/killswitch.cmd @@ -5,6 +5,9 @@ set GAME_EXE_NAME=%GAME_EXE_NAME:"=% set PROXY_IP=%2 set PROXY_IP=%PROXY_IP:"=% +:: For task killing +title PS Killswitch + :: Get current wifi SSID to reconnect for /f "delims=: tokens=2" %%n in ('netsh wlan show interface name="Wi-Fi" ^| findstr "Profile"') do set "WIFI=%%n" set WIFI=%WIFI: =% @@ -19,16 +22,20 @@ if "%PROXY_IP%" EQU "localhost" ( ) :loop + :: Wait a couple seconds + ping 127.0.0.1 -n 2 > nul + :: Check if the game is even running - @rem QPROCESS "%GAME_EXE_NAME%">NUL - @rem IF %ERRORLEVEL% NEQ 0 ( - @rem exit /b - @rem ) + :: tasklist /fi "ImageName eq %GAME_EXE_NAME%" /fo csv 2>NUL | find /I "%GAME_EXE_NAME%.exe">NUL + :: IF %ERRORLEVEL% NEQ 0 ( + :: exit /b + :: ) :: Check if the proxy server process is running :: https://stackoverflow.com/questions/162291/how-to-check-if-a-process-is-running-via-a-batch-script tasklist /fi "ImageName eq mitmdump.exe" /fo csv 2>NUL | find /I "mitmdump.exe">NUL if "%ERRORLEVEL%" NEQ "0" ( + echo "mitmdump not running" goto killgame ) @@ -59,8 +66,6 @@ if "%PROXY_IP%" EQU "localhost" ( goto killgame ) - timeout /t 2 /NOBREAK >nul - goto loop :killgame @@ -84,4 +89,6 @@ if "%PROXY_IP%" EQU "localhost" ( :: Reconnect to the WiFi netsh wlan connect name="%WIFI%" + taskkill /f /fi "WINDOWTITLE eq Administrator: PS Killswitch" + exit \ No newline at end of file diff --git a/scripts/local_server_launch.cmd b/scripts/local_server_launch.cmd index d411daa..bb98c32 100644 --- a/scripts/local_server_launch.cmd +++ b/scripts/local_server_launch.cmd @@ -3,12 +3,27 @@ set GRASSCUTTER_JAR=%1 set GRASSCUTTER_JAR=%GRASSCUTTER_JAR:"=% -:: Ensure admin ->nul 2>&1 reg query "HKU\S-1-5-19" || ( - set params = %*:"="""% - cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% 1>nul 2>nul || ( echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/k cd ""%~sdp0"" && %~s0 "%1"", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && exit /B ) -) +title Grasscutter + +:: Get folder the jar is in +set "X=%GRASSCUTTER_JAR%" +:l + set IS_SLASH=false + + if "%X:~-1%"=="\" set IS_SLASH=true + if "%X:~-1%"=="/" set IS_SLASH=true + + if %IS_SLASH% equ true goto al + + set "X=%X:~0,-1%" + goto l +:al + set "X=%X:~0,-1%" + set "GRASSCUTTER_ROOT=%X%" echo Starting local Grasscutter server... -start /b java -jar %GRASSCUTTER_JAR% \ No newline at end of file +:: Change dir to server directory +cd /d "%GRASSCUTTER_ROOT%" + +call java -jar "%GRASSCUTTER_JAR%" \ No newline at end of file diff --git a/scripts/private_server_launch.cmd b/scripts/private_server_launch.cmd index a9ea591..5f78002 100644 --- a/scripts/private_server_launch.cmd +++ b/scripts/private_server_launch.cmd @@ -1,19 +1,38 @@ @echo off :: Ensure admin ->nul 2>&1 reg query "HKU\S-1-5-19" || ( - set params = %*:"="""% - cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% 1>nul 2>nul || ( echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/k cd ""%~sdp0"" && %~s0 %1 "%2" ""%cd%"" %4", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && exit /B ) -) +@REM >nul 2>&1 reg query "HKU\S-1-5-19" || ( +@REM set params = %*:"="""% +@REM cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% 1>nul 2>nul || ( echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/k cd ""%~sdp0"" && %~s0 %1 %2 %3 "%4" ""%cd%"" %6", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && exit /B ) +@REM ) + +:: Use to force task kill +title PS Launcher Script + +:: Use a character encoding that allows for use of Chinese characters. This should work but doesn't, but I'm keeping it in here just in case +chcp 65001 echo Starting Proxy Server set IP=%1 -set GAME_PATH=%2 +set PORT=%2 +set USE_HTTPS=%3 +set GAME_PATH=%4 set GAME_PATH=%GAME_PATH:"=% -set ORIGIN=%3 +set ORIGIN=%5 set ORIGIN=%ORIGIN:"=% -set ENABLE_KILLSWITCH=%4 +set ENABLE_KILLSWITCH=%6 + +:: For registry +set GAME_REG="HKEY_CURRENT_USER\Software\miHoYo\Genshin Impact" + +if "%ENABLE_KILLSWITCH%" EQU "true" ( + :: Restart in elevated if need be + >nul 2>&1 reg query "HKU\S-1-5-19" || ( + set params = %*:"="""% + cd /d "%~dp0" && ( if exist "%temp%\getadmin.vbs" del "%temp%\getadmin.vbs" ) && fsutil dirty query %systemdrive% 1>nul 2>nul || ( echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/k cd ""%~sdp0"" && %~s0 %1 %2 %3 "%4" ""%cd%"" %6", "", "runas", 1 >> "%temp%\getadmin.vbs" && "%temp%\getadmin.vbs" && taskkill /f /fi "WINDOWTITLE eq PS Launcher Script" && exit /b ) + ) +) set PROXY=true @rem Store original proxy settings @@ -25,11 +44,11 @@ reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v Pr reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer /d "127.0.0.1:8080" /f >nul 2>nul :: Start proxy server -start "Proxy Server" %ORIGIN%/ext/mitmdump.exe -s "%ORIGIN%/proxy/proxy.py" --ssl-insecure --set ip=%IP% +start "Proxy Server" "%ORIGIN%\ext\mitmdump.exe" -s "%ORIGIN%/proxy/proxy.py" -k --allow-hosts ".*\.yuanshen\.com|.*\.mihoyo\.com|.*\.hoyoverse\.com" --ssl-insecure --set ip=%IP% --set port=%PORT% --set use_https=%USE_HTTPS% echo Opening %GAME_PATH% -:: Allow the proxy server to create the certificates +:: Allow the proxy server to open fully ping 127.0.0.1 -n 5 > nul for %%A in ("%GAME_PATH%") do ( @@ -41,7 +60,7 @@ echo Killswitch: %ENABLE_KILLSWITCH% if "%ENABLE_KILLSWITCH%" EQU "true" ( echo Killswitch is enabled! :: Start killswitch - start /b %ORIGIN%\scripts\killswitch.cmd "%GAME_EXE%" %IP%" + start /b %ORIGIN%\scripts\killswitch.cmd "%GAME_EXE%" 127.0.0.1 ) :: Launch game @@ -49,16 +68,29 @@ if "%ENABLE_KILLSWITCH%" EQU "true" ( :: On exit clean proxy stuff :EXIT -if "%PROXY%" == "" ( +echo Exiting... + +if "%PROXY%" EQU "" ( echo Proxy not started, no need to clean up. -) else ( - :: Clean proxy settings - echo Cleaning up proxy settings - reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyEnable /t REG_DWORD /d "%ORIG_PROXY_ENABLE%" /f >nul 2>nul - reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer /d "%ORIG_PROXY_SERVER%" /f >nul 2>nul - :: Kill proxy server - taskkill /f /im mitmdump.exe + exit /b +) - exit /b -) \ No newline at end of file +:: Clean proxy settings +echo Cleaning up proxy settings... +reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyEnable /t REG_DWORD /d "%ORIG_PROXY_ENABLE%" /f >nul 2>nul +reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Internet Settings" /v ProxyServer /d "%ORIG_PROXY_SERVER%" /f >nul 2>nul + +:: Kill proxy server +taskkill /f /im mitmdump.exe + +echo Done, see you next time + +:: Just in case the user has corutils installed, use this hacky timeout instead of the timeout command +ping 127.0.0.1 -n 2 > nul + +:: Attempt to kill either +taskkill /f /fi "WINDOWTITLE eq Administrator: PS Launcher Script" +taskkill /f /fi "WINDOWTITLE eq PS Launcher Script" + +exit /b \ No newline at end of file diff --git a/scripts/resources_download.cmd b/scripts/resources_download.cmd new file mode 100644 index 0000000..d5e14e6 --- /dev/null +++ b/scripts/resources_download.cmd @@ -0,0 +1,29 @@ +@echo off + +set FOLDER_NAME=%1 +set FOLDER_NAME=%FOLDER_NAME:"=% + +if not exist ".\temp" mkdir ".\temp" +if not exist ".\resources" mkdir ".\resources" + +echo Downloading resources, this can take a while... + +:: Grab the giant ass resource zip +powershell Invoke-WebRequest -Uri https://github.com/Koko-boya/Grasscutter_Resources/archive/refs/heads/main.zip -OutFile ".\temp\resources.zip" + +echo Extracting... + +:: Extract resources to the folder +powershell Expand-Archive -Path ".\temp\resources.zip" -DestinationPath "%FOLDER_NAME%" -Force + +:: Delete old resources folder if there is one there +del /s /q "%FOLDER_NAME%\resources">nul + +echo Moving resources to folder... + +robocopy "%FOLDER_NAME%\Grasscutter_Resources-main\Resources" "%FOLDER_NAME%\resources" /E /MOVE>nul + +:: Delete straggling files +del /s /q "%FOLDER_NAME%\Grasscutter_Resources-main" + +echo Done, resources should be properly extracted \ No newline at end of file diff --git a/setup_win.cmd b/setup_win.cmd new file mode 100644 index 0000000..6f110b4 --- /dev/null +++ b/setup_win.cmd @@ -0,0 +1,8 @@ +@echo off + +set BINARY_URL="https://github.com/SpikeHD/neutralinojs/releases/download/v1337.0.0/neutralino-win_x64.exe" + +call npm install + +:: Use powershell to download the binary +powershell Invoke-WebRequest -Uri %BINARY_URL% -OutFile "./bin/neutralino-win_x64.exe" \ No newline at end of file diff --git a/tools/mtools.exe b/tools/mtools.exe new file mode 100644 index 0000000..87141d4 Binary files /dev/null and b/tools/mtools.exe differ