From 33a14559ab566f06693572262a88c97ae878a7e5 Mon Sep 17 00:00:00 2001 From: hantabaru1014 Date: Mon, 8 Jan 2024 14:10:41 +0900 Subject: [PATCH] port to resonite --- EditorTabbing/EditorTabbing.cs | 20 +++++++-------- EditorTabbing/EditorTabbing.csproj | 31 ++++++++++++------------ EditorTabbing/Properties/AssemblyInfo.cs | 4 +-- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/EditorTabbing/EditorTabbing.cs b/EditorTabbing/EditorTabbing.cs index 6a7865f..ae5df7c 100644 --- a/EditorTabbing/EditorTabbing.cs +++ b/EditorTabbing/EditorTabbing.cs @@ -2,15 +2,15 @@ using System.Linq; using FrooxEngine; using HarmonyLib; -using NeosModLoader; -using NeosModLoader.Utility; +using ResoniteModLoader; +using ResoniteModLoader.Utility; using UnityEngine.InputSystem; using UnityEngine.InputSystem.LowLevel; using Key = FrooxEngine.Key; namespace EditorTabbing { - public class EditorTabbing : NeosMod + public class EditorTabbing : ResoniteMod { public static ModConfiguration Config; @@ -22,8 +22,8 @@ public class EditorTabbing : NeosMod public override string Author => "Banane9"; public override string Link => "https://github.com/Banane9/NeosEditorTabbing"; public override string Name => "EditorTabbing"; - public override string Version => "2.0.0"; - private static bool SteamOverlayPossible => launchedInDesktop && !Engine.Current.TokensSupported; + public override string Version => "3.0.0"; + private static bool SteamOverlayPossible => launchedInDesktop; public override void OnEngineInit() { @@ -33,7 +33,7 @@ public override void OnEngineInit() harmony.PatchAll(); var outputDevice = Engine.Current.SystemInfo.HeadDevice; - launchedInDesktop = outputDevice == HeadOutputDevice.Screen || outputDevice == HeadOutputDevice.Screen360 || outputDevice == HeadOutputDevice.LegacyScreen; + launchedInDesktop = outputDevice == HeadOutputDevice.Screen || outputDevice == HeadOutputDevice.Screen360; Keyboard.current.onIMECompositionChange += OnIMECompositionChange; } @@ -105,14 +105,14 @@ private static void EditCoroutinePostfix(TextEditor __instance, ref IEnumerator< private static Slot getObjectRoot(Slot slot) { - var implicitRoot = slot.GetComponentInParents(null, true, false); + var iObjRoot = slot.GetComponentInParents(null, true, false); var objectRoot = slot.GetObjectRoot(); - if (implicitRoot == null) + if (iObjRoot == null) return objectRoot; - if (objectRoot == slot || implicitRoot.Slot.HierachyDepth > objectRoot.HierachyDepth) - return implicitRoot.Slot; + if (objectRoot == slot || iObjRoot.Slot.HierachyDepth > objectRoot.HierachyDepth) + return iObjRoot.Slot; return objectRoot; } diff --git a/EditorTabbing/EditorTabbing.csproj b/EditorTabbing/EditorTabbing.csproj index 1db117d..f1bcac2 100644 --- a/EditorTabbing/EditorTabbing.csproj +++ b/EditorTabbing/EditorTabbing.csproj @@ -8,15 +8,16 @@ Properties EditorTabbing EditorTabbing - v4.6.2 + v4.7.2 512 true {0322B2EF-7452-479D-BAE2-FCAB75033337} - $(MSBuildThisFileDirectory)NeosVR - C:\Neos\app\ - C:\Program Files (x86)\Steam\steamapps\common\NeosVR\ - $(HOME)/.steam/steam/steamapps/common/NeosVR/ + Resonite + rml + $(MSBuildThisFileDirectory)$(AppName) + C:\Program Files (x86)\Steam\steamapps\common\$(AppName)\ + $(HOME)/.steam/steam/steamapps/common/$(AppName)/ true @@ -38,18 +39,18 @@ - $(NeosPath)nml_libs\0Harmony.dll - $(NeosPath)0Harmony.dll + $(AppPath)$(ModLoaderShort)_libs\0Harmony.dll + $(AppPath)0Harmony.dll - - $(NeosPath)Neos_Data\Managed\FrooxEngine.dll + + $(AppPath)$(AppName)ModLoader.dll + $(AppPath)Libraries\$(AppName)ModLoader.dll - - $(NeosPath)NeosModLoader.dll - $(NeosPath)Libraries\NeosModLoader.dll + + $(AppPath)$(AppName)_Data\Managed\FrooxEngine.dll - $(NeosPath)Neos_Data\Managed\Unity.InputSystem.dll + $(AppPath)$(AppName)_Data\Managed\Unity.InputSystem.dll @@ -62,7 +63,7 @@ - - + + \ No newline at end of file diff --git a/EditorTabbing/Properties/AssemblyInfo.cs b/EditorTabbing/Properties/AssemblyInfo.cs index 19829a1..5f70539 100644 --- 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("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyFileVersion("3.0.0.0")] \ No newline at end of file