ONIMAI-SMP/Launcher
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #5 from dscalzi/master

Browse Source 
Update from upstream
This commit is contained in:
Michael Anderson 2020-08-30 14:44:42 -06:00 committed by GitHub
commit fc967a330e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 547 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -136,10 +136,10 @@ Paste the following into `.vscode/launch.json`
"name": "Debug Main Process", "name": "Debug Main Process",
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"cwd": "${workspaceRoot}", "cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": { "windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd" "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
}, },
"args": ["."], "args": ["."],
"console": "integratedTerminal", "console": "integratedTerminal",
@ -149,15 +149,15 @@ Paste the following into `.vscode/launch.json`
"name": "Debug Renderer Process", "name": "Debug Renderer Process",
"type": "chrome", "type": "chrome",
"request": "launch", "request": "launch",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": { "windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd" "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
}, },
"runtimeArgs": [ "runtimeArgs": [
"${workspaceRoot}/.", "${workspaceFolder}/.",
"--remote-debugging-port=9222" "--remote-debugging-port=9222"
], ],
"webRoot": "${workspaceRoot}" "webRoot": "${workspaceFolder}"
} }
] ]
} }

12
app/app.ejs
View File

@ -27,14 +27,14 @@
</style> </style>
</head> </head>
<body bkid="<%=bkid%>"> <body bkid="<%=bkid%>">
<% include frame.ejs %> <%- include('frame') %>
<div id="main"> <div id="main">
<% include welcome.ejs %> <%- include('welcome') %>
<% include login.ejs %> <%- include('login') %>
<% include settings.ejs %> <%- include('settings') %>
<% include landing.ejs %> <%- include('landing') %>
</div> </div>
<% include overlay.ejs %> <%- include('overlay') %>
<div id="loadingContainer"> <div id="loadingContainer">
<div id="loadingContent"> <div id="loadingContent">
<div id="loadSpinnerContainer"> <div id="loadSpinnerContainer">

4
app/assets/js/scripts/landing.js
View File

@ -466,7 +466,6 @@ let proc
let hasRPC = false let hasRPC = false
// Joined server regex // Joined server regex
// Change this if your server uses something different. // Change this if your server uses something different.
const SERVER_JOINED_REGEX = /\[.+\]: \[CHAT\] [a-zA-Z0-9_]{1,16} joined the game/
const GAME_JOINED_REGEX = /\[.+\]: Sound engine started/ const GAME_JOINED_REGEX = /\[.+\]: Sound engine started/
const GAME_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+)$/ const GAME_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+)$/
const MIN_LINGER = 5000 const MIN_LINGER = 5000
@ -649,6 +648,9 @@ function dlAsync(login = true){
let pb = new ProcessBuilder(serv, versionData, forgeData, authUser, remote.app.getVersion()) let pb = new ProcessBuilder(serv, versionData, forgeData, authUser, remote.app.getVersion())
setLaunchDetails('Launching game..') setLaunchDetails('Launching game..')
// const SERVER_JOINED_REGEX = /\[.+\]: \[CHAT\] [a-zA-Z0-9_]{1,16} joined the game/
const SERVER_JOINED_REGEX = new RegExp(`\\[.+\\]: \\[CHAT\\] ${authUser.displayName} joined the game`)
const onLoadComplete = () => { const onLoadComplete = () => {
toggleLaunchArea(false) toggleLaunchArea(false)
if(hasRPC){ if(hasRPC){

4
index.js
View File

@ -102,7 +102,9 @@ function createWindow() {
webPreferences: { webPreferences: {
preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'), preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'),
nodeIntegration: true, nodeIntegration: true,
contextIsolation: false contextIsolation: false,
enableRemoteModule: true,
worldSafeExecuteJavaScript: false
}, },
backgroundColor: '#171614' backgroundColor: '#171614'
}) })

1040
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -27,10 +27,10 @@
"dependencies": { "dependencies": {
"adm-zip": "^0.4.16", "adm-zip": "^0.4.16",
"async": "^3.2.0", "async": "^3.2.0",
"discord-rpc": "^3.1.1", "discord-rpc": "^3.1.3",
"ejs": "^3.1.3", "ejs": "^3.1.5",
"ejs-electron": "^2.1.0", "ejs-electron": "^2.1.1",
"electron-updater": "^4.3.1", "electron-updater": "^4.3.4",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"github-syntax-dark": "^0.5.0", "github-syntax-dark": "^0.5.0",
"jquery": "^3.5.1", "jquery": "^3.5.1",
@ -41,9 +41,9 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"electron": "^9.1.0", "electron": "^9.2.1",
"electron-builder": "^22.7.0", "electron-builder": "^22.8.0",
"eslint": "^7.4.0" "eslint": "^7.7.0"
}, },
"repository": { "repository": {
"type": "git", "type": "git",