diff --git a/README.md b/README.md index a8a49c0..11b0f91 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,15 @@ -# Unify +> **⚠ WARNING** +> +> Impostor currently doesn't support the 2021.3.31.3s release of the +> game, so custom servers will give an outdated error when you try to +> connect. The 3.0.0-pre.1 release of Unify doesn't use Reactor, since +> Reactor is currently outdated and Unify will not actually work until +> Impostor has been updated to support the 2021.3.31.3s release of the +> game. A new stable version of Unify will be released once Reactor is +> up-to-date, but it should be functional with or without Reactor once +> Impostor is up-to-date. + +# Unify An Among Us mod to add extra regions to the regions menu. diff --git a/Unify/Patches/Regions.cs b/Unify/Patches/Regions.cs index 1dd98a8..dec7375 100644 --- a/Unify/Patches/Regions.cs +++ b/Unify/Patches/Regions.cs @@ -1,10 +1,10 @@ -using System.Collections.Generic; -using System.Linq; +using System; +using System.Collections.Generic; using BepInEx.Configuration; using HarmonyLib; -using Hazel.Udp; -using Reactor; -using Array = System.Array; +using UnityEngine; +using UnityEngine.UI; +using Object = UnityEngine.Object; using String = System.String; namespace Unify.Patches @@ -12,27 +12,35 @@ namespace Unify.Patches public static class RegionsPatch { private static IRegionInfo[] _oldRegions = ServerManager.DefaultRegions; + private static IRegionInfo[] _newRegions = new IRegionInfo[] { - new DnsRegionInfo("192.241.154.115", "skeld.net", StringNames.NoTranslation, "192.241.154.115") + new DnsRegionInfo("192.241.154.115", "skeld.net", StringNames.NoTranslation, "192.241.154.115", 22023) .Cast(), - new DnsRegionInfo("localhost", "localhost", StringNames.NoTranslation, "127.0.0.1") + new DnsRegionInfo("localhost", "localhost", StringNames.NoTranslation, "127.0.0.1", 22023) .Cast(), - new DnsRegionInfo("152.228.160.91", "matux.fr", StringNames.NoTranslation, "152.228.160.91") + new DnsRegionInfo("152.228.160.91", "matux.fr", StringNames.NoTranslation, "152.228.160.91", 22023) .Cast() }; public static List ModRegions = new List(); + public static IRegionInfo DirectRegion; + + private static TextBox directConnect; + public static void Patch() { + ServerManager serverManager = DestroyableSingleton.CMJOLNCMAPD; + 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); ServerManager.DefaultRegions = patchedRegions; - ServerManager.Instance.AvailableRegions = patchedRegions; - ServerManager.Instance.SaveServers(); + serverManager.GDOLGIJJLBL = patchedRegions; + serverManager.SaveServers(); } private static IRegionInfo[] LoadCustomUserRegions() @@ -49,7 +57,7 @@ namespace Unify.Patches if (String.IsNullOrWhiteSpace(regionIp.Value)) continue; IRegionInfo regionInfo = new DnsRegionInfo( - regionIp.Value, regionName.Value, StringNames.NoTranslation, regionIp.Value) + regionIp.Value, regionName.Value, StringNames.NoTranslation, regionIp.Value, 22023) .Cast(); customRegions.Add(regionInfo); @@ -57,9 +65,98 @@ namespace Unify.Patches return customRegions.ToArray(); } + + private static void UpdateRegion() + { + RegionMenu regionMenu = GameObject.Find("RegionMenu").GetComponent(); + + bool success = UnifyPlugin.SetDirectRegion(directConnect.text, out IRegionInfo newRegion); + + if (!success) + { + directConnect.StartCoroutine(HLPCBNMDEHF.FIJHCJMBGFP(directConnect.transform, 0.75f, 0.25f)); + return; + } + + regionMenu.ChooseOption(newRegion); + regionMenu.Close(); + } + + [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.Open))] + public static class DirectConnectButtonPatch + { + public static void Postfix() + { + JoinGameButton joinGameButton = DestroyableSingleton.CMJOLNCMAPD; + RegionMenu regionMenu = DestroyableSingleton.CMJOLNCMAPD; + + 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 / 2; + + for (int x = 0; x < regionButtons.Length; x++) + { + ServerListButton regionButton = regionButtons[x].Cast(); + + regionButton.transform.localPosition = new Vector3(1.25f * ((x < half)? -1: 1), 2f - 0.5f * (x - ((x < half)? 0 : half)), 0f); + } + } + } + + [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), nameof(RegionMenu.Close))] + public static class HideDirectConnectPatch + { + public static void Postfix() + { + directConnect.gameObject.SetActive(false); + } + } + + [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.ChooseOption))] + public static class HideDirectConnectOnSelectPatch + { + public static void Postfix() + { + directConnect.gameObject.SetActive(false); + } + } } - [HarmonyPatch(typeof(UdpConnection), nameof(UdpConnection.HandleSend))] + /*[HarmonyPatch(typeof(UdpConnection), nameof(UdpConnection.HandleSend))] public static class DisableModdedHandshakePatch { [HarmonyBefore(new string[] { "gg.reactor.api" })] @@ -77,5 +174,12 @@ namespace Unify.Patches PluginSingleton.Instance.ModdedHandshake.Value = true; } - } -} \ No newline at end of file + }*/ +} + +/* + +Change fields to properties +Change how custom region is detected + +*/ \ No newline at end of file diff --git a/Unify/Unify.cs b/Unify/Unify.cs index 7968ec0..48b8352 100644 --- a/Unify/Unify.cs +++ b/Unify/Unify.cs @@ -1,41 +1,52 @@ using System; using System.IO; +using System.Linq; +using System.Text.RegularExpressions; using BepInEx; using BepInEx.Configuration; using BepInEx.IL2CPP; using HarmonyLib; -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.1.0"; - - public static readonly ConfigFile ConfigFile = - new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true); + private const string Version = "3.0.0-pre.1"; - public static readonly bool HandshakeDisabled = !PluginSingleton.Instance.ModdedHandshake.Value; + public static ConfigFile ConfigFile; + + // public static readonly bool HandshakeDisabled = !PluginSingleton.Instance.ModdedHandshake.Value; - public static readonly string[] NormalHandshake = - new string[] {"North America", "Europe", "Asia", "skeld.net"}; + /*public static readonly string[] NormalHandshake = + new string[] {"North America", "Europe", "Asia", "skeld.net"};*/ 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); + // ===================================== + RegionsPatch.Patch(); Harmony.PatchAll(); } - + public static IRegionInfo[] MergeRegions(IRegionInfo[] oldRegions, IRegionInfo[] newRegions) { IRegionInfo[] patchedRegions = new IRegionInfo[oldRegions.Length + newRegions.Length]; @@ -45,13 +56,37 @@ namespace Unify return patchedRegions; } - public static void AddRegion(string name, string ip) + public static IRegionInfo AddRegion(string name, string ip) { - IRegionInfo newRegion = new DnsRegionInfo(ip, name, StringNames.NoTranslation, ip) + if (Uri.CheckHostName(ip) != UriHostNameType.IPv4) + return DestroyableSingleton.CMJOLNCMAPD.KIDDJMGEOKK; + + IRegionInfo existingRegion = + ServerManager.DefaultRegions.ToArray().FirstOrDefault(region => region.PingServer == ip); + if (existingRegion != null) return existingRegion; + + IRegionInfo newRegion = new DnsRegionInfo(ip, name, StringNames.NoTranslation, ip, 22023) .Cast(); 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(); + + RegionsPatch.DirectRegion = newRegion; + RegionsPatch.Patch(); + + return true; } } } \ No newline at end of file diff --git a/Unify/Unify.csproj b/Unify/Unify.csproj index d23bd93..9df40c2 100644 --- a/Unify/Unify.csproj +++ b/Unify/Unify.csproj @@ -1,36 +1,227 @@ netstandard2.1 - 2.1.0 - NuclearPowered/Mappings:0.2.0 + 3.0.0-pre.1 - Region mod for Reactor + Region mod Daemon - - - 2021.3.5s - $(DefineConstants);STEAM - - - - 2021.11.17i - $(DefineConstants);ITCH - - - + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\0Harmony.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Apple.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\AppleCore.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\AppleMacos.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Assembly-CSharp.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Assembly-CSharp-firstpass.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\BepInEx.Core.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\BepInEx.IL2CPP.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\FacebookStore.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Hazel.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppMono.Security.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2Cppmscorlib.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Configuration.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Core.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Data.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Net.Http.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Numerics.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Runtime.Serialization.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Xml.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Il2CppSystem.Xml.Linq.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Newtonsoft.Json.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Purchasing.Common.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\QRCoder.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Rewired_Core.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Rewired_Windows.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Security.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Stores.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\core\UnhollowerBaseLib.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Unity.Addressables.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Unity.Analytics.DataPrivacy.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Unity.ResourceManager.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\Unity.TextMeshPro.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.AIModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.AndroidJNIModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.AnimationModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.AssetBundleModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.AudioModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.CoreModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.DirectorModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.GridModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.ImageConversionModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.IMGUIModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.InputLegacyModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.InputModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.JSONSerializeModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.ParticleSystemModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.Physics2DModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.PhysicsModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.Purchasing.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.ScreenCaptureModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.SharedInternalsModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.SpriteMaskModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.SpriteShapeModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.SubsystemsModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.TerrainModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.TextCoreModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.TextRenderingModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.TilemapModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UI.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UIElementsNativeModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UIModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UnityAnalyticsModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UnityWebRequestAssetBundleModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UnityWebRequestModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.UnityWebRequestWWWModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.VFXModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.VideoModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.VRModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\UnityEngine.XRModule.dll + + + ..\..\..\Program Files\SteamLibrary\steamapps\common\Among Us\BepInEx\unhollowed\winrt.dll + - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - \ No newline at end of file diff --git a/build/Unify-2021.3.5s.dll b/build/Unify-2021.3.5s.dll index 6fe6567..269738b 100644 Binary files a/build/Unify-2021.3.5s.dll and b/build/Unify-2021.3.5s.dll differ