Merge branch 'changes-on-top-of-everything' into tri-inspector-AND-cs…

…c-settings
Alexejhero · Nov 5, 2023 · 0e6171c · 0e6171c
2 parents 7035b58 + ebf1633
commit 0e6171c
Show file tree

Hide file tree

Showing 42 changed files with 54 additions and 132 deletions.
diff --git a/Unity/Assets/Editor/Scripts/PropertyDrawers/CarefulAttributeDrawer.cs b/Unity/Assets/Editor/Scripts/PropertyDrawers/CarefulAttributeDrawer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Reflection;
 using HarmonyLib;
-using SCHIZO.Attributes.Visual;
+using SCHIZO.Attributes;
 using SCHIZO.Items.Data.Crafting;
 using UnityEditor;
 using UnityEngine;

diff --git a/Unity/Assets/Editor/Scripts/PropertyDrawers/ExposedTypeAttributeDrawer.cs b/Unity/Assets/Editor/Scripts/PropertyDrawers/ExposedTypeAttributeDrawer.cs
@@ -1,5 +1,5 @@
 using System;
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.Helpers;
 using UnityEditor;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/ECCLibrary/SwimInSchoolFieldSetter.cs b/Unity/Assets/Scripts/ECCLibrary/SwimInSchoolFieldSetter.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Diagnostics;
+using UnityEngine;
+
+namespace SCHIZO.Attributes;
+
+[AttributeUsage(AttributeTargets.Field)]
+[Conditional("UNITY_STANDALONE")]
+internal sealed class CarefulAttribute : PropertyAttribute
+{
+}
diff --git a/...ttributes/Visual/CarefulAttribute.cs.meta → ...CHIZO/Attributes/CarefulAttribute.cs.meta b/...ttributes/Visual/CarefulAttribute.cs.meta → ...CHIZO/Attributes/CarefulAttribute.cs.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Diagnostics;
+using UnityEngine;
+
+namespace SCHIZO.Attributes;
+
+[AttributeUsage(AttributeTargets.Field)]
+[Conditional("UNITY_STANDALONE")]
+internal sealed class ExposedTypeAttribute(string typeName) : PropertyAttribute
+{
+    public readonly string typeName = typeName;
+}
diff --git a/...butes/Typing/ExposedTypeAttribute.cs.meta → ...O/Attributes/ExposedTypeAttribute.cs.meta b/...butes/Typing/ExposedTypeAttribute.cs.meta → ...O/Attributes/ExposedTypeAttribute.cs.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs
diff --git a/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
+using SCHIZO.Attributes;
 using TriInspector;
 using SCHIZO.Interop.Subnautica;
-using SCHIZO.Attributes.Typing;
 using SCHIZO.Sounds.Players;
 using UnityEngine;
 

diff --git a/Unity/Assets/Scripts/SCHIZO/HullPlates/HullPlate.cs b/Unity/Assets/Scripts/SCHIZO/HullPlates/HullPlate.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Visual;
+using SCHIZO.Attributes;
 using TriInspector;
 using UnityEngine;
 

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("CaveCrawler")]
     public abstract partial class _CaveCrawler
     {
         protected const string CAVE_CRAWLER_GROUP = "basecavecrawler";

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("CaveCrawlerGravity")]
     public abstract partial class _CaveCrawlerGravity
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_Creature.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_Creature.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_Creature.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_Creature.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("Creature")]
     public abstract partial class _Creature
     {
         protected const string CREATURE_GROUP = "basecreature";

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureAction.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureAction.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureAction.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureAction.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
 namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("CreatureAction")]
     public abstract partial class _CreatureAction
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("CreatureTool")]
     public abstract partial class _CreatureTool
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_DropTool.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_DropTool.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("DropTool")]
     public abstract partial class _DropTool
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMOD_CustomEmitter.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_FMOD_CustomEmitter.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("FMOD_CustomEmitter")]
     public abstract partial class _FMOD_CustomEmitter
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("LandCreatureGravity")]
     public abstract partial class _LandCreatureGravity
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.Unity.cs
@@ -1,5 +1,5 @@
-using TriInspector;
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
+using TriInspector;
 using SCHIZO.TriInspector;
 using UnityEngine;
 

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("MeleeAttack")]
     public abstract partial class _MeleeAttack
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_ModelPlug.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_ModelPlug.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("ModelPlug")]
     public abstract partial class _ModelPlug
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.Unity.cs
@@ -1,4 +1,4 @@
-using SCHIZO.Attributes.Typing;
+using SCHIZO.Attributes;
 using SCHIZO.TriInspector;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.cs b/Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.cs
@@ -1,8 +1,5 @@
-using SCHIZO.Attributes.Typing;
-
-namespace SCHIZO.Interop.Subnautica
+namespace SCHIZO.Interop.Subnautica
 {
-    [ActualType("PlayerTool")]
     public abstract partial class _PlayerTool
     {
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs b/Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using JetBrains.Annotations;
+using SCHIZO.Attributes;
 using SCHIZO.Interop.Subnautica.Enums;
 using SCHIZO.Interop.Subnautica.Enums.BelowZero;
 using SCHIZO.Interop.Subnautica.Enums.Subnautica;
 using SCHIZO.Items.Data.Crafting;
 using SCHIZO.Registering;
-using SCHIZO.Attributes.Visual;
 using SCHIZO.Sounds;
 using TriInspector;
 using UnityEngine;

diff --git a/Unity/Assets/Scripts/SCHIZO/Jukebox/CustomJukeboxTrack.cs b/Unity/Assets/Scripts/SCHIZO/Jukebox/CustomJukeboxTrack.cs
@@ -1,7 +1,7 @@
 using TriInspector;
 using SCHIZO.Registering;
 using JetBrains.Annotations;
-using SCHIZO.Attributes.Visual;
+using SCHIZO.Attributes;
 using UnityEngine;
 
 namespace SCHIZO.Jukebox

diff --git a/Unity/Assets/Scripts/SCHIZO/Loading/LoadingBackground.cs b/Unity/Assets/Scripts/SCHIZO/Loading/LoadingBackground.cs
@@ -1,5 +1,5 @@
-using SCHIZO.Registering;
-using SCHIZO.Attributes.Visual;
+using SCHIZO.Attributes;
+using SCHIZO.Registering;
 using UnityEngine;
 
 namespace SCHIZO.Loading

diff --git a/Unity/Assets/Scripts/SCHIZO/Options/Generic/ModOption.cs b/Unity/Assets/Scripts/SCHIZO/Options/Generic/ModOption.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
+using SCHIZO.Attributes;
 using SCHIZO.Options.Bool;
-using SCHIZO.Attributes.Visual;
 using TriInspector;
 using UnityEngine;
 

diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using JetBrains.Annotations;
+using SCHIZO.Attributes;
 using SCHIZO.Options.Float;
-using SCHIZO.Attributes.Typing;
 using TriInspector;
 using UnityEngine;
 

diff --git a/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs b/Unity/Assets/Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
+using SCHIZO.Attributes;
 using SCHIZO.Options.Float;
-using SCHIZO.Attributes.Typing;
 using UnityEngine;
 
 namespace SCHIZO.Sounds.Players

diff --git a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs
diff --git a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta b/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta