Merge branch 'Dev'

README.md

@@ -1,9 +1,9 @@
 # Unicorn Creations - MonoLauncher
 MonoLauncher has been created in [Electron](https://www.google.com/search?q=Electron) and is also completely open-source, so you're free to look over the code, update something and submit a pull request to the repo.
 #### Main Menu:
-![](https://i.imgur.com/Fv1t3F1.png)
-
-
+![](https://i.postimg.cc/Qx4hGdTd/image.png)
+![](https://i.postimg.cc/fLNhj36B/image.png)
+![](https://i.postimg.cc/jjhMmLD8/image.png)
 
 ## Running in development mode
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "monolauncher",
   "productName": "monolauncher",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "monoversion": "2.0.10",
   "description": "Load into Monolith Servers, or use the tools, entirely up to you!",
   "main": "src/index.js",

src/Menu.html

@@ -13,8 +13,11 @@
   <script src="https://unpkg.com/react@17/umd/react.production.min.js" crossorigin></script>
   <script src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js" crossorigin></script>
   <link rel="stylesheet" href="controlbox.css">
-  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
-  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet"
+    integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js"
+    integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
+    crossorigin="anonymous"></script>
   <script src="controlbox.ui.js"></script>
 
 </head>
@@ -29,13 +32,29 @@
     <h1>MonoLauncher's Menu</h1>
     <p>List of tools & features to better your experience!</p>
     <div class="toolscontainer">
-      <a href="dev.html"><img src="https://i.postimg.cc/NFsf3pL5/Dev-Cover.jpg" alt="Dev"></a>
-      <a href="imessage.html"><img src="https://i.postimg.cc/kGTXqKtw/i-Msg-Cover.jpg" alt="iMessage"></a>
-      <a onclick="MPDC()"><img src="https://i.postimg.cc/Y0NkCgGT/Police-Calculator.jpg" alt="MPD Police Calculator"></a>  
-      <a onclick="FTW1()"><img src="https://i.postimg.cc/wTwmFs36/rp-monoford-v1j0184.jpg" alt="..."></a>
+      <div id="devContainer">
+        <a href="dev.html"><img src="https://i.postimg.cc/ZRkktHxN/image.png" alt="Dev">
+          <div class="imageOverlayText">Dev Information</div>
+        </a>
+      </div>
+      <div id="iMessageContainer">
+        <a href="imessage.html"><img src="https://i.postimg.cc/k4G1BbMc/image.png" alt="iMessage">
+          <div class="imageOverlayText">MonoPhone - Messages</div>
+        </a>
+      </div>
+      <div id="policeContainer">
+        <a onclick="MPDC()"><img src="https://i.postimg.cc/1zw6MRCQ/image.png" alt="MPD Police Calculator">
+          <div class="imageOverlayText">Police Calculator</div>
+        </a>
+      </div>
+      <div id="craftContainer">
+        <a onclick="FTW1()"><img src="https://i.postimg.cc/RF8BF9mW/20211218135305-1.jpg" alt="...">
+          <div class="imageOverlayText">Crafting Calculator</div>
+        </a>
+      </div>
     </div>
   </div>
-   
+
   <script src="header.ui.js"></script>
 </body>
 

src/Menu.js

@@ -8,8 +8,8 @@ function MPDC() {
 
 function FTW1() {
 	window.open(
-		'https://clutchmasterftw.github.io/Monolith-Crafting-Calculator',
-		'Crafting Calculator interactive website - Clutch Master FTW',
+		'https://monoguns.wombos.xyz',
+		'MonoGuns Revamped',
 		'top=0,left=0,frame=true,nodeIntegration=false,contextIsolation=true,resizable=true,width=1700,height=1400'
 	);
 }

src/MenuB.css

@@ -12,20 +12,40 @@
   }
 
   .toolscontainer {
-    min-height: 260px;
-    max-height: 515px;
-    overflow-y: auto;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
   }
 
-  .toolscontainer > a > img {
+  .toolscontainer>div>a>img {
+    display: block;
     width: 400px;
-    transition-duration: 250ms;
     cursor: pointer;
     margin: 1rem;
     border-radius: .25rem;
+  }
+
+  .toolscontainer>div {
+    transition-duration: 250ms;
+    position: relative;
     filter: brightness(80%);
   }
 
-  .toolscontainer > a > img:hover {
+  .toolscontainer>div:hover {
+    position: relative;
     filter: brightness(100%);
+  }
+
+  .imageOverlayText {
+    color: rgb(201, 201, 201);
+    font-size: 22px;
+    line-height: 1.5em;
+    text-shadow: 2px 2px 2px #000;
+    text-align: left;
+    position: absolute;
+    top: 85%;
+    left: 56%;
+    transform: translate(-50%, -50%);
+    width: 100%;
+    z-index: 5;
   }

src/index.js

@@ -500,20 +500,40 @@ async function setActivity() {
 			largeImageKey: 'monolith',
 			largeImageText: 'Monolith Servers',
 			smallImageKey: 'discord',
-			smallImageText: 'discord.gg/uj6NRBS'
+			smallImageText: 'discord.gg/monolithservers',
+			buttons: [
+				{
+					label: 'Download MonoLauncher',
+					url: 'https://hazel-jacubrstnc.vercel.app/download'
+				},
+				{
+					label: 'Join the Monolith Discord',
+					url: 'https://discord.gg/monolithservers'
+				}
+			]
 		});
-	}else {
+	} else {
 		rpc.setActivity({
 			details: 'Adding new features',
 			state: 'Improving MonoLauncher',
 			startTimestamp,
 			largeImageKey: 'monolith',
 			largeImageText: 'Monolith Servers',
 			smallImageKey: 'discord',
-			smallImageText: 'discord.gg/uj6NRBS'
+			smallImageText: 'discord.gg/monolithservers',
+			buttons: [
+				{
+					label: 'Download MonoLauncher',
+					url: 'https://hazel-jacubrstnc.vercel.app/download'
+				},
+				{
+					label: 'Join the Monolith Discord',
+					url: 'https://discord.gg/monolithservers'
+				}
+			]
 		});
 	}
-	
+
 }
 
 const createWindow = async () => {

src/launcher.html

@@ -43,7 +43,7 @@
 
 <footer>
   <a href="version.html">
-    <p id="info">Version 1.3.2
+    <p id="info">Version 1.3.3
   </a> <a href="update.html"><span id="updatedisplay" class="badge bg-secondary"></span></a>- Game
   Version 2.0.10 - <a href="contributions.html">View Contributors</a></p>
 

src/version.json

@@ -1,13 +1,14 @@
 {
   "name": "MonoLauncher",
-  "version": "v1.3.2",
+  "version": "v1.3.3",
   "versionAuthors": [
     "Jetty#9451",
     "Jacub#0520",
     "squid#5091"
   ],
   "changeLogs": [
-    "Fixed issues for users that had Garry's Mod installed on a different drive than Steam.",
-    "Properly display error messages for file existence check."
+    "Add buttons to discord rpc activity.",
+    "Replaced old Crafting Calculator with MonoGuns Revamped.",
+    "Replaced old images in Menu page."
   ]
 }