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

12
app/app.ejs
View File

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

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

@ -466,7 +466,6 @@ let proc
let hasRPC = false
// Joined server regex
// 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_LAUNCH_REGEX = /^\[.+\]: (?:MinecraftForge .+ Initialized|ModLauncher .+ starting: .+)$/
const MIN_LINGER = 5000
@ -649,6 +648,9 @@ function dlAsync(login = true){
let pb = new ProcessBuilder(serv, versionData, forgeData, authUser, remote.app.getVersion())
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 = () => {
toggleLaunchArea(false)
if(hasRPC){

4
index.js
View File

@ -102,7 +102,9 @@ function createWindow() {
webPreferences: {
preload: path.join(__dirname, 'app', 'assets', 'js', 'preloader.js'),
nodeIntegration: true,
contextIsolation: false
contextIsolation: false,
enableRemoteModule: true,
worldSafeExecuteJavaScript: false
},
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": {
"adm-zip": "^0.4.16",
"async": "^3.2.0",
"discord-rpc": "^3.1.1",
"ejs": "^3.1.3",
"ejs-electron": "^2.1.0",
"electron-updater": "^4.3.1",
"discord-rpc": "^3.1.3",
"ejs": "^3.1.5",
"ejs-electron": "^2.1.1",
"electron-updater": "^4.3.4",
"fs-extra": "^9.0.1",
"github-syntax-dark": "^0.5.0",
"jquery": "^3.5.1",
@ -41,9 +41,9 @@
},
"devDependencies": {
"cross-env": "^7.0.2",
"electron": "^9.1.0",
"electron-builder": "^22.7.0",
"eslint": "^7.4.0"
"electron": "^9.2.1",
"electron-builder": "^22.8.0",
"eslint": "^7.7.0"
},
"repository": {
"type": "git",