Updated for AU v2020.10.22s;

Added domain name resolution;
CrowdedMods · Nov 3, 2020 · 0335a09 · 0335a09
1 parent 75a01cc
commit 0335a09
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 41 deletions.
diff --git a/CustomServersClient/CustomServerInfo.cs b/CustomServersClient/CustomServerInfo.cs
@@ -6,15 +6,11 @@ public class CustomServerInfo
         public string ip;
         public int port;
 
-        public int hash;
-
         public CustomServerInfo(string name, string ip, int port)
         {
             this.name = name;
             this.ip = ip;
             this.port = port;
-
-            hash = name.GetHashCode() + ip.GetHashCode() + port.GetHashCode();
         }
 
         public override string ToString()

diff --git a/CustomServersClient/CustomServersClient.csproj b/CustomServersClient/CustomServersClient.csproj
@@ -36,8 +36,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
-      <HintPath>D:\andru\Desktop\Among Us\BepInEx\unhollowed\Assembly-CSharp.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Among Us\BepInEx\unhollowed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="BepInEx.Core">
       <HintPath>D:\andru\Desktop\Among Us\BepInEx\core\BepInEx.Core.dll</HintPath>

diff --git a/CustomServersClient/CustomServersPatches.cs b/CustomServersClient/CustomServersPatches.cs
@@ -7,9 +7,14 @@
 using UnhollowerBaseLib;
 using CustomServersClient.UI;
 
-using RegionMenuLambda = RegionMenu.IOCEJPCJFKF;
-using RegionInfo = KMDGIDEDGGM;
-using ServerInfo = EEKGADNPDBH;
+using RegionMenu = IPCOMKKGKCK;
+using RegionMenuLambda = IPCOMKKGKCK.EBGBGOPHHAM;
+using RegionInfo = CDLOPBGDBHF;
+using ServerInfo = GBBLLNNMEBG;
+using ServerManager = FOLCACGIEIK;
+using InnerNetClient = DNAFMCDBMCI;
+using ObjectPoolBehavior = EGLDLAINKEP;
+using PassiveButton = BFBMELJEFCH;
 
 namespace CustomServersClient
 {
@@ -22,31 +27,6 @@ public static class CustomServersPatches
         static bool _firstRun = true;
         static ServersManagementForm _managementForm;
 
-        [HarmonyDebug]
-        [HarmonyPatch(typeof(InnerNetClient), nameof(InnerNetClient.SetEndpoint), typeof(string), typeof(ushort))]
-        public static class InnerNetClientSetEndPointPatch
-        {
-            public static bool Prefix(string EMFDKKLLHCL, ushort JOBBGKDMALK, ref InnerNetClient __instance)
-            {
-                var customServer = customServers.FirstOrDefault(x => x.ToString() == EMFDKKLLHCL);
-
-                if (customServer != default)
-                {
-                    CustomServersPlugin.Logger.LogDebug($"Setting IP and port for custom server \"{customServer.name}\"!");
-                    __instance.HECFEPIMCOE = customServer.ip;
-                    __instance.DNGDMFHEJBA = customServer.port;
-                }
-                else
-                {
-                    __instance.HECFEPIMCOE = EMFDKKLLHCL;
-                    __instance.DNGDMFHEJBA = JOBBGKDMALK;
-                }
-
-                return false;
-            }
-        }
-
-        [HarmonyDebug]
         [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.OnEnable))]
         public static class RegionMenuOnEnablePatch
         {
@@ -91,7 +71,7 @@ public static bool Prefix(ref RegionMenu __instance)
 
                     for (int i = 0; i < customServers.Count; i++)
                     {
-                        Il2CppReferenceArray<ServerInfo> servers = new ServerInfo[1] { new ServerInfo(customServers[i].name, customServers[i].ToString(), (ushort)customServers[i].port) };
+                        Il2CppReferenceArray<ServerInfo> servers = new ServerInfo[1] { new ServerInfo(customServers[i].name, customServers[i].ip, (ushort)customServers[i].port) };
 
                         regions[i + 4] = new RegionInfo(customServers[i].name, "0", servers);
                     }
@@ -120,18 +100,19 @@ public static void ClearOnClickAction(ObjectPoolBehavior buttonPool)
             }
         }
 
-        [HarmonyDebug]
+
         [HarmonyPatch(typeof(RegionMenuLambda), nameof(RegionMenuLambda.Method_Internal_Void_0))]
         public static class RegionMenuChooseOptionPatch
         {
             public static bool Prefix(ref RegionMenuLambda __instance)
             {
-                if (__instance.region.NCDMJOGPKOL == "MANAGE_SERVERS")
+                if (__instance.region.LCMJAAECKPN == "MANAGE_SERVERS")
                 {
+
                     if(_managementForm == null || _managementForm.IsDisposed)
                         _managementForm = new ServersManagementForm();
 
-                    _managementForm.regionMenu = __instance.field_Public_RegionMenu_0;
+                    _managementForm.regionMenu = __instance.field_Public_IPCOMKKGKCK_0;
 
                     if (_managementForm.Visible)
                         _managementForm.Focus();
@@ -144,7 +125,6 @@ public static bool Prefix(ref RegionMenuLambda __instance)
                 {
                     return true;
                 }
-
             }
         }
     }

diff --git a/CustomServersClient/CustomServersPlugin.cs b/CustomServersClient/CustomServersPlugin.cs
@@ -19,7 +19,7 @@ public override void Load()
         {
             Logger = Log;
 
-            _harmony = Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly(), "andruzzzhka.customserversclient");
+            _harmony = Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly(), "com.andruzzzhka.customserversclient");
 
             Logger.LogDebug("Applied Harmony patches!");
         }

diff --git a/CustomServersClient/UI/EditServerForm.cs b/CustomServersClient/UI/EditServerForm.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Windows.Forms;
 
 namespace CustomServersClient.UI
@@ -27,7 +28,31 @@ private void EditServerForm_Load(object sender, EventArgs e)
 
         private void saveBtn_Click(object sender, EventArgs e)
         {
-            serverInfo = new CustomServerInfo(nameTextBox.Text, ipTextBox.Text, (ushort)portNumericUD.Value);
+            string address = ipTextBox.Text;
+
+            if (!IPAddress.TryParse(address, out _))
+            {
+                try
+                {
+                    CustomServersPlugin.Logger.LogWarning($"Resolving IP address for domain \"{address}\"...");
+
+                    var adresses = Dns.GetHostAddresses(address);
+                    if (adresses != null && adresses.Length > 0)
+                    {
+                        address = adresses[0].ToString();
+                    }
+                    else
+                    {
+                        CustomServersPlugin.Logger.LogWarning($"Failed to resolve IP adress from domain name! DNS resolution failed for address \"{address}\"");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    CustomServersPlugin.Logger.LogWarning($"Failed to resolve IP adress from domain name! Exception:\n{ex}");
+                }
+            }
+
+            serverInfo = new CustomServerInfo(nameTextBox.Text, address, (ushort)portNumericUD.Value);
             savePressed?.Invoke(serverInfo);
             Hide();
         }

diff --git a/CustomServersClient/UI/ServersManagementForm.cs b/CustomServersClient/UI/ServersManagementForm.cs
@@ -4,6 +4,8 @@
 using System.IO;
 using System.Windows.Forms;
 
+using RegionMenu = IPCOMKKGKCK;
+
 namespace CustomServersClient.UI
 {
     public partial class ServersManagementForm : Form