Merge pull request #25 from MoltenMods/2021

Added Reactor back

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.

Unify/Patches/Regions.cs

@@ -27,7 +27,7 @@ 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()
         {
@@ -77,13 +77,22 @@ namespace Unify.Patches
 
             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(ServerManager), nameof(ServerManager.LoadServers))]
+        public static class PatchRegionMenuPatch
+        {
+            public static void Postfix()
+            {
+                Patch();
+            }
+        }
         
         [HarmonyPatch(typeof(RegionMenu), nameof(RegionMenu.Open))]
         public static class DirectConnectButtonPatch

Unify/Unify.cs

@@ -20,7 +20,7 @@ namespace Unify
     {
         public const string Id = "daemon.unify";
         private const string Name = "Unify";
-        private const string Version = "3.0.1";
+        private const string Version = "4.0.0";
 
         public static ConfigFile ConfigFile { get; private set; }
 
@@ -40,11 +40,10 @@ namespace Unify
 
             ConfigFile = new ConfigFile(Path.Combine(Paths.ConfigPath, $"{UnifyPlugin.Id}.cfg"), true);
             // =====================================
-            
-            RegionsPatch.Patch();
-            
+
             // Unpatches the modded handshake, because Impostor is STILL not fully updated yet
-            Harmony.Unpatch(typeof(UdpConnection).GetMethod("HandleSend"), HarmonyPatchType.Prefix, ReactorPlugin.Id);
+            Harmony.Unpatch(typeof(UdpConnection).GetMethod("HandleSend"), HarmonyPatchType.Prefix, 
+                ReactorPlugin.Id);
 
             Harmony.PatchAll();
         }

Unify/Unify.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>3.0.1</Version>
-        <Mappings>NuclearPowered/Mappings:0.3.0</Mappings>
+        <Version>4.0.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>