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

Mise à jour

Browse Source
This commit is contained in:
MrPiano5454 2023-03-12 19:32:55 +01:00
parent 45630c068c
commit ce554dea1b
8 changed files with 55 additions and 1721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@ const net = require('net')
* @returns {Promise.<Object>} A promise which resolves to an object containing
* status information.
*/
exports.getStatus = function(address, port = 25565){
exports.getStatus = function(address, port = 25566){
if(port == null || port == ''){
port = 25565
port = 25566
}
if(typeof port === 'string'){
port = parseInt(port)

38
app/settings.ejs
View File

@ -2,18 +2,18 @@
<div id="settingsContainerLeft">
<div id="settingsNavContainer">
<div id="settingsNavHeader">
<span id="settingsNavHeaderText">Settings</span>
<span id="settingsNavHeaderText">Parametre</span>
</div>
<div id="settingsNavItemsContainer">
<div id="settingsNavItemsContent">
<button class="settingsNavItem" rSc="settingsTabAccount" id="settingsNavAccount" selected>Account</button>
<button class="settingsNavItem" rSc="settingsTabAccount" id="settingsNavAccount" selected>Compte</button>
<button class="settingsNavItem" rSc="settingsTabMinecraft">Minecraft</button>
<button class="settingsNavItem" rSc="settingsTabMods">Mods</button>
<button class="settingsNavItem" rSc="settingsTabJava">Java</button>
<button class="settingsNavItem" rSc="settingsTabLauncher">Launcher</button>
<div class="settingsNavSpacer"></div>
<button class="settingsNavItem" rSc="settingsTabAbout">About</button>
<button class="settingsNavItem" rSc="settingsTabUpdate" id="settingsNavUpdate">Updates</button>
<button class="settingsNavItem" rSc="settingsTabUpdate" id="settingsNavUpdate">Mise à jour</button>
<div id="settingsNavContentBottom">
<div class="settingsNavDivider"></div>
<button id="settingsNavDone">Done</button>
@ -25,8 +25,8 @@
<div id="settingsContainerRight">
<div id="settingsTabAccount" class="settingsTab">
<div class="settingsTabHeader">
<span class="settingsTabHeaderText">Account Settings</span>
<span class="settingsTabHeaderDesc">Add new accounts or manage existing ones.</span>
<span class="settingsTabHeaderText">Parametre des comptes</span>
<span class="settingsTabHeaderDesc">Ajouter de nouveaux comptes ou gérer les comptes existants.</span>
</div>
<div class="settingsAuthAccountTypeContainer">
<div class="settingsAuthAccountTypeHeader">
@ -40,7 +40,7 @@
<span>Microsoft</span>
</div>
<div class="settingsAuthAccountTypeHeaderRight">
<button class="settingsAddAuthAccount" id="settingsAddMicrosoftAccount">+ Add Microsoft Account</button>
<button class="settingsAddAuthAccount" id="settingsAddMicrosoftAccount">+ Ajouter un compte Microsoft</button>
</div>
</div>
@ -60,7 +60,7 @@
<span>Mojang</span>
</div>
<div class="settingsAuthAccountTypeHeaderRight">
<button class="settingsAddAuthAccount" id="settingsAddMojangAccount">+ Add Mojang Account</button>
<button class="settingsAddAuthAccount" id="settingsAddMojangAccount">+ Ajouter un compte Mojang</button>
</div>
</div>
@ -71,11 +71,11 @@
</div>
<div id="settingsTabMinecraft" class="settingsTab" style="display: none;">
<div class="settingsTabHeader">
<span class="settingsTabHeaderText">Minecraft Settings</span>
<span class="settingsTabHeaderDesc">Options related to game launch.</span>
<span class="settingsTabHeaderText">Parametre Minecraft</span>
<span class="settingsTabHeaderDesc">Options liées au lancement du jeu.</span>
</div>
<div id="settingsGameResolutionContainer">
<span class="settingsFieldTitle">Game Resolution</span>
<span class="settingsFieldTitle">Résolution du jeu</span>
<div id="settingsGameResolutionContent">
<input type="number" id="settingsGameWidth" min="0" cValue="GameWidth">
<div id="settingsGameResolutionCross">&#10006;</div>
@ -84,7 +84,7 @@
</div>
<div class="settingsFieldContainer">
<div class="settingsFieldLeft">
<span class="settingsFieldTitle">Launch in fullscreen.</span>
<span class="settingsFieldTitle">Lancement en plein écran.</span>
</div>
<div class="settingsFieldRight">
<label class="toggleSwitch">
@ -95,7 +95,7 @@
</div>
<div class="settingsFieldContainer">
<div class="settingsFieldLeft">
<span class="settingsFieldTitle">Automatically connect to the server on launch.</span>
<span class="settingsFieldTitle">Connectez-vous automatiquement au serveur au lancement.</span>
</div>
<div class="settingsFieldRight">
<label class="toggleSwitch">
@ -106,8 +106,8 @@
</div>
<div class="settingsFieldContainer">
<div class="settingsFieldLeft">
<span class="settingsFieldTitle">Launch game process detached from launcher.</span>
<span class="settingsFieldDesc">If the game is not detached, closing the launcher will also close the game.</span>
<span class="settingsFieldTitle">Lancer le processus de jeu détaché du lanceur.</span>
<span class="settingsFieldDesc">Si le jeu n'est pas détaché, la fermeture du lanceur fermera également le jeu.</span>
</div>
<div class="settingsFieldRight">
<label class="toggleSwitch">
@ -119,8 +119,8 @@
</div>
<div id="settingsTabMods" class="settingsTab" style="display: none;">
<div class="settingsTabHeader">
<span class="settingsTabHeaderText">Mod Settings</span>
<span class="settingsTabHeaderDesc">Enable or disable mods.</span>
<span class="settingsTabHeaderText">Paramètres des Mods</span>
<span class="settingsTabHeaderDesc">Activer ou désactiver les mods.</span>
</div>
<div class="settingsSelServContainer">
<div class="settingsSelServContent">
@ -128,19 +128,19 @@
</div>
<div class="settingsSwitchServerContainer">
<div class="settingsSwitchServerContent">
<button class="settingsSwitchServerButton">Switch</button>
<button class="settingsSwitchServerButton">Changer</button>
</div>
</div>
</div>
<div id="settingsModsContainer">
<div id="settingsReqModsContainer">
<div class="settingsModsHeader">Required Mods</div>
<div class="settingsModsHeader">Mods Requis</div>
<div id="settingsReqModsContent">
</div>
</div>
<div id="settingsOptModsContainer">
<div class="settingsModsHeader">Optional Mods</div>
<div class="settingsModsHeader">Mods Facultatif</div>
<div id="settingsOptModsContent">
</div>

2
app/waiting.ejs
View File

@ -2,7 +2,7 @@
<div id="waitingContent">
<div class="waitingSpinner"></div>
<div id="waitingTextContainer">
<h2>Waiting for Microsoft..</h2>
<h2>Connexion à Microsoft..</h2>
</div>
</div>
</div>

2
app/welcome.ejs
View File

@ -5,7 +5,7 @@
</div>-->
<div id="welcomeContent">
<img id="welcomeImageSeal" src="assets/images/SealCircle.png"/>
<span id="welcomeHeader">WELCOME TO WESTEROSCRAFT</span>
<span id="welcomeHeader">Bievenue sur Hardium</span>
<span id="welcomeDescription">Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you aren’t afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming.</span>
<br>
<span id="welcomeDescCTA">You are just a few clicks away from Westeros.</span>

127
docs/distro.md
View File

@ -7,26 +7,15 @@ The distribution index is written in JSON. The general format of the index is as
```json
{
"version": "1.0.0",
"discord": {
"clientId": "12334567890123456789",
"smallImageText": "WesterosCraft",
"smallImageKey": "seal-circle"
},
"rss": "https://westeroscraft.com/articles/index.rss",
"servers": [
{
"id": "Example_Server",
"name": "WesterosCraft Example Client",
"description": "Example WesterosCraft server. Connect for fun!",
"icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/example_icon.png",
"id": "hardium_server",
"name": "hardium Example Client",
"description": "Example hardium server. Connect for fun!",
"version": "0.0.1",
"address": "mc.westeroscraft.com:1337",
"minecraftVersion": "1.11.2",
"discord": {
"shortId": "Example",
"largeImageText": "WesterosCraft Example Server",
"largeImageKey": "server-example"
},
"address": "45.145.167.75:25566",
"minecraftVersion": "1.18.2",
"mainServer": true,
"autoconnect": true,
"modules": [
@ -41,16 +30,6 @@ The distribution index is written in JSON. The general format of the index is as
#### Example
```JSON
{
"version": "1.0.0",
"discord": {
"clientId": "12334567890123456789",
"smallImageText": "WesterosCraft",
"smallImageKey": "seal-circle"
},
"rss": "https://westeroscraft.com/articles/index.rss",
"servers": []
}
```
### `DistroIndex.version: string/semver`
@ -79,18 +58,13 @@ A URL to a RSS feed. Used for loading news.
#### Example
```JSON
{
"id": "Example_Server",
"name": "WesterosCraft Example Client",
"description": "Example WesterosCraft server. Connect for fun!",
"id": "hardium_server",
"name": "Hardium Example Client",
"description": "Example Hardium server. Connect for fun!",
"icon": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/example_icon.png",
"version": "0.0.1",
"address": "mc.westeroscraft.com:1337",
"minecraftVersion": "1.11.2",
"discord": {
"shortId": "Example",
"largeImageText": "WesterosCraft Example Server",
"largeImageKey": "server-example"
},
"address": "45.145.167.75:25566",
"minecraftVersion": "1.18.2",
"mainServer": true,
"autoconnect": true,
"modules": []
@ -302,26 +276,14 @@ Ex.
```json
{
"id": "net.minecraftforge:forge:1.11.2-13.20.1.2429",
"name": "Minecraft Forge 1.11.2-13.20.1.2429",
"id": "net.minecraftforge:forge:1.18.2-40.2.1",
"name": "Minecraft Forge 1.18.2-40.2.1",
"type": "ForgeHosted",
"artifact": {
"size": 4450992,
"MD5": "3fcc9b0104f0261397d3cc897e55a1c5",
"url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.11.2-13.20.1.2429/forge-1.11.2-13.20.1.2429-universal.jar"
"url": "http://files.minecraftforge.net/maven/net/minecraftforge/forge/1.18.2-40.2.1/forge-1.18.2-40.2.1-universal.jar"
},
"subModules": [
{
"id": "net.minecraft:launchwrapper:1.12",
"name": "Mojang (LaunchWrapper)",
"type": "Library",
"artifact": {
"size": 32999,
"MD5": "934b2d91c7c5be4a49577c9e6b40e8da",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/launchwrapper-1.12.jar"
}
}
]
}
```
@ -337,23 +299,6 @@ The module type `LiteLoader` represents liteloader. It is handled as a library a
Ex.
```json
{
"id": "com.mumfrey:liteloader:1.11.2",
"name": "Liteloader (1.11.2)",
"type": "LiteLoader",
"required": {
"value": false,
"def": false
},
"artifact": {
"size": 1685422,
"MD5": "3a98b5ed95810bf164e71c1a53be568d",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/liteloader-1.11.2.jar"
},
"subModules": [
"All LiteMods go here"
]
}
```
---
@ -365,16 +310,6 @@ The module type `Library` represents a library file which will be required to st
Ex.
```json
{
"id": "net.sf.jopt-simple:jopt-simple:4.6",
"name": "Jopt-simple 4.6",
"type": "Library",
"artifact": {
"size": 62477,
"MD5": "13560a58a79b46b82057686543e8d727",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/jopt-simple-4.6.jar"
}
}
```
---
@ -385,16 +320,6 @@ The module type `ForgeMod` represents a mod loaded by the Forge Mod Loader (FML)
Ex.
```json
{
"id": "com.westeroscraft:westerosblocks:3.0.0-beta-6-133",
"name": "WesterosBlocks (3.0.0-beta-6-133)",
"type": "ForgeMod",
"artifact": {
"size": 16321712,
"MD5": "5a89e2ab18916c18965fc93a0766cc6e",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/WesterosBlocks.jar"
}
}
```
---
@ -405,21 +330,6 @@ The module type `LiteMod` represents a mod loaded by liteloader. These files are
Ex.
```json
{
"id": "com.mumfrey:macrokeybindmod:0.14.4-1.11.2@litemod",
"name": "Macro/Keybind Mod (0.14.4-1.11.2)",
"type": "LiteMod",
"required": {
"value": false,
"def": false
},
"artifact": {
"size": 1670811,
"MD5": "16080785577b391d426c62c8d3138558",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/macrokeybindmod.litemod"
}
}
```
---
@ -430,15 +340,4 @@ The module type `file` represents a generic file required by the client, another
Ex.
```json
{
"id": "com.westeroscraft:westeroscraftrp:2017-08-16",
"name": "WesterosCraft Resource Pack (2017-08-16)",
"type": "file",
"artifact": {
"size": 45241339,
"MD5": "ec2d9fdb14d5c2eafe5975a240202f1a",
"path": "resourcepacks/WesterosCraft.zip",
"url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/resourcepacks/WesterosCraft.zip"
}
}
```

1581
docs/sample_distribution.json
View File

File diff suppressed because it is too large Load Diff

8
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "helioslauncher",
"version": "1.9.0",
"name": "hardiumlauncher",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "helioslauncher",
"version": "1.9.0",
"name": "hardiumlauncher",
"version": "1.0.0",
"license": "UNLICENSED",
"dependencies": {
"@electron/remote": "^2.0.8",

14
package.json
View File

@ -1,13 +1,13 @@
{
"name": "helioslauncher",
"version": "1.9.0",
"productName": "Helios Launcher",
"name": "hardiumlauncher",
"version": "1.0.0",
"productName": "Hardium Launcher",
"description": "Modded Minecraft Launcher",
"author": "Daniel Scalzi (https://github.com/dscalzi/)",
"author": "MrPiano5454",
"license": "UNLICENSED",
"homepage": "https://github.com/dscalzi/HeliosLauncher",
"homepage": "https://github.com/MrPiano5454/hardiumLauncher",
"bugs": {
"url": "https://github.com/dscalzi/HeliosLauncher/issues"
"url": "https://github.com/MrPiano5454/hardiumLauncher/pulls"
},
"private": true,
"main": "index.js",
@ -49,6 +49,6 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/dscalzi/HeliosLauncher.git"
"url": "git+https://github.com/MrPiano5454/hardiumLauncher.git"
}
}