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 />

INSTALLATION.md

@@ -3,6 +3,7 @@
 # Table of Contents
 - [Locating the Among Us game files directory](#locating-the-among-us-game-files-directory)
 - [Installing BepInEx](#installing-bepinex)
+- [Installing Reactor](#installing-reactor)
 
 ## Locating the Among Us game files directory
 
@@ -34,9 +35,9 @@ library then selecting `Manage > Browse local files`.
 └── winhttp.dll
 ```
 
-3. Launch the game so that BepInEx can generate the necessary files
-   (this may take a while), then close the game after. The Among Us game
-   files should now look something like this:
+3. Launch the game so that BepInEx can generate the necessary files, 
+   then close the game after. The Among Us game files should now look 
+   something like this:
    
 ```
 .
@@ -60,3 +61,17 @@ library then selecting `Manage > Browse local files`.
 ├── UnityPlayer.dll
 └── winhttp.dll
 ```
+   
+## Installing Reactor
+
+1. Go to the
+   [Reactor CI](https://github.com/NuclearPowered/Reactor/actions)
+   page.
+2. Click on the top workflow run.
+3. Download the `Reactor.dll` artifact.
+4. Move the `Reactor.dll` file to the
+   `(Among Us game files)/BepInEx/plugins` folder.
+5. Launch the game. The top left of the game menu should look
+   something like this:
+   
+![Mod text](images/ModText.jpg)

README.md

@@ -1,11 +1,8 @@
-> The 2021.3.5s release of this mod requires you to compile an in-development version of Impostor
-> [here](https://github.com/Impostor/Impostor/tree/2021.3.5) if you want to host a local server.
-
 # Unify
 
 An Among Us mod to add extra regions to the regions menu.
 
-![Regions menu](images/RegionsMenu.jpg)
+![Regions menu](images/RegionsMenu.png)
 
 # Table of Contents
 - [Features](#features)
@@ -17,6 +14,15 @@ An Among Us mod to add extra regions to the regions menu.
 The following regions have been added:
 - [skeld.net](https://skeld.net/)
 - localhost *(for playing on a server running on your computer)*
+- matux.fr
+
+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
 
@@ -24,10 +30,16 @@ The following regions have been added:
 >
 > This mod only has compiled releases for the steam release of the game.
 
-> This mod requires you to have BepInEx installed. You can install BepInEx by following [this guide](INSTALLATION.md).
+> If you are still using 2020.12.9s and Reactor fails to load, try using the Reactor version located
+> here: https://github.com/NuclearPowered/Reactor/actions/runs/593649307.
 
-1. Ensure that BepInEx is installed (more information above).
-2. Download the latest mod on the [releases](https://github.com/DaemonBeast/Unify/releases) page.
+> 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 (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.
 4. Launch the game.
 
@@ -41,13 +53,13 @@ The following regions have been added:
 > file creates itself.
 
 The configuration file is located at
-`(Among Us game files)/BepInEx/config/daemon.unify.reactor.cfg`.
+`(Among Us game files)/BepInEx/config/daemon.unify.cfg`.
 
 ### Custom regions
 
 Custom regions can be added by modifying the `[Region 1]`,
-`[Region 2]` ... `[Region 5]` sections of the configuration file.
-The sections allow you to modify the display name of the region,
-the IP address of the region, and the port of the region.
+`[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.
 
 If the IP field is left empty, the region will not show up in game.

Unify/Patches/Regions.cs

@@ -1,68 +1,158 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using BepInEx.Configuration;
 using HarmonyLib;
+using Reactor.Extensions;
 using UnityEngine;
-using Array = System.Array;
+using UnityEngine.UI;
+using Object = UnityEngine.Object;
 using String = System.String;
 
 namespace Unify.Patches
 {
     public static class RegionsPatch
     {
-        private static readonly IRegionInfo[] NewRegions = new IRegionInfo[]
+        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")
-                .Duplicate(),
-            new DnsRegionInfo("localhost", "localhost", StringNames.NoTranslation, "127.0.0.1")
-                .Duplicate()
+            new DnsRegionInfo("192.241.154.115", "skeld.net", StringNames.NoTranslation, "192.241.154.115", 22023)
+                .Cast<IRegionInfo>(),
+            new DnsRegionInfo("localhost", "localhost", StringNames.NoTranslation, "127.0.0.1", 22023)
+                .Cast<IRegionInfo>(),
+            new DnsRegionInfo("152.228.160.91", "matux.fr", StringNames.NoTranslation, "152.228.160.91", 22023)
+                .Cast<IRegionInfo>()
         };
-        private static readonly IRegionInfo[] CustomRegions = MergeRegions(NewRegions, LoadCustomUserRegions());
-        private static readonly IRegionInfo[] PatchedRegions = MergeRegions(ServerManager.DefaultRegions, CustomRegions);
 
-        private static IRegionInfo[] MergeRegions(IRegionInfo[] oldRegions, IRegionInfo[] newRegions)
+        public static List<IRegionInfo> ModRegions { get; } = new List<IRegionInfo>();
+
+        public static IRegionInfo DirectRegion { get; set; }
+
+        private static TextBoxTMP DirectConnect { get; set; }
+
+        public static void Patch()
         {
-            IRegionInfo[] patchedRegions = new IRegionInfo[oldRegions.Length + newRegions.Length];
-            Array.Copy(oldRegions, patchedRegions, oldRegions.Length);
-            Array.Copy(newRegions, 0, patchedRegions, oldRegions.Length, newRegions.Length);
+            ServerManager serverManager = ServerManager.Instance;
 
-            return patchedRegions;
+            IRegionInfo[] patchedRegions = _oldRegions
+                .AddRangeToArray(_newRegions)
+                .AddRangeToArray(ModRegions.ToArray())
+                .AddRangeToArray(LoadCustomUserRegions());
+            if (DirectRegion != null) patchedRegions = patchedRegions.AddToArray(DirectRegion);
+
+            ServerManager.DefaultRegions = patchedRegions;
+            serverManager.AvailableRegions = patchedRegions;
         }
-        
+
         private static IRegionInfo[] LoadCustomUserRegions()
         {
             List<IRegionInfo> customRegions = new List<IRegionInfo>();
-            
-            for (int x = 0; x < 5; x++)
+
+            for (int x = 0; x < 9; x++)
             {
                 ConfigEntry<string> regionName = UnifyPlugin.ConfigFile.Bind(
                     $"Region {x + 1}", $"Name", "custom region");
                 ConfigEntry<string> regionIp = UnifyPlugin.ConfigFile.Bind(
                     $"Region {x + 1}", "IP", "");
+                ConfigEntry<ushort> regionPort = UnifyPlugin.ConfigFile.Bind(
+                    $"Region {x + 1}", "Port", (ushort) 22023);
 
                 if (String.IsNullOrWhiteSpace(regionIp.Value)) continue;
 
                 IRegionInfo regionInfo = new DnsRegionInfo(
-                    regionIp.Value, regionName.Value, StringNames.NoTranslation, regionIp.Value)
-                    .Duplicate();
-                
+                        regionIp.Value, $"{regionName.Value}\n{regionIp.Value}   {regionPort.Value}",
+                        StringNames.NoTranslation, regionIp.Value, regionPort.Value)
+                    .Cast<IRegionInfo>();
+
                 customRegions.Add(regionInfo);
             }
 
             return customRegions.ToArray();
         }
 
-        [HarmonyPatch(typeof(ServerManager), nameof(ServerManager.Awake))]
-        public static class AddRegionsPatch
+        private static void UpdateRegion()
         {
-            public static void Prefix(ServerManager __instance)
+            RegionMenu regionMenu = DestroyableSingleton<RegionMenu>.Instance;
+
+            bool success = UnifyPlugin.SetDirectRegion(DirectConnect.text, out IRegionInfo newRegion);
+
+            if (!success)
             {
-                ServerManager.DefaultRegions = PatchedRegions;
-                
-                // ServerManager.AvailableRegions
-                __instance.JIJNOHCGPHM = PatchedRegions;
-                
-                __instance.SaveServers();
+                DirectConnect.StartCoroutine(Effects.SwayX(DirectConnect.transform, 0.75f, 0.25f));
+                return;
+            }
+
+            regionMenu.ChooseOption(newRegion);
+            regionMenu.Close();
+        }
+
+        [HarmonyPatch(typeof(ServerManager), nameof(ServerManager.LoadServers))]
+        public static class LoadNewRegionsPatch
+        {
+            public static void Postfix()
+            {
+                Patch();
+            }
+        }
+
+        [HarmonyPatch(typeof(JoinGameButton), nameof(JoinGameButton.OnClick))]
+        public static class DirectConnectEnterButtonPatch {
+            public static bool Prefix(JoinGameButton __instance)
+            {
+                GameObject regionMenuGameObject = GameObject.Find("RegionMenu");
+                if (!regionMenuGameObject) return true;
+
+                UpdateRegion();
+
+                return false;
+            }
+        }
+
+        [HarmonyPatch(typeof(RegionMenu))]
+        public static class RegionMenuPatches
+        {
+            [HarmonyPatch(nameof(RegionMenu.Open))]
+            [HarmonyPostfix]
+            public static void DirectConnectButtonPatch(RegionMenu __instance)
+            {
+                if (DirectConnect) DirectConnect.gameObject.Destroy();
+
+                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)
+            {
+                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);
+                }
             }
         }
     }
-}
+}
+
+// TODO:
+//  Store custom servers in a JSON file

Unify/Unify.cs

@@ -1,28 +1,83 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
 using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.IL2CPP;
 using HarmonyLib;
+using Hazel.Udp;
+using Reactor;
 using Unify.Patches;
 
 namespace Unify
 {
     [BepInPlugin(Id, Name, Version)]
     [BepInProcess("Among Us.exe")]
+    [BepInDependency(ReactorPlugin.Id)]
+    [ReactorPluginSide(PluginSide.ClientOnly)]
     public class UnifyPlugin : BasePlugin
     {
-        public const string Id = "daemon.unify.reactor";
+        public const string Id = "daemon.unify";
         private const string Name = "Unify";
-        private const string Version = "2.0.2";
-        
-        public static readonly ConfigFile ConfigFile =
-            new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true);
+        private const string Version = "4.1.0";
+
+        public static ConfigFile ConfigFile { get; private set; }
 
         public Harmony Harmony { get; } = new Harmony(Id);
 
         public override void Load()
         {
+            // ===== For compatibility reasons =====
+            string oldConfigPath = Path.Combine(Paths.ConfigPath, "daemon.unify.reactor.cfg");
+            string newConfigPath = Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg");
+            bool oldConfigExists = File.Exists(oldConfigPath);
+            if (oldConfigExists)
+            {
+                File.Copy(oldConfigPath, newConfigPath, true);
+                File.Delete(oldConfigPath);
+            }
+
+            ConfigFile = new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true);
+            // =====================================
+
+            // 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 AddRegion(string name, string ip, ushort port)
+        {
+            if (Uri.CheckHostName(ip) != UriHostNameType.IPv4) return ServerManager.Instance.CurrentRegion;
+
+            IRegionInfo existingRegion =
+                ServerManager.DefaultRegions.ToArray().FirstOrDefault(region => region.PingServer == ip);
+            if (existingRegion != null) return existingRegion;
+            
+            IRegionInfo newRegion = new DnsRegionInfo(ip, $"{name}\n{ip}   {port}", StringNames.NoTranslation, ip, port)
+                .Cast<IRegionInfo>();
+            
+            RegionsPatch.ModRegions.Add(newRegion);
+            RegionsPatch.Patch();
+
+            return newRegion;
+        }
+
+        public static bool SetDirectRegion(string ip, out IRegionInfo newRegion)
+        {
+            newRegion = null;
+            
+            if (!Regex.IsMatch(ip, @"^(\d{1,3}\.){3}\d{1,3}$")) return false;
+            
+            newRegion = new DnsRegionInfo(ip, ip, StringNames.NoTranslation, ip, 22023)
+                .Cast<IRegionInfo>();
+
+            RegionsPatch.DirectRegion = newRegion;
+            RegionsPatch.Patch();
+
+            return true;
+        }
     }
 }

Unify/Unify.csproj

@@ -1,45 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>2.0.2</Version>
-        <GameVersion>2021.3.5s</GameVersion>
+        <Version>4.1.0</Version>
+        <Mappings>NuclearPowered/Mappings:0.4.0</Mappings>
 
         <Description>Region mod</Description>
         <Authors>Daemon</Authors>
     </PropertyGroup>
-    
-    <PropertyGroup>
-        <TargetName>$(AssemblyName)-$(GameVersion)</TargetName>
-    </PropertyGroup>
-    
-    <ItemGroup>
-      <Reference Include="0Harmony, Version=2.3.1.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\0Harmony.dll</HintPath>
-      </Reference>
-      <Reference Include="Assembly-CSharp, Version=3.7.1.6, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Assembly-CSharp.dll</HintPath>
-      </Reference>
-      <Reference Include="BepInEx.Core, Version=6.0.0.16, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\BepInEx.Core.dll</HintPath>
-      </Reference>
-      <Reference Include="BepInEx.IL2CPP, Version=6.0.0.16, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\BepInEx.IL2CPP.dll</HintPath>
-      </Reference>
-      <Reference Include="Il2Cppmscorlib, Version=3.7.1.6, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2Cppmscorlib.dll</HintPath>
-      </Reference>
-      <Reference Include="UnhollowerBaseLib, Version=0.4.14.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\UnhollowerBaseLib.dll</HintPath>
-      </Reference>
-      <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unity-libs\UnityEngine.dll</HintPath>
-      </Reference>
-      <Reference Include="UnityEngine.CoreModule, Version=3.7.1.6, Culture=neutral, PublicKeyToken=null">
-        <HintPath>..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.CoreModule.dll</HintPath>
-      </Reference>
-    </ItemGroup>
 
-    <Target Name="Copy" AfterTargets="AfterBuild">
-        <Copy SourceFiles="$(OutputPath)/$(TargetName).dll" DestinationFolder="../build" />
+    <PropertyGroup Condition="'$(GamePlatform)' == 'Steam'">
+        <GameVersion>2021.4.12s</GameVersion>
+        <DefineConstants>$(DefineConstants);STEAM</DefineConstants>
+    </PropertyGroup>
+  
+    <PropertyGroup Condition="'$(GamePlatform)' == 'Itch'">
+        <GameVersion>2021.4.12i</GameVersion>
+        <DefineConstants>$(DefineConstants);ITCH</DefineConstants>
+    </PropertyGroup>
+  
+    <ItemGroup>
+        <Deobfuscate Include="$(AmongUs)\BepInEx\plugins\Reactor-$(GameVersion).dll" />
+    </ItemGroup>
+  
+    <ItemGroup>
+        <PackageReference Include="Reactor.OxygenFilter.MSBuild" Version="0.3.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+  
+    <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>