diff --git a/src/Items/Attributes/StaticClassesAttribute.cs b/src/Attributes/StaticClassesAttribute.cs similarity index 96% rename from src/Items/Attributes/StaticClassesAttribute.cs rename to src/Attributes/StaticClassesAttribute.cs index b796503..d9291c8 100644 --- a/src/Items/Attributes/StaticClassesAttribute.cs +++ b/src/Attributes/StaticClassesAttribute.cs @@ -1,8 +1,7 @@ using BetterAmongUs.Commands; -using BetterAmongUs.Modules.AntiCheat; using System.Reflection; -namespace BetterAmongUs.Items.Attributes; +namespace BetterAmongUs.Attributes; internal abstract class InstanceAttribute : Attribute { diff --git a/src/BAUPlugin.cs b/src/BAUPlugin.cs index cd3ea31..d3320df 100644 --- a/src/BAUPlugin.cs +++ b/src/BAUPlugin.cs @@ -2,10 +2,10 @@ using BepInEx.Configuration; using BepInEx.Logging; using BepInEx.Unity.IL2CPP; +using BetterAmongUs.Attributes; using BetterAmongUs.Data; using BetterAmongUs.Data.Json; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; using BetterAmongUs.Modules; using BetterAmongUs.Network; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Commands/AllCommandsCommand.cs b/src/Commands/AllCommandsCommand.cs index eb14776..1a373cb 100644 --- a/src/Commands/AllCommandsCommand.cs +++ b/src/Commands/AllCommandsCommand.cs @@ -1,5 +1,5 @@ -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; +using BetterAmongUs.Enums; namespace BetterAmongUs.Commands; diff --git a/src/Commands/BaseCommand.cs b/src/Commands/BaseCommand.cs index 0901ebf..37da32d 100644 --- a/src/Commands/BaseCommand.cs +++ b/src/Commands/BaseCommand.cs @@ -1,7 +1,7 @@ -using BetterAmongUs.Commands.Arguments; +using BetterAmongUs.Attributes; +using BetterAmongUs.Commands.Arguments; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; namespace BetterAmongUs.Commands; diff --git a/src/Commands/DumpCommand.cs b/src/Commands/DumpCommand.cs index 04a2811..0bc3175 100644 --- a/src/Commands/DumpCommand.cs +++ b/src/Commands/DumpCommand.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Data; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Modules; namespace BetterAmongUs.Commands; diff --git a/src/Commands/EndGameCommand.cs b/src/Commands/EndGameCommand.cs index f2b645f..e21cafb 100644 --- a/src/Commands/EndGameCommand.cs +++ b/src/Commands/EndGameCommand.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Modules; namespace BetterAmongUs.Commands; diff --git a/src/Commands/HelpCommand.cs b/src/Commands/HelpCommand.cs index e1926b4..19e40de 100644 --- a/src/Commands/HelpCommand.cs +++ b/src/Commands/HelpCommand.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Commands; diff --git a/src/Commands/KickCommand.cs b/src/Commands/KickCommand.cs index 811cd41..bb0eef9 100644 --- a/src/Commands/KickCommand.cs +++ b/src/Commands/KickCommand.cs @@ -1,6 +1,6 @@ using BetterAmongUs.Commands.Arguments; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Modules; namespace BetterAmongUs.Commands; diff --git a/src/Commands/PlayerInfoCommand.cs b/src/Commands/PlayerInfoCommand.cs index b469a3a..84109ff 100644 --- a/src/Commands/PlayerInfoCommand.cs +++ b/src/Commands/PlayerInfoCommand.cs @@ -1,6 +1,6 @@ using BetterAmongUs.Commands.Arguments; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using System.Text; namespace BetterAmongUs.Commands; diff --git a/src/Commands/PlayersInfoCommand.cs b/src/Commands/PlayersInfoCommand.cs index 69034d0..d988d2b 100644 --- a/src/Commands/PlayersInfoCommand.cs +++ b/src/Commands/PlayersInfoCommand.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using System.Text; namespace BetterAmongUs.Commands; diff --git a/src/Commands/RemoveAllCommand.cs b/src/Commands/RemoveAllCommand.cs index 840259f..6a0ce2b 100644 --- a/src/Commands/RemoveAllCommand.cs +++ b/src/Commands/RemoveAllCommand.cs @@ -1,6 +1,6 @@ using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Commands; diff --git a/src/Commands/RemovePlayerCommand.cs b/src/Commands/RemovePlayerCommand.cs index 3df48b9..99e79b2 100644 --- a/src/Commands/RemovePlayerCommand.cs +++ b/src/Commands/RemovePlayerCommand.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Commands.Arguments; using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Commands; diff --git a/src/Commands/SetPrefixCommand.cs b/src/Commands/SetPrefixCommand.cs index 02669cd..06b1b14 100644 --- a/src/Commands/SetPrefixCommand.cs +++ b/src/Commands/SetPrefixCommand.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Commands.Arguments; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Commands; diff --git a/src/Data/Json/BetterDataFile.cs b/src/Data/Json/BetterDataFile.cs index 7acb728..c04c866 100644 --- a/src/Data/Json/BetterDataFile.cs +++ b/src/Data/Json/BetterDataFile.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Structs; +using BetterAmongUs.Structs; using System.Text.Json.Serialization; namespace BetterAmongUs.Data.Json; diff --git a/src/Items/Enums/CommandType.cs b/src/Enums/CommandType.cs similarity index 51% rename from src/Items/Enums/CommandType.cs rename to src/Enums/CommandType.cs index 3613882..ac8cd5e 100644 --- a/src/Items/Enums/CommandType.cs +++ b/src/Enums/CommandType.cs @@ -1,4 +1,4 @@ -namespace BetterAmongUs.Items.Enums; +namespace BetterAmongUs.Enums; internal enum CommandType { diff --git a/src/Items/Enums/CustomRPC.cs b/src/Enums/CustomRPC.cs similarity index 88% rename from src/Items/Enums/CustomRPC.cs rename to src/Enums/CustomRPC.cs index cf14f95..8b06d54 100644 --- a/src/Items/Enums/CustomRPC.cs +++ b/src/Enums/CustomRPC.cs @@ -1,4 +1,4 @@ -namespace BetterAmongUs.Items.Enums; +namespace BetterAmongUs.Enums; internal enum CustomRPC : int { diff --git a/src/Items/Enums/HandlerFlag.cs b/src/Enums/HandlerFlag.cs similarity index 77% rename from src/Items/Enums/HandlerFlag.cs rename to src/Enums/HandlerFlag.cs index b2edfe4..9016d61 100644 --- a/src/Items/Enums/HandlerFlag.cs +++ b/src/Enums/HandlerFlag.cs @@ -1,4 +1,4 @@ -namespace BetterAmongUs.Items.Enums; +namespace BetterAmongUs.Enums; internal enum HandlerFlag { diff --git a/src/Items/Enums/NewsTypes.cs b/src/Enums/NewsTypes.cs similarity index 54% rename from src/Items/Enums/NewsTypes.cs rename to src/Enums/NewsTypes.cs index da34fcc..fad12de 100644 --- a/src/Items/Enums/NewsTypes.cs +++ b/src/Enums/NewsTypes.cs @@ -1,4 +1,4 @@ -namespace BetterAmongUs.Items.Enums; +namespace BetterAmongUs.Enums; internal enum NewsTypes { diff --git a/src/Managers/NetworkManager.cs b/src/Managers/NetworkManager.cs index 9b855e5..f61d9c7 100644 --- a/src/Managers/NetworkManager.cs +++ b/src/Managers/NetworkManager.cs @@ -1,12 +1,12 @@ using AmongUs.InnerNet.GameDataMessages; using BepInEx.Unity.IL2CPP.Utils; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Enums; -using BetterAmongUs.Items.Structs; using BetterAmongUs.Modules; using BetterAmongUs.Modules.AntiCheat; using BetterAmongUs.Mono; using BetterAmongUs.Network; +using BetterAmongUs.Structs; using HarmonyLib; using Hazel; using InnerNet; diff --git a/src/Modules/AntiCheat/BetterAntiCheat.cs b/src/Modules/AntiCheat/BetterAntiCheat.cs index dca7577..25e7371 100644 --- a/src/Modules/AntiCheat/BetterAntiCheat.cs +++ b/src/Modules/AntiCheat/BetterAntiCheat.cs @@ -1,7 +1,7 @@ -using BetterAmongUs.Data; +using BetterAmongUs.Attributes; +using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandler.cs b/src/Modules/AntiCheat/RPCHandler.cs index 4e9ad3a..b7cf76d 100644 --- a/src/Modules/AntiCheat/RPCHandler.cs +++ b/src/Modules/AntiCheat/RPCHandler.cs @@ -1,6 +1,6 @@ -using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; +using BetterAmongUs.Enums; +using BetterAmongUs.Helpers; using BetterAmongUs.Modules; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/AUMChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/AUMChatHandler.cs index 5f38c27..7cdf86f 100644 --- a/src/Modules/AntiCheat/RPCHandlers/AUMChatHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/AUMChatHandler.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/AUMHandler.cs b/src/Modules/AntiCheat/RPCHandlers/AUMHandler.cs index 72c0cd3..65d47c8 100644 --- a/src/Modules/AntiCheat/RPCHandlers/AUMHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/AUMHandler.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs index 5a9c7e0..aaea97a 100644 --- a/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs index 60b626d..5023f12 100644 --- a/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs index da81997..e744dd3 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs index fb5b567..6cbba7d 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs index 03fb195..6d3080d 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs index 6a9bd14..cbcbb0f 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs index ae9433c..732dc8c 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; using InnerNet; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs index a24b025..d71aa2c 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs index 6bd81c4..8180788 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; using InnerNet; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs index 163d556..6a550ef 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; using InnerNet; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs index 43f36c3..e0a313a 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs index fe5beeb..20c9774 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs index 68137c8..569b6b7 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs index ad7199c..45fa246 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs index c484751..c970f26 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs index 297d741..b03d25a 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs index cdd3d13..b19e5c4 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs index 76bfa72..094bc21 100644 --- a/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs index c7691cf..00aecd2 100644 --- a/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs index cd320f2..23336fa 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs index 58aa490..e45f0bf 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs index 3f4d995..38bdf94 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/KillNetworkChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/KillNetworkChatHandler.cs index 8317fb1..9c4b4d1 100644 --- a/src/Modules/AntiCheat/RPCHandlers/KillNetworkChatHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/KillNetworkChatHandler.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/KillNetworkHandler.cs b/src/Modules/AntiCheat/RPCHandlers/KillNetworkHandler.cs index ca0f434..f747167 100644 --- a/src/Modules/AntiCheat/RPCHandlers/KillNetworkHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/KillNetworkHandler.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs b/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs index a6fb9d4..66ec64c 100644 --- a/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs index a793ef5..3d14f76 100644 --- a/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs index 12caad0..f65dc32 100644 --- a/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs b/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs index eaf700a..11aa629 100644 --- a/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs index e5eab64..f139bfc 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs index 2763efc..77a1b64 100644 --- a/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs index 0e03fac..99c4f08 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Patches.Gameplay.UI; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs index 6cb6fac..fc198af 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs @@ -1,7 +1,7 @@ using AmongUs.Data; using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Patches.Gameplay.UI.Settings; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs index af7ec33..b7e9c79 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs index ce712f3..3122669 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs index 7c67b67..480c29e 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs index 90460e4..74cd0f3 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs index 373a50c..f7414f7 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs index 134dc74..bac529c 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs index 7dcbd27..b26e3a1 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs index 58c01a1..ab0da66 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs index 4fb3e3d..141e92f 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs index 988c929..72b1021 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs index 26ff436..6c5a1e4 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs index f1e098d..8bec620 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs index ad889f4..99b43c7 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs index 1fa3aab..a5ba680 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs index 777a849..e0c9701 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs index 004cb82..0ff6c98 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs index 9acb410..56a9421 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs index 3a6c948..123041e 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs index feffd25..ce0ed3f 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs index 98a8473..f8ed391 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs index 5fd3661..3391cc2 100644 --- a/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; using InnerNet; diff --git a/src/Modules/AntiCheat/RPCHandlers/SickoHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SickoHandler.cs index 68cbaa5..27e1bdf 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SickoHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SickoHandler.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using BetterAmongUs.Mono; using BetterAmongUs.Patches.Gameplay.UI.Settings; diff --git a/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs index e8ea11b..b157e4c 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs index 7522143..9c05f45 100644 --- a/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs @@ -1,5 +1,5 @@ +using BetterAmongUs.Attributes; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs index 0cae916..c5b85f8 100644 --- a/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs index cebfcb9..7123f57 100644 --- a/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs @@ -1,6 +1,6 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using BetterAmongUs.Managers; using Hazel; diff --git a/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs index e91b1b8..8ce1d78 100644 --- a/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs b/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs index 2db7988..4f3b7ad 100644 --- a/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs b/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs index 730f487..02a548f 100644 --- a/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; using Hazel; using UnityEngine; diff --git a/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs b/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs index 27aef59..8eeb34d 100644 --- a/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs b/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs index ceb8932..a91fbca 100644 --- a/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs index 7431b45..9bda126 100644 --- a/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs +++ b/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs @@ -1,4 +1,4 @@ -using BetterAmongUs.Items.Attributes; +using BetterAmongUs.Attributes; namespace BetterAmongUs.Modules.AntiCheat; diff --git a/src/Modules/HandshakeHandler.cs b/src/Modules/HandshakeHandler.cs index 2cd701a..ae6b00e 100644 --- a/src/Modules/HandshakeHandler.cs +++ b/src/Modules/HandshakeHandler.cs @@ -1,7 +1,7 @@ using BepInEx.Unity.IL2CPP.Utils; using BetterAmongUs.Data; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Enums; using BetterAmongUs.Mono; using Hazel; using Il2CppInterop.Runtime.Attributes; diff --git a/src/Items/ModNews.cs b/src/Modules/ModNews.cs similarity index 95% rename from src/Items/ModNews.cs rename to src/Modules/ModNews.cs index d3d8987..4fb7dbc 100644 --- a/src/Items/ModNews.cs +++ b/src/Modules/ModNews.cs @@ -1,12 +1,11 @@ using AmongUs.Data; using Assets.InnerNet; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Enums; -using BetterAmongUs.Modules; using BetterAmongUs.Network.Configs; using UnityEngine; -namespace BetterAmongUs.Items; +namespace BetterAmongUs.Modules; internal sealed class ModNews { diff --git a/src/Items/OptionItems/NoneOption/OptionDividerItem.cs b/src/Modules/OptionItems/NoneOption/OptionDividerItem.cs similarity index 96% rename from src/Items/OptionItems/NoneOption/OptionDividerItem.cs rename to src/Modules/OptionItems/NoneOption/OptionDividerItem.cs index 738a6a2..cdb4f89 100644 --- a/src/Items/OptionItems/NoneOption/OptionDividerItem.cs +++ b/src/Modules/OptionItems/NoneOption/OptionDividerItem.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems.NoneOption; +namespace BetterAmongUs.Modules.OptionItems.NoneOption; internal sealed class OptionDividerItem : OptionItem { diff --git a/src/Items/OptionItems/NoneOption/OptionHeaderItem.cs b/src/Modules/OptionItems/NoneOption/OptionHeaderItem.cs similarity index 97% rename from src/Items/OptionItems/NoneOption/OptionHeaderItem.cs rename to src/Modules/OptionItems/NoneOption/OptionHeaderItem.cs index 6ed3398..155a512 100644 --- a/src/Items/OptionItems/NoneOption/OptionHeaderItem.cs +++ b/src/Modules/OptionItems/NoneOption/OptionHeaderItem.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace BetterAmongUs.Items.OptionItems.NoneOption; +namespace BetterAmongUs.Modules.OptionItems.NoneOption; internal sealed class OptionHeaderItem : OptionItem { diff --git a/src/Items/OptionItems/NoneOption/OptionTitleItem.cs b/src/Modules/OptionItems/NoneOption/OptionTitleItem.cs similarity index 97% rename from src/Items/OptionItems/NoneOption/OptionTitleItem.cs rename to src/Modules/OptionItems/NoneOption/OptionTitleItem.cs index df24aa5..c3c7ef6 100644 --- a/src/Items/OptionItems/NoneOption/OptionTitleItem.cs +++ b/src/Modules/OptionItems/NoneOption/OptionTitleItem.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems.NoneOption; +namespace BetterAmongUs.Modules.OptionItems.NoneOption; internal sealed class OptionTitleItem : OptionItem { diff --git a/src/Items/OptionItems/OptionCheckboxItem.cs b/src/Modules/OptionItems/OptionCheckboxItem.cs similarity index 98% rename from src/Items/OptionItems/OptionCheckboxItem.cs rename to src/Modules/OptionItems/OptionCheckboxItem.cs index f9c6c5c..7533d6a 100644 --- a/src/Items/OptionItems/OptionCheckboxItem.cs +++ b/src/Modules/OptionItems/OptionCheckboxItem.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionCheckboxItem : OptionItem { diff --git a/src/Items/OptionItems/OptionFloatItem.cs b/src/Modules/OptionItems/OptionFloatItem.cs similarity index 99% rename from src/Items/OptionItems/OptionFloatItem.cs rename to src/Modules/OptionItems/OptionFloatItem.cs index f7cea6e..ed1d9a2 100644 --- a/src/Items/OptionItems/OptionFloatItem.cs +++ b/src/Modules/OptionItems/OptionFloatItem.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal class OptionFloatItem : OptionItem { diff --git a/src/Items/OptionItems/OptionIntItem.cs b/src/Modules/OptionItems/OptionIntItem.cs similarity index 99% rename from src/Items/OptionItems/OptionIntItem.cs rename to src/Modules/OptionItems/OptionIntItem.cs index 35dccd4..2546930 100644 --- a/src/Items/OptionItems/OptionIntItem.cs +++ b/src/Modules/OptionItems/OptionIntItem.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionIntItem : OptionItem { diff --git a/src/Items/OptionItems/OptionItem.cs b/src/Modules/OptionItems/OptionItem.cs similarity index 99% rename from src/Items/OptionItems/OptionItem.cs rename to src/Modules/OptionItems/OptionItem.cs index a364fac..3a1b705 100644 --- a/src/Items/OptionItems/OptionItem.cs +++ b/src/Modules/OptionItems/OptionItem.cs @@ -1,11 +1,10 @@ using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Modules; using System.Text; using TMPro; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; /// /// Base Option class. diff --git a/src/Items/OptionItems/OptionPercentItem.cs b/src/Modules/OptionItems/OptionPercentItem.cs similarity index 96% rename from src/Items/OptionItems/OptionPercentItem.cs rename to src/Modules/OptionItems/OptionPercentItem.cs index 70ae165..0cb3db1 100644 --- a/src/Items/OptionItems/OptionPercentItem.cs +++ b/src/Modules/OptionItems/OptionPercentItem.cs @@ -1,4 +1,4 @@ -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionPercentItem : OptionFloatItem { diff --git a/src/Items/OptionItems/OptionPlayerItem.cs b/src/Modules/OptionItems/OptionPlayerItem.cs similarity index 98% rename from src/Items/OptionItems/OptionPlayerItem.cs rename to src/Modules/OptionItems/OptionPlayerItem.cs index f890321..6f85edd 100644 --- a/src/Items/OptionItems/OptionPlayerItem.cs +++ b/src/Modules/OptionItems/OptionPlayerItem.cs @@ -1,8 +1,7 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Modules; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionPlayerItem : OptionItem { diff --git a/src/Items/OptionItems/OptionStringItem.cs b/src/Modules/OptionItems/OptionStringItem.cs similarity index 98% rename from src/Items/OptionItems/OptionStringItem.cs rename to src/Modules/OptionItems/OptionStringItem.cs index 1ffc2a6..08af31a 100644 --- a/src/Items/OptionItems/OptionStringItem.cs +++ b/src/Modules/OptionItems/OptionStringItem.cs @@ -1,7 +1,6 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Modules; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionStringItem : OptionItem { diff --git a/src/Items/OptionItems/OptionTab.cs b/src/Modules/OptionItems/OptionTab.cs similarity index 97% rename from src/Items/OptionItems/OptionTab.cs rename to src/Modules/OptionItems/OptionTab.cs index 7838473..7d15dfb 100644 --- a/src/Items/OptionItems/OptionTab.cs +++ b/src/Modules/OptionItems/OptionTab.cs @@ -1,10 +1,9 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.OptionItems.NoneOption; -using BetterAmongUs.Modules; +using BetterAmongUs.Modules.OptionItems.NoneOption; using TMPro; using UnityEngine; -namespace BetterAmongUs.Items.OptionItems; +namespace BetterAmongUs.Modules.OptionItems; internal sealed class OptionTab { diff --git a/src/Mono/MeetingInfoDisplay.cs b/src/Mono/MeetingInfoDisplay.cs index c37887a..6eb1328 100644 --- a/src/Mono/MeetingInfoDisplay.cs +++ b/src/Mono/MeetingInfoDisplay.cs @@ -1,8 +1,8 @@ using AmongUs.GameOptions; using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Structs; using BetterAmongUs.Modules; +using BetterAmongUs.Structs; using Il2CppInterop.Runtime.Attributes; using System.Text; using TMPro; diff --git a/src/Mono/PlayerInfoDisplay.cs b/src/Mono/PlayerInfoDisplay.cs index 07059ff..823f079 100644 --- a/src/Mono/PlayerInfoDisplay.cs +++ b/src/Mono/PlayerInfoDisplay.cs @@ -2,9 +2,9 @@ using AmongUs.GameOptions; using BetterAmongUs.Data; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Structs; using BetterAmongUs.Modules; using BetterAmongUs.Patches.Gameplay.UI.Settings; +using BetterAmongUs.Structs; using HarmonyLib; using Il2CppInterop.Runtime.Attributes; using System.Text; diff --git a/src/Network/Loaders/NewsLoader.cs b/src/Network/Loaders/NewsLoader.cs index 8c58b29..792540e 100644 --- a/src/Network/Loaders/NewsLoader.cs +++ b/src/Network/Loaders/NewsLoader.cs @@ -1,5 +1,5 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items; +using BetterAmongUs.Modules; using BetterAmongUs.Network.Configs; using Il2CppInterop.Runtime.Attributes; using System.Collections; diff --git a/src/Network/RPC.cs b/src/Network/RPC.cs index 300f118..bd71e47 100644 --- a/src/Network/RPC.cs +++ b/src/Network/RPC.cs @@ -1,5 +1,5 @@ -using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Enums; +using BetterAmongUs.Helpers; using BetterAmongUs.Modules; using BetterAmongUs.Mono; using Hazel; diff --git a/src/Patches/Client/AnnouncementPanelPatch.cs b/src/Patches/Client/AnnouncementPanelPatch.cs index fb92617..caf4c4e 100644 --- a/src/Patches/Client/AnnouncementPanelPatch.cs +++ b/src/Patches/Client/AnnouncementPanelPatch.cs @@ -1,8 +1,8 @@ using AmongUs.Data.Player; using Assets.InnerNet; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items; -using BetterAmongUs.Items.Enums; +using BetterAmongUs.Modules; using HarmonyLib; using Il2CppInterop.Runtime.InteropTypes.Arrays; using System.Globalization; diff --git a/src/Patches/Gameplay/LobbyPatch.cs b/src/Patches/Gameplay/LobbyPatch.cs index b13b86d..79727b0 100644 --- a/src/Patches/Gameplay/LobbyPatch.cs +++ b/src/Patches/Gameplay/LobbyPatch.cs @@ -1,6 +1,6 @@ using BetterAmongUs.Helpers; -using BetterAmongUs.Items.OptionItems; using BetterAmongUs.Modules; +using BetterAmongUs.Modules.OptionItems; using HarmonyLib; using UnityEngine; diff --git a/src/Patches/Gameplay/Player/PlayerControlPatch.cs b/src/Patches/Gameplay/Player/PlayerControlPatch.cs index 3904022..6cb14e8 100644 --- a/src/Patches/Gameplay/Player/PlayerControlPatch.cs +++ b/src/Patches/Gameplay/Player/PlayerControlPatch.cs @@ -1,6 +1,6 @@ using BepInEx.Unity.IL2CPP.Utils.Collections; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.OptionItems; +using BetterAmongUs.Modules.OptionItems; using BetterAmongUs.Mono; using HarmonyLib; using System.Collections; diff --git a/src/Patches/Gameplay/UI/Chat/ChatCommandsPatch.cs b/src/Patches/Gameplay/UI/Chat/ChatCommandsPatch.cs index 1f6c5bd..213305e 100644 --- a/src/Patches/Gameplay/UI/Chat/ChatCommandsPatch.cs +++ b/src/Patches/Gameplay/UI/Chat/ChatCommandsPatch.cs @@ -1,6 +1,6 @@ using BetterAmongUs.Commands; +using BetterAmongUs.Enums; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.Enums; using BetterAmongUs.Modules; using HarmonyLib; using TMPro; diff --git a/src/Patches/Gameplay/UI/Settings/GameSettingMenuPatch.cs b/src/Patches/Gameplay/UI/Settings/GameSettingMenuPatch.cs index 3f2c843..7b7eeb8 100644 --- a/src/Patches/Gameplay/UI/Settings/GameSettingMenuPatch.cs +++ b/src/Patches/Gameplay/UI/Settings/GameSettingMenuPatch.cs @@ -1,8 +1,8 @@ using AmongUs.GameOptions; using BetterAmongUs.Helpers; -using BetterAmongUs.Items.OptionItems; -using BetterAmongUs.Items.OptionItems.NoneOption; using BetterAmongUs.Modules; +using BetterAmongUs.Modules.OptionItems; +using BetterAmongUs.Modules.OptionItems.NoneOption; using HarmonyLib; using UnityEngine; diff --git a/src/Items/Structs/RPCData.cs b/src/Structs/RPCData.cs similarity index 91% rename from src/Items/Structs/RPCData.cs rename to src/Structs/RPCData.cs index 072a5f9..790d161 100644 --- a/src/Items/Structs/RPCData.cs +++ b/src/Structs/RPCData.cs @@ -1,7 +1,7 @@ using Hazel; using InnerNet; -namespace BetterAmongUs.Items.Structs; +namespace BetterAmongUs.Structs; internal readonly struct RPCData(InnerNetObject sender, SendOption sendOption, int targetId, RpcCalls callId, MessageReader reader) { diff --git a/src/Items/Structs/UserInfo.cs b/src/Structs/UserInfo.cs similarity index 82% rename from src/Items/Structs/UserInfo.cs rename to src/Structs/UserInfo.cs index 7f3c306..a116c9c 100644 --- a/src/Items/Structs/UserInfo.cs +++ b/src/Structs/UserInfo.cs @@ -1,7 +1,7 @@ using BetterAmongUs.Helpers; using System.Text.Json.Serialization; -namespace BetterAmongUs.Items.Structs; +namespace BetterAmongUs.Structs; [method: JsonConstructor] internal sealed class UserInfo(string playerName, string hashPuid, string friendCode, string reason) @@ -10,8 +10,8 @@ internal sealed class UserInfo(string playerName, string hashPuid, string friend internal (bool check, string reason) CheckPlayerDataWithReason(NetworkedPlayerInfo data) { - if ((!string.IsNullOrEmpty(data.GetHashPuid()) && HashPuid == data.GetHashPuid()) - || (!string.IsNullOrEmpty(data.FriendCode) && FriendCode == data.FriendCode)) + if (!string.IsNullOrEmpty(data.GetHashPuid()) && HashPuid == data.GetHashPuid() + || !string.IsNullOrEmpty(data.FriendCode) && FriendCode == data.FriendCode) { return (true, Reason); }