fixed and adjustments

Author: hackthedev

ModLoader/JSBridge.cs

@@ -161,14 +161,13 @@ public string GenerateGid(string publicKey)
         {
             if (!Form1.HandleArgs(publicKey)) return "";
 
-            string encoded = Form1.cryptoHelper.EncodeToBase64(publicKey);
-            if (encoded.Length >= 20)
+            if (publicKey.Length >= 120)
             {
-                return encoded.Substring(0, 20);
+                return Form1.cryptoHelper.EncodeToBase64(publicKey.Substring(80, 40));
             }
             else
             {
-                return encoded.Substring(0, encoded.Length);
+                return Form1.cryptoHelper.EncodeToBase64(publicKey.Substring(0, publicKey.Length));
             }
         }
 
@@ -180,6 +179,11 @@ public void NavigateToUrl(string url)
             //Form1.webView.CoreWebView2.AddHostObjectToScript("dcts", Form1.bridge);
         }
 
+        public void NavigateHome()
+        {
+            Form1.formhelper.NavigateHome();
+        }
+
         private async Task WaitUntilDone()
         {
             installDoneTcs = new TaskCompletionSource<bool>();
@@ -207,6 +211,12 @@ public string GetServers()
             return JsonSerializer.Serialize(Form1.storage.GetServers());
         }
 
+        public string GetServer(string address)
+        {
+            if (!Form1.HandleArgs(address)) return "";
+            return JsonSerializer.Serialize(Form1.storage.GetServer(address));
+        }
+
         public void DeleteServer(string address)
         {
             if (!Form1.HandleArgs(address)) return;

ModLoader/StorageHelper.cs

@@ -26,6 +26,17 @@ public class AppSettings
             public string UriScheme { get; set; } = "dcts";
             public string SkippedVersion { get; set; } = "";
         }
+        public class ServerInfo
+        {
+            public string Address { get; set; }
+            public string JsonData { get; set; }
+            public bool IsFavourite { get; set; }
+        }
+
+
+
+
+
 
         public static AppSettings Current { get; private set; } = new AppSettings();
 
@@ -94,13 +105,6 @@ public static void SetSetting(string settingName, string value)
             }
         }
 
-        public class ServerInfo
-        {
-            public string Address { get; set; }
-            public string JsonData { get; set; }
-            public bool IsFavourite { get; set; }
-        }
-
 
         public Dictionary<string, ServerInfo> GetServers()
         {
@@ -157,6 +161,15 @@ public bool SaveServer(string address, string jsonData, bool isFav = false)
             }
         }
 
+        public ServerInfo GetServer(string address)
+        {
+            Dictionary<string, ServerInfo> SavedServers = GetServers();
+            if (SavedServers.ContainsKey(address)){
+                return SavedServers[address];
+            }
+            return null;
+        }
+
         public void DeleteServer(string address)
         {
             Dictionary<string, ServerInfo> SavedServers = GetServers();

ModLoader/web/script.js

@@ -77,7 +77,6 @@ async function getSavedServers(container){
 
     let serverData = await Client().GetServers();
     let servers = JSON.parse(serverData)
-
     renderServersList(servers)
 }
 
@@ -90,6 +89,7 @@ async function renderServersList(servers) {
     for(let server in servers){
         let serverObj = servers[server];
         let address = serverObj.Address;
+        console.log(serverObj.JsonData)
         let serverData = JSON.parse(serverObj.JsonData);
 
         if (!serverData || serverData.length <= 0) {
@@ -123,7 +123,7 @@ async function renderServersList(servers) {
       </div>
 
       <div class="footer">
-        ${encodePlainText(serverData.serverinfo.slots.online)} / ${encodePlainText(serverData.serverinfo.slots.limit)} Online • ${encodePlainText(serverData.serverinfo.slots.reserved)} reserved
+        ${serverData.serverinfo.slots.online ? encodePlainText(serverData.serverinfo.slots.online) : "0"} / ${encodePlainText(serverData.serverinfo.slots.limit)} Online • ${encodePlainText(serverData.serverinfo.slots.reserved)} reserved
         <a class="joinButton" href="http://${address}">Join</a>
       </div>
     `;

ModLoader/web/style.css

@@ -5,7 +5,7 @@
     /* cyan: #012724;*/
     /* purple: #1d1635;*/
     --main: #131415;
-    --card-radius: 20px;
+    --card-radius: 10px;
     --accent: #131415;
 }
 
@@ -85,7 +85,7 @@ table td, table th {
 .server-card {
     background: linear-gradient(130deg, hsl(from var(--accent) h s calc(l * 3)), hsl(from var(--accent) h s calc(l * 3.5)));
     color: hsl(from var(--accent) h s calc(l * 10));
-    width: 350px;
+    width: 250px;
     height: fit-content;
     float: left;
 
@@ -147,9 +147,19 @@ table td, table th {
     font-size: 14px;
     text-align: left;
 
-    max-height: 200px !important;
-    text-overflow: ellipsis;
     overflow: hidden;
+    max-height: 50px;
+    transition: all 500ms;
+    user-select: none;
+}
+
+.server-card .about:hover{
+    max-height: 200px;
+    overflow: auto;
+}
+
+.server-card .about p{
+    margin-top: 0;
 }
 
 .server-card .about a, table a {
@@ -166,7 +176,6 @@ table td, table th {
     justify-content: center;
     gap: 6px;
 
-
     border-top: 1px solid hsl(from var(--accent) h s calc(l * 1));
     border-bottom: 1px solid hsl(from var(--accent) h s calc(l * 1));
 }
@@ -190,6 +199,7 @@ table td, table th {
     font-weight: bold;
 
     cursor: pointer;
+    user-select: none;
 }
 
 .footer {
@@ -213,6 +223,7 @@ table td, table th {
 
     display: flex;
     margin-left: auto;
+    user-select: none;
 }