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

Mise a jour

Browse Source
This commit is contained in:
FullGreenDev 2021-02-08 13:04:03 +01:00
parent 2abb1dd70a
commit 7277c190e1
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/js/discordwrapper.js
View File

@ -11,7 +11,7 @@ exports.initRPC = function(genSettings, servSettings, initialDetails = 'En atten
activity = { activity = {
details: initialDetails, details: initialDetails,
state: 'Server: ' + servSettings.shortId, state: 'Serveur: ' + servSettings.shortId,
largeImageKey: servSettings.largeImageKey, largeImageKey: servSettings.largeImageKey,
largeImageText: servSettings.largeImageText, largeImageText: servSettings.largeImageText,
smallImageKey: genSettings.smallImageKey, smallImageKey: genSettings.smallImageKey,

20
app/assets/js/serverstatus.js
View File

@ -4,16 +4,16 @@ const net = require('net')
* Retrieves the status of a minecraft server. * Retrieves the status of a minecraft server.
* *
* @param {string} address The server address. * @param {string} address The server address.
* @param {number} port Optional. The port of the server. Defaults to 25565. * @param {number} port Port par defaut SkyGames.
* @returns {Promise.<Object>} A promise which resolves to an object containing * @returns {Promise.<Object>} A promise which resolves to an object containing
* status information. * status information.
*/ */
exports.getStatus = function(address, port = 25565){ exports.getStatus = function(address, port = 25001) {
if(port == null || port == ''){ if (port == null || port == '') {
port = 25565 port = 25001
} }
if(typeof port === 'string'){ if (typeof port === 'string') {
port = parseInt(port) port = parseInt(port)
} }
@ -34,16 +34,16 @@ exports.getStatus = function(address, port = 25565){
}) })
socket.on('data', (data) => { socket.on('data', (data) => {
if(data != null && data != ''){ if (data != null && data != '') {
let server_info = data.toString().split('\x00\x00\x00') let server_info = data.toString().split('\x00\x00\x00')
const NUM_FIELDS = 6 const NUM_FIELDS = 6
if(server_info != null && server_info.length >= NUM_FIELDS){ if (server_info != null && server_info.length >= NUM_FIELDS) {
resolve({ resolve({
online: true, online: true,
version: server_info[2].replace(/\u0000/g, ''), version: server_info[2].replace(/\u0000/g, ''),
motd: server_info[3].replace(/\u0000/g, ''), motd: server_info[3].replace(/\u0000/g, ''),
onlinePlayers: server_info[4].replace(/\u0000/g, ''), onlinePlayers: server_info[4].replace(/\u0000/g, ''),
maxPlayers: server_info[5].replace(/\u0000/g,'') maxPlayers: server_info[5].replace(/\u0000/g, '')
}) })
} else { } else {
resolve({ resolve({
@ -57,8 +57,8 @@ exports.getStatus = function(address, port = 25565){
socket.on('error', (err) => { socket.on('error', (err) => {
socket.destroy() socket.destroy()
reject(err) reject(err)
// ENOTFOUND = Unable to resolve. // ENOTFOUND = Unable to resolve.
// ECONNREFUSED = Unable to connect to port. // ECONNREFUSED = Unable to connect to port.
}) })
}) })

2
app/landing.ejs
View File

@ -31,7 +31,7 @@
<div class="mediaDivider"></div> <div class="mediaDivider"></div>
<div id="externalMedia"> <div id="externalMedia">
<div class="mediaContainer"> <div class="mediaContainer">
<a href="https://www.skygames.fr" class="mediaURL" id="linkURL"> <a href="http://www.skygames.fr" class="mediaURL" id="linkURL">
<svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500"> <svg id="linkSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
<g> <g>
<path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/> <path d="M75.37,65.51a3.85,3.85,0,0,0-1.73.42,8.22,8.22,0,0,1,.94,3.76A8.36,8.36,0,0,1,66.23,78H46.37a8.35,8.35,0,1,1,0-16.7h9.18a21.51,21.51,0,0,1,6.65-8.72H46.37a17.07,17.07,0,1,0,0,34.15H66.23A17,17,0,0,0,82.77,65.51Z"/>

3
app/settings.ejs
View File

@ -266,7 +266,8 @@
</div> </div>
</div> </div>
<div class="settingsFileSelDesc"> <div class="settingsFileSelDesc">
Tous les fichiers de jeu et les installations Java locales seront stockés dans le répertoire de données. <br> Les captures d'écran et les sauvegardes du monde sont stockées dans le dossier d'instance de la configuration de serveurcorrespondante.</div> Tous les fichiers de jeu et les installations Java locales seront stockés dans le répertoire de données. <br> Les captures d'écran et les sauvegardes du monde sont stockées dans le dossier d'instance de la configuration de serveur
correspondante.</div>
</div> </div>
</div> </div>
<div id="settingsTabAbout" class="settingsTab" style="display: none;"> <div id="settingsTabAbout" class="settingsTab" style="display: none;">