Skip to content

Port to resonite #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hantabaru1014 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to resonite #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions EditorTabbing/EditorTabbing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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()
{
Expand All @@ -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;
}
Expand Down Expand Up @@ -105,14 +105,14 @@ private static void EditCoroutinePostfix(TextEditor __instance, ref IEnumerator<

private static Slot getObjectRoot(Slot slot)
{
var implicitRoot = slot.GetComponentInParents<IImplicitObjectRoot>(null, true, false);
var iObjRoot = slot.GetComponentInParents<IObjectRoot>(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;
}
Expand Down
31 changes: 16 additions & 15 deletions EditorTabbing/EditorTabbing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EditorTabbing</RootNamespace>
<AssemblyName>EditorTabbing</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<ProjectGuid>{0322B2EF-7452-479D-BAE2-FCAB75033337}</ProjectGuid>
<NeosPath>$(MSBuildThisFileDirectory)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>
<AppName>Resonite</AppName>
<ModLoaderShort>rml</ModLoaderShort>
<AppPath>$(MSBuildThisFileDirectory)$(AppName)</AppPath>
<AppPath Condition="Exists('C:\Program Files (x86)\Steam\steamapps\common\$(AppName)\')">C:\Program Files (x86)\Steam\steamapps\common\$(AppName)\</AppPath>
<AppPath Condition="Exists('$(HOME)/.steam/steam/steamapps/common/$(AppName)/')">$(HOME)/.steam/steam/steamapps/common/$(AppName)/</AppPath>
<CopyToMods Condition="'$(CopyToMods)'==''">true</CopyToMods>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -38,18 +39,18 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="HarmonyLib">
<HintPath Condition="Exists('$(NeosPath)nml_libs\0Harmony.dll')">$(NeosPath)nml_libs\0Harmony.dll</HintPath>
<HintPath Condition="Exists('$(NeosPath)0Harmony.dll')">$(NeosPath)0Harmony.dll</HintPath>
<HintPath>$(AppPath)$(ModLoaderShort)_libs\0Harmony.dll</HintPath>
<HintPath Condition="Exists('$(AppPath)0Harmony.dll')">$(AppPath)0Harmony.dll</HintPath>
</Reference>
<Reference Include="FrooxEngine">
<HintPath>$(NeosPath)Neos_Data\Managed\FrooxEngine.dll</HintPath>
<Reference Include="$(AppName)ModLoader">
<HintPath>$(AppPath)$(AppName)ModLoader.dll</HintPath>
<HintPath>$(AppPath)Libraries\$(AppName)ModLoader.dll</HintPath>
</Reference>
<Reference Include="NeosModLoader">
<HintPath Condition="Exists('$(NeosPath)NeosModLoader.dll')">$(NeosPath)NeosModLoader.dll</HintPath>
<HintPath Condition="Exists('$(NeosPath)Libraries\NeosModLoader.dll')">$(NeosPath)Libraries\NeosModLoader.dll</HintPath>
<Reference Include="FrooxEngine">
<HintPath>$(AppPath)$(AppName)_Data\Managed\FrooxEngine.dll</HintPath>
</Reference>
<Reference Include="Unity.InputSystem">
<HintPath>$(NeosPath)Neos_Data\Managed\Unity.InputSystem.dll</HintPath>
<HintPath>$(AppPath)$(AppName)_Data\Managed\Unity.InputSystem.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Expand All @@ -62,7 +63,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(CopyToMods)'=='true'">
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(NeosPath)nml_mods" />
<Message Text="Copied $(TargetFileName) to $(NeosPath)" Importance="high" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AppPath)$(ModLoaderShort)_mods" />
<Message Text="Copied $(TargetFileName) to $(AppPath)" Importance="high" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions EditorTabbing/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.0.0.0")]