From 024826765bb01d691906a835d7a8ef397fb139e5 Mon Sep 17 00:00:00 2001 From: Alexejhero <32238504+Alexejhero@users.noreply.github.com> Date: Sun, 5 Nov 2023 12:52:06 +0200 Subject: [PATCH 1/3] Create patch to disable annoying csc settings log --- .../Scripts/Patches/DisableCscSettingsLog.cs | 29 +++++++++++++++++++ .../Patches/DisableCscSettingsLog.cs.meta | 3 ++ .../Scripts/Patches/Editor.Patches.asmdef | 23 +++++++++++++++ .../Patches/Editor.Patches.asmdef.meta | 3 ++ 4 files changed, 58 insertions(+) create mode 100644 Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs create mode 100644 Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs.meta create mode 100644 Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef create mode 100644 Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef.meta diff --git a/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs b/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs new file mode 100644 index 00000000..ce392196 --- /dev/null +++ b/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs @@ -0,0 +1,29 @@ +using System; +using System.Reflection; +using HarmonyLib; +using UnityEditor; +using UnityEngine; + +namespace Editor.Scripts.Patches; + +public class DisableCscSettingsLog : AssetPostprocessor +{ + private static readonly MethodInfo _targetMethod = AccessTools.Method(typeof(Debug), nameof(Debug.Log), new[] {typeof(object)}); + + public override int GetPostprocessOrder() => int.MaxValue; + + private static string OnGeneratedCSProject(string path, string content) + { + if (!(Harmony.GetPatchInfo(_targetMethod)?.Prefixes?.Count > 0)) + { + new Harmony(new Guid().ToString()).Patch(_targetMethod, new HarmonyMethod(typeof(DisableCscSettingsLog), nameof(Prefix))); + } + + return content; + } + + public static bool Prefix(object message) + { + return !message.ToString().Contains("OnGeneratedCSProject"); + } +} diff --git a/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs.meta b/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs.meta new file mode 100644 index 00000000..06d57797 --- /dev/null +++ b/Unity/Assets/Editor/Scripts/Patches/DisableCscSettingsLog.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4eff0bb549614b1db4e7af16ced3a1e1 +timeCreated: 1699179491 \ No newline at end of file diff --git a/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef b/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef new file mode 100644 index 00000000..ef318926 --- /dev/null +++ b/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef @@ -0,0 +1,23 @@ +{ + "name": "Editor.Patches", + "references": [ + "GUID:3d316254c8cfea64cb626dce93a4def6", + "GUID:c4b8fc492eac8184fb9a42684cf8c464", + "GUID:776d03a35f1b52c4a9aed9f56d7b4229", + "GUID:f88fb04354076c646a4107a491394033", + "GUID:6ed54bcbddd234d55b95cd3dd4df4bec" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "0Harmony.dll" + ], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef.meta b/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef.meta new file mode 100644 index 00000000..c5b3d133 --- /dev/null +++ b/Unity/Assets/Editor/Scripts/Patches/Editor.Patches.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ed48f85bfd774e35b975544074a70957 +timeCreated: 1699180909 \ No newline at end of file From a8194905c717a9d333b0cef9bfc4232a981af297 Mon Sep 17 00:00:00 2001 From: Alexejhero <32238504+Alexejhero@users.noreply.github.com> Date: Sun, 5 Nov 2023 12:59:46 +0200 Subject: [PATCH 2/3] Remove old unused attributes --- .../SCHIZO/Attributes/CarefulAttribute.cs | 11 +++++++++++ .../{Visual => }/CarefulAttribute.cs.meta | 0 .../SCHIZO/Attributes/ExposedTypeAttribute.cs | 12 ++++++++++++ .../{Typing => }/ExposedTypeAttribute.cs.meta | 0 .../Scripts/SCHIZO/Attributes/Typing.meta | 3 --- .../Attributes/Typing/ActualTypeAttribute.cs | 17 ----------------- .../Typing/ActualTypeAttribute.cs.meta | 3 --- .../Attributes/Typing/ExposedTypeAttribute.cs | 18 ------------------ .../Scripts/SCHIZO/Attributes/Visual.meta | 3 --- .../Attributes/Visual/CarefulAttribute.cs | 12 ------------ .../Scripts/SCHIZO/Utilities/STRINGS.Unity.cs | 9 --------- .../SCHIZO/Utilities/STRINGS.Unity.cs.meta | 3 --- 12 files changed, 23 insertions(+), 68 deletions(-) create mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs rename Unity/Assets/Scripts/SCHIZO/Attributes/{Visual => }/CarefulAttribute.cs.meta (100%) create mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs rename Unity/Assets/Scripts/SCHIZO/Attributes/{Typing => }/ExposedTypeAttribute.cs.meta (100%) delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta delete mode 100644 Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs delete mode 100644 Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs delete mode 100644 Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs new file mode 100644 index 00000000..4fc27bd2 --- /dev/null +++ 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 +{ +} \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs.meta similarity index 100% rename from Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs.meta rename to Unity/Assets/Scripts/SCHIZO/Attributes/CarefulAttribute.cs.meta diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs new file mode 100644 index 00000000..287b36c1 --- /dev/null +++ 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/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs.meta similarity index 100% rename from Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs.meta rename to Unity/Assets/Scripts/SCHIZO/Attributes/ExposedTypeAttribute.cs.meta diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta deleted file mode 100644 index 7cca0032..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 8dbe4a4599364fda8e019db6e1ba7009 -timeCreated: 1697401342 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs deleted file mode 100644 index 67b7ae9a..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Diagnostics; - -namespace SCHIZO.Attributes.Typing -{ - [AttributeUsage(AttributeTargets.Class)] - [Conditional("UNITY_STANDALONE")] - internal sealed class ActualTypeAttribute : Attribute - { - public string typeName; - - public ActualTypeAttribute(string typeName) - { - this.typeName = typeName; - } - } -} diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta deleted file mode 100644 index 23a5d966..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ActualTypeAttribute.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d2e8e9b36f7b4bd28d2b2b7ed40cc60d -timeCreated: 1697388179 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs deleted file mode 100644 index f45e83d1..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Typing/ExposedTypeAttribute.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Diagnostics; -using UnityEngine; - -namespace SCHIZO.Attributes.Typing -{ - [AttributeUsage(AttributeTargets.Field)] - [Conditional("UNITY_STANDALONE")] - internal sealed class ExposedTypeAttribute : PropertyAttribute - { - public string typeName; - - public ExposedTypeAttribute(string typeName) - { - this.typeName = typeName; - } - } -} diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta b/Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta deleted file mode 100644 index 8c980b63..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d8ee05c291f14f3a9aecca0ad0803984 -timeCreated: 1697493988 \ No newline at end of file diff --git a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs b/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs deleted file mode 100644 index a708827c..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Attributes/Visual/CarefulAttribute.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Diagnostics; -using UnityEngine; - -namespace SCHIZO.Attributes.Visual -{ - [AttributeUsage(AttributeTargets.Field)] - [Conditional("UNITY_STANDALONE")] - internal sealed class CarefulAttribute : PropertyAttribute - { - } -} diff --git a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs b/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs deleted file mode 100644 index a42bf631..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace SCHIZO.Utilities -{ - public static class STRINGS - { - public const string COMPONENT_REFERENCES = "Component References"; - public const string UNCHANGED_BY_ECC = "Unchanged By ECC"; - public const string ASSIGNED_AT_RUNTIME = "Assigned At Runtime"; - } -} diff --git a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta b/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta deleted file mode 100644 index 33da8d66..00000000 --- a/Unity/Assets/Scripts/SCHIZO/Utilities/STRINGS.Unity.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e442bfa03afd4b4f985d38bf91473d51 -timeCreated: 1696614302 \ No newline at end of file From ebf163375bf843ac0a6c46e0ee3584631dab809a Mon Sep 17 00:00:00 2001 From: Alexejhero <32238504+Alexejhero@users.noreply.github.com> Date: Sun, 5 Nov 2023 13:34:21 +0200 Subject: [PATCH 3/3] Update usages of removed attributes --- .../Editor/Scripts/PropertyDrawers/CarefulAttributeDrawer.cs | 2 +- .../Scripts/PropertyDrawers/ExposedTypeAttributeDrawer.cs | 2 +- Unity/Assets/Scripts/ECCLibrary/SwimInSchoolFieldSetter.cs | 2 +- Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs | 2 +- Unity/Assets/Scripts/SCHIZO/HullPlates/HullPlate.cs | 2 +- .../Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.Unity.cs | 2 +- .../Assets/Scripts/SCHIZO/Interop/Subnautica/_CaveCrawler.cs | 5 +---- .../SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.Unity.cs | 2 +- .../Scripts/SCHIZO/Interop/Subnautica/_CaveCrawlerGravity.cs | 5 +---- .../Scripts/SCHIZO/Interop/Subnautica/_Creature.Unity.cs | 2 +- Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_Creature.cs | 5 +---- .../SCHIZO/Interop/Subnautica/_CreatureAction.Unity.cs | 2 +- .../Scripts/SCHIZO/Interop/Subnautica/_CreatureAction.cs | 3 --- .../Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.Unity.cs | 2 +- .../Scripts/SCHIZO/Interop/Subnautica/_CreatureTool.cs | 5 +---- Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_DropTool.cs | 5 +---- .../Scripts/SCHIZO/Interop/Subnautica/_FMOD_CustomEmitter.cs | 5 +---- .../SCHIZO/Interop/Subnautica/_LandCreatureGravity.Unity.cs | 2 +- .../SCHIZO/Interop/Subnautica/_LandCreatureGravity.cs | 5 +---- .../Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.Unity.cs | 4 ++-- .../Assets/Scripts/SCHIZO/Interop/Subnautica/_MeleeAttack.cs | 5 +---- Unity/Assets/Scripts/SCHIZO/Interop/Subnautica/_ModelPlug.cs | 5 +---- .../Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.Unity.cs | 2 +- .../Assets/Scripts/SCHIZO/Interop/Subnautica/_PlayerTool.cs | 5 +---- Unity/Assets/Scripts/SCHIZO/Items/Data/ItemData.cs | 2 +- Unity/Assets/Scripts/SCHIZO/Jukebox/CustomJukeboxTrack.cs | 2 +- Unity/Assets/Scripts/SCHIZO/Loading/LoadingBackground.cs | 4 ++-- Unity/Assets/Scripts/SCHIZO/Options/Generic/ModOption.cs | 2 +- .../SCHIZO/Sounds/Players/InventoryAmbientSoundPlayer.cs | 2 +- .../Scripts/SCHIZO/Sounds/Players/WorldAmbientSoundPlayer.cs | 2 +- 30 files changed, 31 insertions(+), 64 deletions(-) diff --git a/Unity/Assets/Editor/Scripts/PropertyDrawers/CarefulAttributeDrawer.cs b/Unity/Assets/Editor/Scripts/PropertyDrawers/CarefulAttributeDrawer.cs index 3f9c8add..bc43d810 100644 --- 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 index 40838448..a4127f94 100644 --- 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 index 63f49f37..33035f87 100644 --- 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/Creatures/Ermshark/Ermshark.cs b/Unity/Assets/Scripts/SCHIZO/Creatures/Ermshark/Ermshark.cs index 5bf0f862..036c0757 100644 --- 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 index f2b04c8d..eebd9b3d 100644 --- 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 index f633e297..407e9a01 100644 --- 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 index f9b7b7da..896de3fe 100644 --- 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 index b1b1e9eb..df20d0c7 100644 --- 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 index ed79fbc1..e5e72beb 100644 --- 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 index 1d211a95..eb32a6ca 100644 --- 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 index 0a5e1776..34b5e55b 100644 --- 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 index 196bf530..f5702b11 100644 --- 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 index f9e2a0f2..047771d3 100644 --- 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 index d4d91b82..84d1ad51 100644 --- 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 index c27db519..d7ba7e70 100644 --- 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 index dfe52202..7accaaf4 100644 --- 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 index 58de74d9..5b8bdee4 100644 --- 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 index 2aeb1fda..278e143e 100644 --- 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 index 42b8bc8f..15301ecf 100644 --- 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 index 8bbc3529..cccfd0f1 100644 --- 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 index db39cc42..567fee33 100644 --- 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 index 65154514..c892f7d9 100644 --- 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 index 38d8f512..524a4628 100644 --- 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 index ebad8036..732af367 100644 --- 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 index 5e009a93..de6ecc0f 100644 --- 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 index f5b96598..4589df5a 100644 --- 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 index 85b4d344..ad83c08e 100644 --- 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 index 16f29101..7559c791 100644 --- 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 index 77b504f4..67c5c363 100644 --- 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 index 03db1b92..5677e31e 100644 --- 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