Swap to NML EnumerableInjector

Banane9 · Dec 5, 2022 · 5c7433c · 5c7433c
1 parent 2875c81
commit 5c7433c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 74 deletions.
diff --git a/EditorTabbing/EditorTabbing.cs b/EditorTabbing/EditorTabbing.cs
@@ -3,6 +3,7 @@
 using FrooxEngine;
 using HarmonyLib;
 using NeosModLoader;
+using NeosModLoader.Utility;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.LowLevel;
 using Key = FrooxEngine.Key;
@@ -16,13 +17,13 @@ public class EditorTabbing : NeosMod
         [AutoRegisterConfigKey]
         private static readonly ModConfigurationKey<bool> OverlayCompatibilityBackwardsMovement = new ModConfigurationKey<bool>("OverlayCompatibilityBackwardsMovement", "Moves forward with Enter when Steam Overlay could be enabled to not trigger it.", () => true);
 
+        private static bool hasUnconfirmedImeInput = false;
         private static bool launchedInDesktop = false;
         public override string Author => "Banane9";
         public override string Link => "https://github.com/Banane9/NeosEditorTabbing";
         public override string Name => "EditorTabbing";
-        public override string Version => "1.2.0";
+        public override string Version => "2.0.0";
         private static bool SteamOverlayPossible => launchedInDesktop && !Engine.Current.TokensSupported;
-        private static bool hasUnconfirmedImeInput = false;
 
         public override void OnEngineInit()
         {
@@ -86,7 +87,7 @@ private static void EditCoroutinePostfix(TextEditor __instance, ref IEnumerator<
                 {
                     // PostItem is after control has returned to the enumerator again,
                     // i.e. when there is an update - running before EditingRoutine checks it
-                    PostItem = (item, returned) =>
+                    PostItem = (originalItem, transformedItem, returned) =>
                     {
                         if (SteamOverlayPossible && Config.GetValue(OverlayCompatibilityBackwardsMovement) && !__instance.InputInterface.GetKey(Key.Shift)
                             && (__instance.InputInterface.TypeDelta.Contains('\n') || __instance.InputInterface.TypeDelta.Contains('\r')))

diff --git a/EditorTabbing/EditorTabbing.csproj b/EditorTabbing/EditorTabbing.csproj
@@ -14,8 +14,8 @@
     <TargetFrameworkProfile />
     <ProjectGuid>{0322B2EF-7452-479D-BAE2-FCAB75033337}</ProjectGuid>
     <NeosPath>$(MSBuildThisFileDirectory)NeosVR</NeosPath>
-    <NeosPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\NeosVR\')">C:\Program Files (x86)\Steam\steamapps\common\NeosVR\</NeosPath>
     <NeosPath Condition="Exists('C:\Neos\app\')">C:\Neos\app\</NeosPath>
+    <NeosPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\NeosVR\')">C:\Program Files (x86)\Steam\steamapps\common\NeosVR\</NeosPath>
     <NeosPath Condition="Exists('$(HOME)/.steam/steam/steamapps/common/NeosVR/')">$(HOME)/.steam/steam/steamapps/common/NeosVR/</NeosPath>
     <CopyToMods Condition="'$(CopyToMods)'==''">true</CopyToMods>
   </PropertyGroup>
@@ -38,15 +38,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HarmonyLib">
-      <HintPath>$(NeosPath)nml_libs\0Harmony.dll</HintPath>
+      <HintPath Condition="Exists('$(NeosPath)nml_libs\0Harmony.dll')">$(NeosPath)nml_libs\0Harmony.dll</HintPath>
       <HintPath Condition="Exists('$(NeosPath)0Harmony.dll')">$(NeosPath)0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="FrooxEngine">
       <HintPath>$(NeosPath)Neos_Data\Managed\FrooxEngine.dll</HintPath>
     </Reference>
     <Reference Include="NeosModLoader">
-      <HintPath>$(NeosPath)Libraries\NeosModLoader.dll</HintPath>
       <HintPath Condition="Exists('$(NeosPath)NeosModLoader.dll')">$(NeosPath)NeosModLoader.dll</HintPath>
+      <HintPath Condition="Exists('$(NeosPath)Libraries\NeosModLoader.dll')">$(NeosPath)Libraries\NeosModLoader.dll</HintPath>
     </Reference>
     <Reference Include="Unity.InputSystem">
       <HintPath>$(NeosPath)Neos_Data\Managed\Unity.InputSystem.dll</HintPath>
@@ -55,7 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EditorTabbing.cs" />
-    <Compile Include="EnumerableInjector.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/EditorTabbing/EnumerableInjector.cs b/EditorTabbing/EnumerableInjector.cs
diff --git a/EditorTabbing/Properties/AssemblyInfo.cs b/EditorTabbing/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")] 
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]