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 2020-12-04 18:00:36 +01:00
parent f2ce68d0ef
commit 3aedd6cf01
8 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/css/launcher.css
View File

@ -4593,5 +4593,5 @@ input:checked+.toggleSwitchSlider:before {
/* Class which is applied when the spinner image is spinning. */
.rotating {
animation: rotating 10s linear infinite;
animation: rotating 5s linear infinite;
}

32
app/assets/js/configmanager.js
View File

@ -50,13 +50,12 @@ exports.getAbsoluteMinRAM = function() {
exports.getAbsoluteMaxRAM = function() {
const mem = os.totalmem()
const gT16 = mem - 16000000000
return Math.floor((mem - 1000000000 - (gT16 > 0 ? (Number.parseInt(gT16 / 8) + 16000000000 / 4) : mem / 4)) / 1000000000)
return Math.floor((mem / 1000000000))
}
function resolveMaxRAM() {
const mem = os.totalmem()
return mem >= 8000000000 ? '4G' : (mem >= 6000000000 ? '3G' : '2G')
return mem >= 16000000000 ? '8G' : (mem >= 8000000000 ? '6G' : (mem >= 6000000000 ? '4G' : '2G'))
}
function resolveMinRAM() {
@ -76,10 +75,27 @@ const DEFAULT_CONFIG = {
maxRAM: resolveMaxRAM(), // Dynamic
executable: null,
jvmOptions: [
'-d64',
'-XX:+AggressiveOpts',
'-XX:ParallelGCThreads=3',
'-XX:+UseConcMarkSweepGC',
'-XX:+CMSIncrementalMode',
'-XX:-UseAdaptiveSizePolicy',
'-Xmn128M'
'-Xmn128M',
'-XX:+UnlockExperimentalVMOptions',
'-XX:+UseParNewGC',
'-XX:+ExplicitGCInvokesConcurrent',
'-XX:MaxGCPauseMillis=10',
'-XX:GCPauseIntervalMillis=50',
'-XX:+UseFastAccessorMethods',
'-XX:+OptimizeStringConcat',
'-XX:NewSize=128m',
'-XX:+UseAdaptiveGCBoundary',
'-XX:NewRatio=3',
'-Dfml.readTimeout=180',
'-Dfml.loginTimeout=180',
'-Dfml.ignoreInvalidMinecraftCertificates=true',
'-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump'
],
},
game: {
@ -87,11 +103,14 @@ const DEFAULT_CONFIG = {
resHeight: 720,
fullscreen: false,
autoConnect: true,
launchDetached: true
launchDetached: true,
consoleOnLaunch: false
},
launcher: {
allowPrerelease: false,
dataDirectory: dataPath
discordIntegration: true,
dataDirectory: dataPath,
serverCodes: []
}
},
newsCache: {
@ -100,6 +119,7 @@ const DEFAULT_CONFIG = {
dismissed: false
},
clientToken: null,
distributionVersion: null,
selectedServer: null, // Resolved
selectedAccount: null,
authenticationDatabase: {},

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

@ -537,7 +537,7 @@ exports.pullRemote = function(){
return exports.pullLocal()
}
return new Promise((resolve, reject) => {
const distroURL = 'http://mc.skygames.fr/7AZi725mvlcY9V3Q/launcher/distribution.json'
const distroURL = 'http://mc.skygames.fr/7AZi725mvlcY9V3Q/launcher/deploy/distribution.json'
//const distroURL = 'https://gist.githubusercontent.com/dscalzi/53b1ba7a11d26a5c353f9d5ae484b71b/raw/'
const opts = {
url: distroURL,

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

@ -225,7 +225,7 @@ const refreshServerStatus = async function(fade = false) {
loggerLanding.log('Actualisation de l\'état du serveur')
const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
let pLabel = 'SERVER'
let pLabel = 'SERVEUR'
let pVal = 'OFFLINE'
try {

28
app/assets/js/scripts/settings.js
View File

@ -337,11 +337,11 @@ function bindAuthAccountSelect() {
for (let i = 0; i < selectBtns.length; i++) {
if (selectBtns[i].hasAttribute('selected')) {
selectBtns[i].removeAttribute('selected')
selectBtns[i].innerHTML = 'Select Account'
selectBtns[i].innerHTML = 'Sélectionnez un compte'
}
}
val.setAttribute('selected', '')
val.innerHTML = 'Selected Account &#10004;'
val.innerHTML = 'Compte sélectionné &#10004;'
setSelectedAccount(val.closest('.settingsAuthAccount').getAttribute('uuid'))
}
})
@ -415,12 +415,12 @@ function refreshAuthAccountSelected(uuid) {
const selBtn = val.getElementsByClassName('settingsAuthAccountSelect')[0]
if (uuid === val.getAttribute('uuid')) {
selBtn.setAttribute('selected', '')
selBtn.innerHTML = 'Selected Account &#10004;'
selBtn.innerHTML = 'Compte sélectionné &#10004;'
} else {
if (selBtn.hasAttribute('selected')) {
selBtn.removeAttribute('selected')
}
selBtn.innerHTML = 'Select Account'
selBtn.innerHTML = 'Sélectionnez un compte'
}
})
}
@ -449,7 +449,7 @@ function populateAuthAccounts() {
<div class="settingsAuthAccountRight">
<div class="settingsAuthAccountDetails">
<div class="settingsAuthAccountDetailPane">
<div class="settingsAuthAccountDetailTitle">Username</div>
<div class="settingsAuthAccountDetailTitle">Nom d'utilisateur</div>
<div class="settingsAuthAccountDetailValue">${acc.displayName}</div>
</div>
<div class="settingsAuthAccountDetailPane">
@ -458,7 +458,7 @@ function populateAuthAccounts() {
</div>
</div>
<div class="settingsAuthAccountActions">
<button class="settingsAuthAccountSelect" ${selectedUUID === acc.uuid ? 'selected>Selected Account &#10004;' : '>Select Account'}</button>
<button class="settingsAuthAccountSelect" ${selectedUUID === acc.uuid ? 'selected>Compte sélectionné &#10004;' : '>Sélectionnez un compte'}</button>
<div class="settingsAuthAccountWrapper">
<button class="settingsAuthAccountLogOut">Se déconnecter</button>
</div>
@ -968,9 +968,9 @@ settingsMinRAMRange.onchange = (e) => {
const max = (os.totalmem()-1000000000)/1000000000
// Change range bar color based on the selected value.
if(sMinV >= max/2){
if(sMinV >= max/1.25){
bar.style.background = '#e86060'
} else if(sMinV >= max/4) {
} else if(sMinV >= max/2) {
bar.style.background = '#e8e18b'
} else {
bar.style.background = null
@ -1141,9 +1141,9 @@ function populateJavaExecDetails(execPath){
if(v.valid){
const vendor = v.vendor != null ? ` (${v.vendor})` : ''
if(v.version.major < 9) {
settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major} Update ${v.version.update} (x${v.arch})${vendor}`
settingsJavaExecDetails.innerHTML = `Sélectionné: Java ${v.version.major} Mise à jour ${v.version.update} (x${v.arch})${vendor}`
} else {
settingsJavaExecDetails.innerHTML = `Selected: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})${vendor}`
settingsJavaExecDetails.innerHTML = `Sélectionné: Java ${v.version.major}.${v.version.minor}.${v.version.revision} (x${v.arch})${vendor}`
}
} else {
settingsJavaExecDetails.innerHTML = 'Selection Invalide'
@ -1295,20 +1295,20 @@ function populateSettingsUpdateInformation(data){
populateVersionInformation(data.version, settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck)
if(process.platform === 'darwin'){
settingsUpdateButtonStatus('Download from GitHub<span style="font-size: 10px;color: gray;text-shadow: none !important;">Close the launcher and run the dmg to update.</span>', false, () => {
settingsUpdateButtonStatus('Téléchargement depuis GitHub<span style="font-size: 10px;color: gray;text-shadow: none !important;">Fermez le lanceur et exécutez le dmg pour mettre à jour.</span>', false, () => {
shell.openExternal(data.darwindownload)
})
} else {
settingsUpdateButtonStatus('Downloading..', true)
}
} else {
settingsUpdateTitle.innerHTML = 'You Are Running the Latest Version'
settingsUpdateTitle.innerHTML = 'Vous exécutez la dernière version'
settingsUpdateChangelogCont.style.display = 'none'
populateVersionInformation(remote.app.getVersion(), settingsUpdateVersionValue, settingsUpdateVersionTitle, settingsUpdateVersionCheck)
settingsUpdateButtonStatus('Check for Updates', false, () => {
settingsUpdateButtonStatus('Vérifier les mises à jour', false, () => {
if(!isDev){
ipcRenderer.send('autoUpdateAction', 'checkForUpdate')
settingsUpdateButtonStatus('Checking for Updates..', true)
settingsUpdateButtonStatus(' Vérification des mises à jour..', true)
}
})
}

14
app/assets/js/scripts/uicore.js
View File

@ -21,7 +21,7 @@ process.traceDeprecation = true
// Disable eval function.
// eslint-disable-next-line
window.eval = global.eval = function() {
throw new Error('Sorry, this app does not support window.eval().')
throw new Error('Désolé, cette application ne prend pas en charge window.eval ().')
}
// Display warning when devtools window is opened.
@ -64,8 +64,8 @@ if (!isDev) {
showUpdateUI(info)
break
case 'update-not-available':
loggerAutoUpdater.log('No new update found.')
settingsUpdateButtonStatus('Check for Updates')
loggerAutoUpdater.log('Aucune nouvelle mise à jour trouvée.')
settingsUpdateButtonStatus('Vérifier les mises à jour')
break
case 'ready':
updateCheckListener = setInterval(() => {
@ -108,19 +108,19 @@ function showUpdateUI(info) {
//TODO Make this message a bit more informative `${info.version}`
document.getElementById('image_seal_container').setAttribute('update', true)
document.getElementById('image_seal_container').onclick = () => {
/*setOverlayContent('Update Available', 'A new update for the launcher is available. Would you like to install now?', 'Install', 'Later')
setOverlayContent('Mise à jour disponible', 'Une nouvelle mise à jour pour le lanceur est disponible. Souhaitez-vous installer maintenant?', 'Installer', 'Plus tard')
setOverlayHandler(() => {
if(!isDev){
if (!isDev) {
ipcRenderer.send('autoUpdateAction', 'installUpdateNow')
} else {
console.error('Cannot install updates in development environment.')
console.error('Impossible d\'installer les mises à jour dans l\'environnement de développement.')
toggleOverlay(false)
}
})
setDismissHandler(() => {
toggleOverlay(false)
})
toggleOverlay(true, true)*/
toggleOverlay(true, true)
switchView(getCurrentView(), VIEWS.settings, 500, 500, () => {
settingsNavItemListener(document.getElementById('settingsNavUpdate'), false)
})

4
app/landing.ejs
View File

@ -69,7 +69,7 @@
</svg>
</a>
</div>
<div class="mediaContainer">
<!--<div class="mediaContainer">
<a href="#" class="mediaURL" id="youtubeURL" disabled>
<svg id="youtubeSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">
<g>
@ -77,7 +77,7 @@
</g>
</svg>
</a>
</div>
</div>-->
<div class="mediaContainer">
<a href="https://discord.skygames.fr" class="mediaURL" id="discordURL">
<svg id="discordSVG" class="mediaSVG" viewBox="35.34 34.3575 70.68 68.71500">

6
app/settings.ejs
View File

@ -204,13 +204,13 @@
</svg>
</div>
<input class="settingsFileSelVal" id="settingsJavaExecVal" type="text" value="null" cValue="JavaExecutable" disabled>
<button class="settingsFileSelButton" id="settingsJavaExecSel" dialogTitle="Select Java Executable" dialogDirectory="false">Choose File</button>
<button class="settingsFileSelButton" id="settingsJavaExecSel" dialogTitle="Select Java Executable" dialogDirectory="false">Choisir le fichier</button>
</div>
</div>
<div class="settingsFileSelDesc">L'exécutable Java est validé avant le lancement du jeu. <strong>Nécessite Java 8 x64.</strong><br>Le chemin doit se terminer par <strong>bin<%= process.platform === 'win32' ? '\\javaw.exe' : '/java' %></strong>.</div>
</div>
<div id="settingsJVMOptsContainer">
<div id="settingsJVMOptsTitle">Additional JVM Options</div>
<div id="settingsJVMOptsTitle">Options JVM supplémentaires</div>
<div id="settingsJVMOptsContent">
<div class="settingsFileSelIcon">
<svg class="settingsFileSelSVG" x="0px" y="0px" viewBox="0 0 305.001 305.001">
@ -228,7 +228,7 @@
</div>
<input id="settingsJVMOptsVal" cValue="JVMOptions" type="text">
</div>
<div id="settingsJVMOptsDesc">Options to be provided to the JVM at runtime. <em>-Xms</em> and <em>-Xmx</em> should not be included.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html">Available Options for Java 8</a>.</div>
<div id="settingsJVMOptsDesc">Options à fournir à la JVM lors de l'exécution. <em>-Xms</em> Et <em>-Xmx</em> ne doit pas être inclus.<br><a href="https://docs.oracle.com/javase/8/docs/technotes/tools/<%= process.platform === 'win32' ? 'windows' : 'unix' %>/java.html">Options disponibles pour Java 8</a>.</div>
</div>
</div>
<div id="settingsTabLauncher" class="settingsTab" style="display: none;">