Creating initial release

2023-05-01 14:03:47 +02:00 · 2023-05-01 14:03:47 +02:00 · 97af60a8d6
commit 97af60a8d6
parent bc892107d8
17 changed files with 1872 additions and 1016 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -4,12 +4,24 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
-    <list default="true" id="c7fc7215-5a14-4d6e-8a38-d34bcd9137f5" name="Changes" comment="Update logo and loading screen">
-      <change afterPath="$PROJECT_DIR$/app/assets/lang/fr_FR.json" afterDir="false" />
+    <list default="true" id="c7fc7215-5a14-4d6e-8a38-d34bcd9137f5" name="Changes" comment="Creating initial release">
+      <change afterPath="$PROJECT_DIR$/app/assets/images/backgrounds/8.png" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/app.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/assets/css/launcher.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/css/launcher.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/assets/js/ipcconstants.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/js/ipcconstants.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/assets/js/preloader.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/js/preloader.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/assets/js/scripts/uibinder.js" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/js/scripts/uibinder.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/assets/lang/fr_FR.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/assets/lang/fr_FR.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/frame.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/frame.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/landing.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/landing.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/welcome.ejs" beforeDir="false" afterPath="$PROJECT_DIR$/app/welcome.ejs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/icon.png" beforeDir="false" afterPath="$PROJECT_DIR$/build/icon.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/logo.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dev-app-update.yml" beforeDir="false" afterPath="$PROJECT_DIR$/dev-app-update.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/electron-builder.yml" beforeDir="false" afterPath="$PROJECT_DIR$/electron-builder.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -82,6 +94,9 @@
      <workItem from="1682599215708" duration="3000" />
      <workItem from="1682599222418" duration="3037000" />
      <workItem from="1682604704565" duration="2270000" />
+      <workItem from="1682875221338" duration="1149000" />
+      <workItem from="1682876444732" duration="2197000" />
+      <workItem from="1682941218897" duration="1377000" />
    </task>
    <task id="LOCAL-00001" summary="Editing ico">
      <created>1682604080148</created>
@ -107,6 +122,7 @@
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
    <MESSAGE value="Editing ico" />
    <MESSAGE value="Update logo and loading screen" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update logo and loading screen" />
+    <MESSAGE value="Creating initial release" />
+    <option name="LAST_COMMIT_MESSAGE" value="Creating initial release" />
  </component>
 </project>
--- a/app/app.ejs
+++ b/app/app.ejs
@ -1,4 +1,4 @@
-<html lang="fr" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <meta charset="utf-8" http-equiv="Content-Security-Policy" content="script-src 'self' 'sha256-In6B8teKZQll5heMl9bS7CESTbGvuAt3VVV86BUQBDk='"/>
    <title>BTCV Launcher</title>
--- a/app/assets/css/launcher.css
+++ b/app/assets/css/launcher.css
@ -273,8 +273,6 @@ body, button {
 */

 #welcomeImageSeal {
-    border-radius: 50%;
-    border: 2px solid #cad7e1;
    background: rgba(1, 2, 1, 0.5);
    height: 125px;
    width: 125px;
--- a/app/assets/images/backgrounds/8.png
+++ b/app/assets/images/backgrounds/8.png
--- a/app/assets/js/ipcconstants.js
+++ b/app/assets/js/ipcconstants.js
@ -1,7 +1,7 @@
 // NOTE FOR THIRD-PARTY
 // REPLACE THIS CLIENT ID WITH YOUR APPLICATION ID.
 // SEE https://github.com/dscalzi/HeliosLauncher/blob/master/docs/MicrosoftAuth.md
-exports.AZURE_CLIENT_ID = '1ce6e35a-126f-48fd-97fb-54d143ac6d45'
+exports.AZURE_CLIENT_ID = '3be871f9-c765-4f76-9df2-7e66a55d014a'
 // SEE NOTE ABOVE.


--- a/app/assets/js/preloader.js
+++ b/app/assets/js/preloader.js
@ -23,7 +23,7 @@ DistroAPI['commonDir'] = ConfigManager.getCommonDirectory()
 DistroAPI['instanceDir'] = ConfigManager.getInstanceDirectory()

 // Load Strings
-LangLoader.loadLanguage('fr_FR')
+LangLoader.loadLanguage('en_US')

 /**
 * 
--- a/app/assets/js/scripts/uibinder.js
+++ b/app/assets/js/scripts/uibinder.js
@ -70,7 +70,7 @@ async function showMainUI(data){
    refreshServerStatus()
    setTimeout(() => {
        document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
-        document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')`
+        document.body.style.backgroundImage = `url('assets/images/backgrounds/8.png')`
        $('#main').show()

        const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0
--- a/app/assets/lang/fr_FR.json
+++ b/app/assets/lang/fr_FR.json
@ -1,49 +0,0 @@
-{
-  "html": {
-    "avatarOverlay": "Modifier"
-  },
-  "js": {
-    "login": {
-      "error": {
-        "invalidValue": "* Valeur invalide",
-        "requiredValue": "* Champ obligatoire",
-        "userMigrated": {
-          "title": "Erreur lors de la connexion :<br>Identifiants invalides",
-          "desc": "Vous avez tenté de vous connecter avec un compte migré. Veuillez réessayer en utilisant l'adresse e-mail du compte comme nom d'utilisateur."
-        },
-        "invalidCredentials": {
-          "title": "Erreur lors de la connexion :<br>Identifiants invalides",
-          "desc": "L'adresse e-mail ou le mot de passe que vous avez entré est incorrect. Veuillez réessayer."
-        },
-        "rateLimit": {
-          "title": "Erreur lors de la connexion :<br>Trop de tentatives",
-          "desc": "Il y a eu trop de tentatives de connexion avec ce compte récemment. Veuillez réessayer plus tard."
-        },
-        "noInternet": {
-          "title": "Erreur lors de la connexion :<br>Pas de connexion Internet",
-          "desc": "Vous devez être connecté à Internet pour vous connecter. Veuillez vous connecter et réessayer."
-        },
-        "authDown": {
-          "title": "Erreur lors de la connexion :<br>Serveur d'authentification hors ligne",
-          "desc": "Le serveur d'authentification de Mojang est actuellement hors ligne ou inaccessible. Veuillez patienter un peu et réessayer. Vous pouvez vérifier l'état du serveur sur <a href="https://help.mojang.com/\">le portail d'aide de Mojang</a>."
-        },
-        "notPaid": {
-          "title": "Erreur lors de la connexion :<br>Jeu non acheté",
-          "desc": "Le compte que vous essayez de vous connecter n'a pas acheté une copie de Minecraft. Vous pouvez acheter une copie sur <a href="https://minecraft.net/\">Minecraft.net</a>."
-        },
-        "unknown": {
-          "title": "Erreur lors de la connexion :<br>Erreur inconnue"
-        }
-      },
-      "login": "CONNEXION",
-      "loggingIn": "CONNEXION EN COURS",
-      "success": "SUCCÈS",
-      "tryAgain": "Réessayer"
-    },
-    "landing": {
-      "launch": {
-        "pleaseWait": "Veuillez patienter.."
-      }
-    }
-  }
-}
--- a/app/frame.ejs
+++ b/app/frame.ejs
@ -13,7 +13,7 @@
        <% } else{ %>  
            <div id="frameContentWin">
                <div id="frameTitleDock">
-                    <span id="frameTitleText">BTCV Launcher</span>
+                    <span id="frameTitleText"></span>
                </div>
                <div id="frameButtonDockWin">
                    <button class="frameButton fMb" id="frameButton_minimize" tabIndex="-1">
--- a/app/landing.ejs
+++ b/app/landing.ejs
@ -2,7 +2,7 @@
    <div id="upper">
        <div id="left">
            <div id="image_seal_container">
-                <img id="image_seal" src="assets/images/SealCircle.png"/>
+<!--                <img id="image_seal" src="assets/images/SealCircle.png"/>-->
                <div id="updateAvailableTooltip">Update Available</div>
            </div>
        </div>
--- a/app/welcome.ejs
+++ b/app/welcome.ejs
@ -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">La </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>
--- a/build/icon.png
+++ b/build/icon.png
--- a/build/logo.png
+++ b/build/logo.png
--- a/dev-app-update.yml
+++ b/dev-app-update.yml
@ -1,3 +1,4 @@
-owner: dscalzi
-repo: HeliosLauncher
+owner: tomarok
+repo: BTCV-Launcher
 provider: github
+token: ${{ secrets.GITHUB_TOKEN }}
--- a/electron-builder.yml
+++ b/electron-builder.yml
@ -1,8 +1,8 @@
-appId: 'helioslauncher'
-productName: 'Helios Launcher'
+appId: 'btcv-launcher'
+productName: 'BTCV-Launcher'
 artifactName: '${productName}-setup-${version}.${ext}'

-copyright: 'Copyright © 2018-2022 Daniel Scalzi'
+copyright: 'Copyright © 2023 - Tomarok'

 asar: true
 compression: 'maximum'
@ -39,8 +39,8 @@ mac:
 # Linux Configuration
 linux: 
  target: 'AppImage'
-  maintainer: 'Daniel Scalzi'
-  vendor: 'Daniel Scalzi'
+  maintainer: 'Thomas Roque'
+  vendor: 'Thomas Roque'
  synopsis: 'Modded Minecraft Launcher'
  description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.'
  category: 'Game'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,13 +1,13 @@
 {
-  "name": "helioslauncher",
-  "version": "2.0.4",
-  "productName": "Helios Launcher",
-  "description": "Modded Minecraft Launcher",
-  "author": "Daniel Scalzi (https://github.com/dscalzi/)",
+  "name": "btcv-launcher",
+  "version": "1.0.0",
+  "productName": "BTCV Launcher",
+  "description": "Modded Minecraft Launcher for La Batcave",
+  "author": "Tomarok",
  "license": "UNLICENSED",
-  "homepage": "https://github.com/dscalzi/HeliosLauncher",
+  "homepage": "https://github.com/Tomarok/BTCV-Launcher",
  "bugs": {
-    "url": "https://github.com/dscalzi/HeliosLauncher/issues"
+    "url": "https://github.com/Tomarok/BTCV-Launcher/issues"
  },
  "private": true,
  "main": "index.js",
@ -44,6 +44,6 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/dscalzi/HeliosLauncher.git"
+    "url": "git+https://github.com/Tomarok/BTCV-Launcher.git"
  }
 }