Merge pull request #29 from MoltenMods/2021

Tidied code, fixed bugs, and added IP and port under custom region names in regions menu

.idea/.idea.Unify/.idea/indexLayout.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

README.md

@@ -1,9 +1,3 @@
-> **⚠ WARNING**
-> 
-> To play on a custom server on 2021.3.31.3s, you must compile the
-> *airship* branch of Impostor located here:
-> https://github.com/Impostor/Impostor/tree/airship.
-
 # Unify
 
 An Among Us mod to add extra regions to the regions menu.
@@ -27,6 +21,9 @@ Regions can be connected to directly using an IP address.
 Custom regions can be added as detailed below in the
 [configuration](#configuration) section.
 
+Other mods can add regions via the
+`AddRegion(string name, string ip, ushort port)` method.
+
 ## Installation
 
 > **⚠ WARNING**
@@ -39,7 +36,8 @@ Custom regions can be added as detailed below in the
 > If you are still using 2021.3.5s and Reactor fails to load, try using the Reactor version located
 > here: https://github.com/NuclearPowered/Reactor/actions/runs/636023321.
 
-1. Ensure that BepInEx and Reactor are installed ([installation guide](INSTALLATION.md)).
+1. Ensure that BepInEx and Reactor (Reactor is not required for pre releases) are installed
+   ([installation guide](INSTALLATION.md)).
 2. Download the latest mod on the [releases](https://github.com/DaemonBeast/Unify/releases) page
    for the version of Among Us you are using.
 3. Move the mod to the `(Among Us game files)/BepInEx/plugins` folder.
@@ -60,7 +58,7 @@ The configuration file is located at
 ### Custom regions
 
 Custom regions can be added by modifying the `[Region 1]`,
-`[Region 2]` ... `[Region 10]` sections of the configuration file.
+`[Region 2]` ... `[Region 9]` sections of the configuration file.
 You can modify the display name of the region,
 the IP address of the region and the port of the region.
 

Unify/Patches/Regions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using BepInEx.Configuration;
 using HarmonyLib;
+using Reactor.Extensions;
 using UnityEngine;
 using UnityEngine.UI;
 using Object = UnityEngine.Object;
@@ -12,7 +13,7 @@ namespace Unify.Patches
     public static class RegionsPatch
     {
         private static IRegionInfo[] _oldRegions { get; } = ServerManager.DefaultRegions;
-        
+
         private static IRegionInfo[] _newRegions { get; } = new IRegionInfo[]
         {
             new DnsRegionInfo("192.241.154.115", "skeld.net", StringNames.NoTranslation, "192.241.154.115", 22023)
@@ -27,27 +28,27 @@ namespace Unify.Patches
 
         public static IRegionInfo DirectRegion { get; set; }
 
-        private static TextBox directConnect { get; set; }
+        private static TextBoxTMP DirectConnect { get; set; }
 
         public static void Patch()
         {
             ServerManager serverManager = ServerManager.Instance;
-            
-            IRegionInfo[] customRegions = UnifyPlugin.MergeRegions(_newRegions, ModRegions.ToArray());
-            customRegions = UnifyPlugin.MergeRegions(customRegions, LoadCustomUserRegions());
-            if (DirectRegion != null) customRegions = customRegions.AddToArray(DirectRegion);
-            IRegionInfo[] patchedRegions = UnifyPlugin.MergeRegions(_oldRegions, customRegions);
+
+            IRegionInfo[] patchedRegions = _oldRegions
+                .AddRangeToArray(_newRegions)
+                .AddRangeToArray(ModRegions.ToArray())
+                .AddRangeToArray(LoadCustomUserRegions());
+            if (DirectRegion != null) patchedRegions = patchedRegions.AddToArray(DirectRegion);
 
             ServerManager.DefaultRegions = patchedRegions;
             serverManager.AvailableRegions = patchedRegions;
-            serverManager.SaveServers();
         }
 
         private static IRegionInfo[] LoadCustomUserRegions()
         {
             List<IRegionInfo> customRegions = new List<IRegionInfo>();
-            
-            for (int x = 0; x < 10; x++)
+
+            for (int x = 0; x < 9; x++)
             {
                 ConfigEntry<string> regionName = UnifyPlugin.ConfigFile.Bind(
                     $"Region {x + 1}", $"Name", "custom region");
@@ -59,75 +60,43 @@ namespace Unify.Patches
                 if (String.IsNullOrWhiteSpace(regionIp.Value)) continue;
 
                 IRegionInfo regionInfo = new DnsRegionInfo(
-                    regionIp.Value, regionName.Value, StringNames.NoTranslation, regionIp.Value, regionPort.Value)
+                        regionIp.Value, $"{regionName.Value}\n{regionIp.Value}   {regionPort.Value}",
+                        StringNames.NoTranslation, regionIp.Value, regionPort.Value)
                     .Cast<IRegionInfo>();
-                
+
                 customRegions.Add(regionInfo);
             }
 
             return customRegions.ToArray();
         }
-        
+
         private static void UpdateRegion()
         {
-            RegionMenu regionMenu = GameObject.Find("RegionMenu").GetComponent<RegionMenu>();
-            
-            bool success = UnifyPlugin.SetDirectRegion(directConnect.text, out IRegionInfo newRegion);
+            RegionMenu regionMenu = DestroyableSingleton<RegionMenu>.Instance;
+
+            bool success = UnifyPlugin.SetDirectRegion(DirectConnect.text, out IRegionInfo newRegion);
 
             if (!success)
             {
-                directConnect.StartCoroutine(Effects.FIJHCJMBGFP(directConnect.transform, 0.75f, 0.25f));
+                DirectConnect.StartCoroutine(Effects.SwayX(DirectConnect.transform, 0.75f, 0.25f));
                 return;
             }
-            
+
             regionMenu.ChooseOption(newRegion);
             regionMenu.Close();
         }
-        
-        [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.Open))]
-        public static class DirectConnectButtonPatch
+
+        [HarmonyPatch(typeof(ServerManager), nameof(ServerManager.LoadServers))]
+        public static class LoadNewRegionsPatch
         {
             public static void Postfix()
             {
-                JoinGameButton joinGameButton = DestroyableSingleton<JoinGameButton>.Instance;
-                RegionMenu regionMenu = DestroyableSingleton<RegionMenu>.Instance;
-
-                directConnect = Object.Instantiate(joinGameButton.GameIdText, regionMenu.transform);
-                directConnect.gameObject.SetActive(false);
-                directConnect.IpMode = true;
-                directConnect.characterLimit = 15;
-                directConnect.ClearOnFocus = false;
-
-                directConnect.OnEnter = new Button.ButtonClickedEvent();
-                directConnect.OnEnter.AddListener((Action) UpdateRegion);
-
-                int offset = ((ServerManager.DefaultRegions.Length + 1) / 2) + 1;
-                directConnect.transform.localPosition = new Vector3(0, 2f - (offset / 2f), -100f);
-            }
-        }
-
-        [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.Open))]
-        public static class RegionMenuLayoutPatch
-        {
-            public static void Postfix(RegionMenu __instance)
-            {
-                directConnect.gameObject.SetActive(true);
-                
-                var regionButtons = __instance.ButtonPool.activeChildren.ToArray();
-                int half = (regionButtons.Length + 1) / 2;
-                
-                for (int x = 0; x < regionButtons.Length; x++)
-                {
-                    ServerListButton regionButton = regionButtons[x].Cast<ServerListButton>();
-
-                    regionButton.transform.localPosition = new Vector3(1.25f * ((x < half)? -1: 1), 2f - 0.5f * (x - ((x < half)? 0 : half)), 0f);
-                }
+                Patch();
             }
         }
 
         [HarmonyPatch(typeof(JoinGameButton), nameof(JoinGameButton.OnClick))]
-        public static class DirectConnectEnterButtonPatch
-        {
+        public static class DirectConnectEnterButtonPatch {
             public static bool Prefix(JoinGameButton __instance)
             {
                 GameObject regionMenuGameObject = GameObject.Find("RegionMenu");
@@ -139,21 +108,47 @@ namespace Unify.Patches
             }
         }
 
-        [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.Close))]
-        public static class HideDirectConnectPatch
+        [HarmonyPatch(typeof(RegionMenu))]
+        public static class RegionMenuPatches
         {
-            public static void Postfix()
+            [HarmonyPatch(nameof(RegionMenu.Open))]
+            [HarmonyPostfix]
+            public static void DirectConnectButtonPatch(RegionMenu __instance)
             {
-                directConnect.gameObject.SetActive(false);
-            }
-        }
+                if (DirectConnect) DirectConnect.gameObject.Destroy();
 
-        [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.ChooseOption))]
-        public static class HideDirectConnectOnSelectPatch
-        {
-            public static void Postfix()
+                JoinGameButton joinGameButton = DestroyableSingleton<JoinGameButton>.Instance;
+
+                DirectConnect = Object.Instantiate(joinGameButton.GameIdText, __instance.transform);
+                DirectConnect.IpMode = true;
+                DirectConnect.characterLimit = 15;
+                DirectConnect.ClearOnFocus = false;
+
+                DirectConnect.OnEnter = new Button.ButtonClickedEvent();
+                DirectConnect.OnEnter.AddListener((Action) UpdateRegion);
+
+                int offset = _newRegions.Length + ModRegions.Count;
+                DirectConnect.transform.localPosition = new Vector3(0, 1f - (offset / 2f), -100f);
+            }
+
+            [HarmonyPatch(nameof(RegionMenu.Open))]
+            [HarmonyPostfix]
+            public static void RegionMenuLayoutPatch(RegionMenu __instance)
             {
-                directConnect.gameObject.SetActive(false);
+                var regionButtons = __instance.ButtonPool.activeChildren.ToArray();
+
+                for (int i = 0; i < regionButtons.Length; i++)
+                {
+                    ServerListButton regionButton = regionButtons[i].Cast<ServerListButton>();
+
+                    bool isCustomRegion = i >= _oldRegions.Length;
+                    bool isCustomUserRegion = i >= _oldRegions.Length + _newRegions.Length + ModRegions.Count;
+                    float x = (isCustomRegion ? 3f : 0) + (isCustomUserRegion ? 3f : 0) - 4.25f;
+                    float y = i - (isCustomRegion ? _oldRegions.Length : 0) -
+                              (isCustomUserRegion ? _newRegions.Length + ModRegions.Count : 0);
+                    
+                    regionButton.transform.localPosition = new Vector3(1.25f + x, 2f - 0.5f * y, 0f);
+                }
             }
         }
     }

Unify/Unify.cs

@@ -6,6 +6,7 @@ using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.IL2CPP;
 using HarmonyLib;
+using Hazel.Udp;
 using Reactor;
 using Unify.Patches;
 
@@ -19,15 +20,10 @@ namespace Unify
     {
         public const string Id = "daemon.unify";
         private const string Name = "Unify";
-        private const string Version = "3.0.0";
+        private const string Version = "4.1.0";
 
         public static ConfigFile ConfigFile { get; private set; }
 
-        // public static readonly bool HandshakeDisabled = !PluginSingleton<ReactorPlugin>.Instance.ModdedHandshake.Value;
-        
-        /*public static readonly string[] NormalHandshake =
-            new string[] {"North America", "Europe", "Asia", "skeld.net"};*/
-
         public Harmony Harmony { get; } = new Harmony(Id);
 
         public override void Load()
@@ -44,24 +40,15 @@ namespace Unify
 
             ConfigFile = new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true);
             // =====================================
-            
-            RegionsPatch.Patch();
-            
-            Harmony.UnpatchAll(ReactorPlugin.Id);
+
+            // Unpatches the modded handshake, because Impostor is STILL not fully updated yet
+            Harmony.Unpatch(typeof(UdpConnection).GetMethod("HandleSend"), HarmonyPatchType.Prefix, 
+                ReactorPlugin.Id);
 
             Harmony.PatchAll();
         }
 
-        public static IRegionInfo[] MergeRegions(IRegionInfo[] oldRegions, IRegionInfo[] newRegions)
-        {
-            IRegionInfo[] patchedRegions = new IRegionInfo[oldRegions.Length + newRegions.Length];
-            Array.Copy(oldRegions, patchedRegions, oldRegions.Length);
-            Array.Copy(newRegions, 0, patchedRegions, oldRegions.Length, newRegions.Length);
-
-            return patchedRegions;
-        }
-
-        public static IRegionInfo AddRegion(string name, string ip)
+        public static IRegionInfo AddRegion(string name, string ip, ushort port)
         {
             if (Uri.CheckHostName(ip) != UriHostNameType.IPv4) return ServerManager.Instance.CurrentRegion;
 
@@ -69,7 +56,7 @@ namespace Unify
                 ServerManager.DefaultRegions.ToArray().FirstOrDefault(region => region.PingServer == ip);
             if (existingRegion != null) return existingRegion;
             
-            IRegionInfo newRegion = new DnsRegionInfo(ip, name, StringNames.NoTranslation, ip, 22023)
+            IRegionInfo newRegion = new DnsRegionInfo(ip, $"{name}\n{ip}   {port}", StringNames.NoTranslation, ip, port)
                 .Cast<IRegionInfo>();
             
             RegionsPatch.ModRegions.Add(newRegion);

Unify/Unify.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>3.0.0</Version>
-        <Mappings>NuclearPowered/Mappings:0.3.0</Mappings>
+        <Version>4.1.0</Version>
+        <Mappings>NuclearPowered/Mappings:0.4.0</Mappings>
 
         <Description>Region mod</Description>
         <Authors>Daemon</Authors>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GamePlatform)' == 'Steam'">
-        <GameVersion>2021.3.31.3s</GameVersion>
+        <GameVersion>2021.4.12s</GameVersion>
         <DefineConstants>$(DefineConstants);STEAM</DefineConstants>
     </PropertyGroup>
   
     <PropertyGroup Condition="'$(GamePlatform)' == 'Itch'">
-        <GameVersion>2021.3.31.3i</GameVersion>
+        <GameVersion>2021.4.12i</GameVersion>
         <DefineConstants>$(DefineConstants);ITCH</DefineConstants>
     </PropertyGroup>
   
@@ -32,5 +32,7 @@
     <Target Name="Copy" AfterTargets="Reobfuscate">
         <Copy SourceFiles="$(OutputPath)reobfuscated/$(AssemblyName)-$(GameVersion).dll" DestinationFolder="$(AmongUs)/BepInEx/plugins/" />
         <Copy SourceFiles="$(OutputPath)reobfuscated/$(AssemblyName)-$(GameVersion).dll" DestinationFolder="../build/" />
+
+        <Copy SourceFiles="$(OutputPath)reobfuscated/$(AssemblyName)-$(GameVersion).dll" DestinationFolder="$(NewAmongUs)/" />
     </Target>
 </Project>