more cleanup

Alexejhero · Nov 6, 2023 · 9e1a519 · 9e1a519
1 parent 7293da1
commit 9e1a519
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/SCHIZO/SCHIZO.csproj b/SCHIZO/SCHIZO.csproj
@@ -29,13 +29,12 @@
             <DependentUpon>%(FileName).cs</DependentUpon>
         </Compile>
         <Compile Remove="$(SolutionDir)/Unity/Assets/Scripts/SCHIZO/**/*.Unity.cs" />
-        
+
         <Compile Include="$(SolutionDir)/Unity/Packages/Tri-Inspector/Runtime/**/*.cs" LinkBase="TriInspector/Linked" Visible="False" />
 
         <Folder Include="Attributes" />
-        <Folder Include="Attributes/Typing" />
-        <Folder Include="Attributes/Validation" />
-        <Folder Include="Attributes/Visual" />
+        <Folder Include="TriInspector" />
+        <Folder Include="TriInspector/Attributes" />
         <Folder Include="Utilities" />
     </ItemGroup>
 

diff --git a/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/ComponentReferencesGroupAttribute.cs b/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/ComponentReferencesGroupAttribute.cs
@@ -4,9 +4,7 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class ComponentReferencesGroupAttribute : GroupAttribute
     {
-        public const string GROUP_NAME = "component-references";
-
-        public ComponentReferencesGroupAttribute() : base(GROUP_NAME)
+        public ComponentReferencesGroupAttribute() : base(DeclareComponentReferencesGroupAttribute.GROUP_NAME)
         {
         }
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/ComponentReferencesGroupNextAttribute.cs b/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/ComponentReferencesGroupNextAttribute.cs
@@ -4,7 +4,7 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class ComponentReferencesGroupNextAttribute : GroupNextAttribute
     {
-        public ComponentReferencesGroupNextAttribute() : base(ComponentReferencesGroupAttribute.GROUP_NAME)
+        public ComponentReferencesGroupNextAttribute() : base(DeclareComponentReferencesGroupAttribute.GROUP_NAME)
         {
         }
     }

diff --git a/...Assets/Scripts/SCHIZO/TriInspector/Attributes/DeclareComponentReferencesGroupAttribute.cs b/...Assets/Scripts/SCHIZO/TriInspector/Attributes/DeclareComponentReferencesGroupAttribute.cs
@@ -4,7 +4,9 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class DeclareComponentReferencesGroupAttribute : DeclareFoldoutGroupAttribute
     {
-        public DeclareComponentReferencesGroupAttribute() : base(ComponentReferencesGroupAttribute.GROUP_NAME)
+        public const string GROUP_NAME = "component-references";
+
+        public DeclareComponentReferencesGroupAttribute() : base(GROUP_NAME)
         {
             base.Title = "Component References";
         }

diff --git a/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/DeclareUnexploredGroupAttribute.cs b/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/DeclareUnexploredGroupAttribute.cs
@@ -4,12 +4,14 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class DeclareUnexploredGroupAttribute : DeclareFoldoutGroupAttribute
     {
-        public DeclareUnexploredGroupAttribute(string insideof) : base(insideof + "/unexplored")
+        public const string GROUP_NAME = "unexplored";
+
+        public DeclareUnexploredGroupAttribute(string insideof) : base(insideof + "/" + GROUP_NAME)
         {
             base.Title = "Unexplored (These fields have not been explored yet and their functionality is unknown)";
         }
 
-        public DeclareUnexploredGroupAttribute() : base("unexplored")
+        public DeclareUnexploredGroupAttribute() : base(GROUP_NAME)
         {
             base.Title = "Unexplored (These fields have not been explored yet and their functionality is unknown)";
         }

diff --git a/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/UnexploredGroupAttribute.cs b/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/UnexploredGroupAttribute.cs
@@ -4,11 +4,11 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class UnexploredGroupAttribute : GroupAttribute
     {
-        public UnexploredGroupAttribute(string insideof) : base(insideof + "/unexplored")
+        public UnexploredGroupAttribute(string insideof) : base(insideof + "/" + DeclareUnexploredGroupAttribute.GROUP_NAME)
         {
         }
 
-        public UnexploredGroupAttribute() : base("unexplored")
+        public UnexploredGroupAttribute() : base(DeclareUnexploredGroupAttribute.GROUP_NAME)
         {
         }
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/UnexploredGroupNextAttribute.cs b/Unity/Assets/Scripts/SCHIZO/TriInspector/Attributes/UnexploredGroupNextAttribute.cs
@@ -4,11 +4,11 @@ namespace SCHIZO.TriInspector.Attributes
 {
     internal class UnexploredGroupNextAttribute : GroupNextAttribute
     {
-        public UnexploredGroupNextAttribute(string insideof) : base(insideof + "/unexplored")
+        public UnexploredGroupNextAttribute(string insideof) : base(insideof + "/" + DeclareUnexploredGroupAttribute.GROUP_NAME)
         {
         }
 
-        public UnexploredGroupNextAttribute() : base("unexplored")
+        public UnexploredGroupNextAttribute() : base(DeclareUnexploredGroupAttribute.GROUP_NAME)
         {
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ namespace SCHIZO.TriInspector.Attributes @@
     {
         internal class ComponentReferencesGroupNextAttribute : GroupNextAttribute
         {
-            public ComponentReferencesGroupNextAttribute() : base(ComponentReferencesGroupAttribute.GROUP_NAME)
+            public ComponentReferencesGroupNextAttribute() : base(DeclareComponentReferencesGroupAttribute.GROUP_NAME)
             {
             }
         }
@@ Expand Down @@