Tweaks code and warnings

Banane9 · Banane9 · commit 78fe425bfd38 · 2026-02-16T22:09:18.000+01:00
diff --git a/DynamicVariablePowerTools/DebugInfoConfig.cs b/DynamicVariablePowerTools/DebugInfoConfig.cs
@@ -1,17 +1,20 @@
 ﻿using MonkeyLoader.Configuration;
-using System;
 
 namespace DynamicVariablePowerTools
 {
     internal sealed class DebugInfoConfig : ConfigSection
     {
         private static readonly DefiningConfigKey<bool> _enableLinkedComponentHierarchy = new("EnableLinkedComponentHierarchy", "Allow generating a hierarchical list of all dynamic variable components linked to a space.", () => true);
         private static readonly DefiningConfigKey<bool> _enableLinkedVariablesList = new("EnableLinkedVariablesList", "Allow generating a list of all dynamic variable definitions linked to a space.", () => true);
+
         public override string Description => "Contains the options for the available debug info buttons on DynamicVariableSpace Components.";
 
         public bool EnableLinkedComponentHierarchy => _enableLinkedComponentHierarchy;
+
         public bool EnableLinkedVariablesList => _enableLinkedVariablesList;
+
         public override string Id => "DebugInfo";
+
         public override Version Version { get; } = new Version(1, 0, 0);
     }
 }
diff --git a/DynamicVariablePowerTools/DebugInfoGenerator.cs b/DynamicVariablePowerTools/DebugInfoGenerator.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+﻿using System.Text;
 using Elements.Core;
 using FrooxEngine;
 using MonkeyLoader.Resonite;
diff --git a/DynamicVariablePowerTools/DynamicReferenceReceiving.cs b/DynamicVariablePowerTools/DynamicReferenceReceiving.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DynamicVariablePowerTools
+﻿namespace DynamicVariablePowerTools
 {
     // Offer dynamic reference variable drive based on dropped dynamic reference (variable)
     internal sealed class DynamicReferenceReceiving
diff --git a/DynamicVariablePowerTools/DynamicValueReceiving.cs b/DynamicVariablePowerTools/DynamicValueReceiving.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace DynamicVariablePowerTools
+﻿namespace DynamicVariablePowerTools
 {
     // Offer dynamic value variable drive based on dropped dynamic value variable / field reference
     internal sealed class DynamicValueReceiving
diff --git a/DynamicVariablePowerTools/OpenLinkedDynamicVariableSpace.cs b/DynamicVariablePowerTools/OpenLinkedDynamicVariableSpace.cs
@@ -1,12 +1,6 @@
 ﻿using FrooxEngine;
 using HarmonyLib;
-using MonkeyLoader.Resonite.UI;
 using MonkeyLoader.Resonite.UI.Inspectors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DynamicVariablePowerTools
 {
diff --git a/DynamicVariablePowerTools/RenameButtonHelper.cs b/DynamicVariablePowerTools/RenameButtonHelper.cs
@@ -3,9 +3,6 @@
 using FrooxEngine.UIX;
 using MonkeyLoader.Resonite;
 using MonkeyLoader.Resonite.UI;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace DynamicVariablePowerTools
 {
diff --git a/DynamicVariablePowerTools/RenameConfig.cs b/DynamicVariablePowerTools/RenameConfig.cs
@@ -1,7 +1,4 @@
 ﻿using MonkeyLoader.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace DynamicVariablePowerTools
 {
diff --git a/DynamicVariablePowerTools/RenameDirectlyLinkedVariables.cs b/DynamicVariablePowerTools/RenameDirectlyLinkedVariables.cs
@@ -1,22 +1,14 @@
-﻿using System;
-using FrooxEngine;
+﻿using FrooxEngine;
 using FrooxEngine.ProtoFlux;
 using HarmonyLib;
 using MonkeyLoader.Resonite;
 using MonkeyLoader.Resonite.UI.Inspectors;
 
 namespace DynamicVariablePowerTools
 {
-    [HarmonyPatchCategory(nameof(RenameDirectlyLinkedVariables))]
-    [HarmonyPatch(typeof(DynamicVariableSpace), nameof(DynamicVariableSpace.UpdateName))]
-    internal sealed class RenameDirectlyLinkedVariables : ConfiguredResoniteInspectorMonkey<RenameDirectlyLinkedVariables, RenameConfig, BuildInspectorBodyEvent, DynamicVariableSpace>
+    internal sealed class RenameDirectlyLinkedVariables
+        : ConfiguredResoniteInspectorMonkey<RenameDirectlyLinkedVariables, RenameConfig, BuildInspectorBodyEvent, DynamicVariableSpace>
     {
-        //[AutoRegisterConfigKey]
-        //private static ModConfigurationKey<bool> ChangeDynVarNamespaces = new ModConfigurationKey<bool>("ChangeDynVarNamespaces", "Enable searching and renaming directly linked variables and drivers when namespace changes.", () => false);
-
-        //[AutoRegisterConfigKey]
-        //private static ModConfigurationKey<bool> ChangeLogixStringInputs = new ModConfigurationKey<bool>("ChangeLogixStringInputs", "Search and rename logix inputs with the old name in the form OldName/.* (Experimental).", () => false);
-
         public override int Priority => HarmonyLib.Priority.Low;
 
         protected override void Handle(BuildInspectorBodyEvent eventData)
diff --git a/DynamicVariablePowerTools/RenameDynamicVariables.cs b/DynamicVariablePowerTools/RenameDynamicVariables.cs
@@ -3,7 +3,6 @@
 using FrooxEngine.ProtoFlux;
 using MonkeyLoader.Resonite;
 using MonkeyLoader.Resonite.UI.Inspectors;
-using System;
 
 namespace DynamicVariablePowerTools
 {
diff --git a/DynamicVariablePowerTools/SetupVariableMemberActions.cs b/DynamicVariablePowerTools/SetupVariableMemberActions.cs
@@ -1,15 +1,9 @@
 ﻿using FrooxEngine;
-using FrooxEngine.UIX;
 using HarmonyLib;
 using MonkeyLoader;
 using MonkeyLoader.Resonite;
 using MonkeyLoader.Resonite.UI.Inspectors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DynamicVariablePowerTools
 {
@@ -73,18 +67,18 @@ private static void CreateFieldItems<T>(InspectorMemberActionsMenuItemsGeneratio
                 var dynamicField = slot.AttachComponent<DynamicField<T>>();
                 dynamicField.TargetField.Target = (IField<T>)eventData.Target;
 
-                button.World.LocalUser.CloseContextMenu(eventData.MemberActions);
+                button.World.LocalUser.CloseContextMenu(eventData.Summoner);
             };
 
             menuItem = eventData.ContextMenu.AddItem("Drive from Dynamic Variable", (Uri)null!, RadiantUI_Constants.Sub.PURPLE);
 
             menuItem.Button.LocalPressed += (button, args) =>
             {
-                button.World.LocalUser.CloseContextMenu(eventData.MemberActions);
+                button.World.LocalUser.CloseContextMenu(eventData.Summoner);
 
                 button.Slot.StartTask(async () =>
                 {
-                    await button.World.LocalUser.OpenContextMenu(eventData.MemberActions, args.source.Slot);
+                    await button.World.LocalUser.OpenContextMenu(eventData.Summoner, args.source.Slot);
 
                     // Need to check dynamic variable spaces hiding eachother
                     // Also use full space/varName for drive
@@ -98,7 +92,7 @@ private static void CreateFieldItems<T>(InspectorMemberActionsMenuItemsGeneratio
                     {
                         var driver = slot.AttachComponent<DynamicValueVariableDriver<T>>();
                         driver.Target.Target = (IField<T>)eventData.Target;
-                        button.World.LocalUser.CloseContextMenu(eventData.MemberActions);
+                        button.World.LocalUser.CloseContextMenu(eventData.Summoner);
                     };
 
                     foreach (var option in options)
@@ -107,7 +101,7 @@ private static void CreateFieldItems<T>(InspectorMemberActionsMenuItemsGeneratio
                         menuItem3.Button.LocalPressed += (button2, args2) =>
                         {
                             ((IField<T>)eventData.Target).DriveFromVariable(option.name);
-                            button.World.LocalUser.CloseContextMenu(eventData.MemberActions);
+                            button.World.LocalUser.CloseContextMenu(eventData.Summoner);
                         };
                     }
                 });
diff --git a/DynamicVariablePowerTools/SpaceTree.cs b/DynamicVariablePowerTools/SpaceTree.cs
@@ -1,19 +1,16 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Text;
 using Elements.Core;
 using FrooxEngine;
+using MonkeyLoader.Resonite;
 
 namespace DynamicVariablePowerTools
 {
-    internal class SpaceTree
+    internal sealed class SpaceTree
     {
         private readonly Slot _slot;
         private readonly DynamicVariableSpace _space;
-        private SpaceTree[] _children;
-        private IDynamicVariable[] _dynVars;
+        private SpaceTree[] _children = [];
+        private IDynamicVariable[] _dynVars = [];
 
         public SpaceTree(DynamicVariableSpace space, Slot? slot = null)
         {
@@ -25,7 +22,7 @@ public bool Process()
         {
             _dynVars = [.. _slot.GetComponents<IDynamicVariable>(dynvar => dynvar.IsLinkedToSpace(_space))];
 
-            _children = _slot.Children.Select(child => new SpaceTree(_space, child)).Where(tree => tree.Process()).ToArray();
+            _children = [.. _slot.Children.Select(child => new SpaceTree(_space, child)).Where(tree => tree.Process())];
 
             return _dynVars.Length > 0 || _children.Length > 0;
         }
@@ -43,7 +40,7 @@ public override string ToString()
             return builder.ToString();
         }
 
-        private void AppendDynVar(StringBuilder builder, string indent, IDynamicVariable dynVar, bool last = false)
+        private static void AppendDynVar(StringBuilder builder, string indent, IDynamicVariable dynVar, bool last = false)
         {
             builder.Append(indent);
             builder.Append(last ? "└─" : "├─");
@@ -53,7 +50,7 @@ private void AppendDynVar(StringBuilder builder, string indent, IDynamicVariable
             builder.AppendLine(")");
         }
 
-        private void AppendSlot(StringBuilder builder, string indent, SpaceTree child, bool first, bool last)
+        private static void AppendSlot(StringBuilder builder, string indent, SpaceTree child, bool first, bool last)
         {
             if (!first)
             {
@@ -70,21 +67,23 @@ private void AppendSlot(StringBuilder builder, string indent, SpaceTree child, b
 
         private void BuildString(StringBuilder builder, string indent)
         {
-            if (_dynVars.Any())
+            if (_dynVars.Length is not 0)
             {
                 for (var i = 0; i < _dynVars.Length - 1; ++i)
                     AppendDynVar(builder, indent, _dynVars[i]);
 
-                AppendDynVar(builder, indent, _dynVars[^1], !_children.Any());
+                var isLast = _children.Length is 0;
 
-                if (_children.Any())
+                AppendDynVar(builder, indent, _dynVars[^1], isLast);
+
+                if (!isLast)
                 {
                     builder.Append(indent);
                     builder.AppendLine("│");
                 }
             }
 
-            if (_children.Any())
+            if (_children.Length is not 0)
             {
                 for (var i = 0; i < _children.Length; ++i)
                     AppendSlot(builder, indent, _children[i], i == 0, i == _children.Length - 1);
diff --git a/DynamicVariablePowerTools/TypeExtensions.cs b/DynamicVariablePowerTools/TypeExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,20 @@`
`1`	`1`	`using MonkeyLoader.Configuration;`
`2`		`-using System;`
`3`	`2`
`4`	`3`	`namespace DynamicVariablePowerTools`
`5`	`4`	`{`
`6`	`5`	`internal sealed class DebugInfoConfig : ConfigSection`
`7`	`6`	`{`
`8`	`7`	`private static readonly DefiningConfigKey<bool> _enableLinkedComponentHierarchy = new("EnableLinkedComponentHierarchy", "Allow generating a hierarchical list of all dynamic variable components linked to a space.", () => true);`
`9`	`8`	`private static readonly DefiningConfigKey<bool> _enableLinkedVariablesList = new("EnableLinkedVariablesList", "Allow generating a list of all dynamic variable definitions linked to a space.", () => true);`
	`9`	`+`
`10`	`10`	`public override string Description => "Contains the options for the available debug info buttons on DynamicVariableSpace Components.";`
`11`	`11`
`12`	`12`	`public bool EnableLinkedComponentHierarchy => _enableLinkedComponentHierarchy;`
	`13`	`+`
`13`	`14`	`public bool EnableLinkedVariablesList => _enableLinkedVariablesList;`
	`15`	`+`
`14`	`16`	`public override string Id => "DebugInfo";`
	`17`	`+`
`15`	`18`	`public override Version Version { get; } = new Version(1, 0, 0);`
`16`	`19`	`}`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@`
`3`	`3`	`using FrooxEngine.UIX;`
`4`	`4`	`using MonkeyLoader.Resonite;`
`5`	`5`	`using MonkeyLoader.Resonite.UI;`
`6`		`-using System;`
`7`		`-using System.Collections.Generic;`
`8`		`-using System.Text;`
`9`	`6`
`10`	`7`	`namespace DynamicVariablePowerTools`
`11`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`using MonkeyLoader.Configuration;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Text;`
`5`	`2`
`6`	`3`	`namespace DynamicVariablePowerTools`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using FrooxEngine.ProtoFlux;`
`4`	`4`	`using MonkeyLoader.Resonite;`
`5`	`5`	`using MonkeyLoader.Resonite.UI.Inspectors;`
`6`		`-using System;`
`7`	`6`
`8`	`7`	`namespace DynamicVariablePowerTools`
`9`	`8`	`{`