diff --git a/NwPluginAPI/Commands/CommandsManager.cs b/NwPluginAPI/Commands/CommandsManager.cs index 03fc49a..ba4d66b 100644 --- a/NwPluginAPI/Commands/CommandsManager.cs +++ b/NwPluginAPI/Commands/CommandsManager.cs @@ -1,11 +1,11 @@ namespace PluginAPI.Commands { - using System; - using System.Collections.Generic; - using System.Linq; using CommandSystem; using PluginAPI.Core; using RemoteAdmin; + using System; + using System.Collections.Generic; + using System.Linq; /// /// Manages commands. diff --git a/NwPluginAPI/Commands/ListCommand.cs b/NwPluginAPI/Commands/ListCommand.cs index 17b37d3..51a2267 100644 --- a/NwPluginAPI/Commands/ListCommand.cs +++ b/NwPluginAPI/Commands/ListCommand.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Commands { - using System; - using System.Collections.Generic; using CommandSystem; using Loader; + using System; + using System.Collections.Generic; /// /// Lists all plugins on the server. diff --git a/NwPluginAPI/Commands/ReloadCommand.cs b/NwPluginAPI/Commands/ReloadCommand.cs index 3f100e5..79b3ba5 100644 --- a/NwPluginAPI/Commands/ReloadCommand.cs +++ b/NwPluginAPI/Commands/ReloadCommand.cs @@ -29,30 +29,30 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s switch (arguments.At(0).ToLowerInvariant()) { case "plugins": - { - var plugins = new List(); - - foreach (var plugin in AssemblyLoader.InstalledPlugins) { - plugin.ReloadConfig(plugin); - plugins.Add($"{plugin.PluginName}"); - } + var plugins = new List(); - response = - $"{(plugins.Count == 0 ? "Reloaded 0 plugin configs!" : $"Reloaded {string.Join(", ", plugins)} plugin configs!")}"; - return true; - } + foreach (var plugin in AssemblyLoader.InstalledPlugins) + { + plugin.ReloadConfig(plugin); + plugins.Add($"{plugin.PluginName}"); + } + + response = + $"{(plugins.Count == 0 ? "Reloaded 0 plugin configs!" : $"Reloaded {string.Join(", ", plugins)} plugin configs!")}"; + return true; + } case "gameplay": - { - GameCore.ConfigFile.ReloadGameConfigs(); - response = $"config_gameplay successfully reloaded"; - return true; - } + { + GameCore.ConfigFile.ReloadGameConfigs(); + response = $"config_gameplay successfully reloaded"; + return true; + } default: - { - response = $"Please specify a valid argument\nUsage: plugins reload {this.DisplayCommandUsage()}"; - return false; - } + { + response = $"Please specify a valid argument\nUsage: plugins reload {this.DisplayCommandUsage()}"; + return false; + } } } } diff --git a/NwPluginAPI/Core/Cassie.cs b/NwPluginAPI/Core/Cassie.cs index c0576f6..c702b96 100644 --- a/NwPluginAPI/Core/Cassie.cs +++ b/NwPluginAPI/Core/Cassie.cs @@ -12,7 +12,7 @@ namespace PluginAPI.Core /// public static class Cassie { -#region Static Parameters + #region Static Parameters /// /// Gets whether or not CASSIE is speaking. @@ -24,11 +24,11 @@ public static class Cassie /// public static IEnumerable VoiceLines => singleton.voiceLines; -#endregion + #endregion -#region Static Methods + #region Static Methods -#region Sending messages. + #region Sending messages. /// /// Send CASSIE message without glitch phrases. @@ -47,14 +47,14 @@ public static class Cassie /// The chance of jamming each word. public static void GlitchyMessage(string message, float glitchChance, float jamChance) => singleton.ServerOnlyAddGlitchyPhrase(message, glitchChance, jamChance); -#endregion + #endregion /// /// Clears all CASSIE messages in queue. /// public static void Clear() => RespawnEffectsController.ClearQueue(); -#region Utils. + #region Utils. /// /// Calculates duration of a CASSIE message. @@ -82,7 +82,7 @@ public static class Cassie /// The word. public static bool IsValid(string word) => singleton.voiceLines.Any(line => line.apiName.ToUpper() == word.ToUpper()); -#endregion + #endregion /// /// Forces an scp termination announcement. @@ -92,6 +92,6 @@ public static class Cassie public static void ScpTermination(Player player, DamageHandlerBase info) => AnnounceScpTermination(player.ReferenceHub, info); -#endregion + #endregion } } \ No newline at end of file diff --git a/NwPluginAPI/Core/Doors/FacilityBreakableDoor.cs b/NwPluginAPI/Core/Doors/FacilityBreakableDoor.cs index 47f9293..98f74e9 100644 --- a/NwPluginAPI/Core/Doors/FacilityBreakableDoor.cs +++ b/NwPluginAPI/Core/Doors/FacilityBreakableDoor.cs @@ -1,11 +1,11 @@ namespace PluginAPI.Core.Doors { + using Core; using Interactables.Interobjects; using Interactables.Interobjects.DoorUtils; - using Core; - using Zones; using System.Collections.Generic; using System.Linq; + using Zones; /// /// Represents a breakable door. diff --git a/NwPluginAPI/Core/Doors/FacilityDoor.cs b/NwPluginAPI/Core/Doors/FacilityDoor.cs index dec084f..ba90e56 100644 --- a/NwPluginAPI/Core/Doors/FacilityDoor.cs +++ b/NwPluginAPI/Core/Doors/FacilityDoor.cs @@ -1,12 +1,12 @@ namespace PluginAPI.Core.Doors { - using System.Linq; + using Core; using Interactables.Interobjects.DoorUtils; using MapGeneration; - using Core; - using Zones; using System.Collections.Generic; + using System.Linq; using UnityEngine; + using Zones; /// /// Represents a door. diff --git a/NwPluginAPI/Core/Doors/FacilityGate.cs b/NwPluginAPI/Core/Doors/FacilityGate.cs index 2e5919b..2cbdfbd 100644 --- a/NwPluginAPI/Core/Doors/FacilityGate.cs +++ b/NwPluginAPI/Core/Doors/FacilityGate.cs @@ -1,11 +1,11 @@ namespace PluginAPI.Core.Doors { - using Interactables.Interobjects; using Core; - using Zones; + using Interactables.Interobjects; using System.Collections.Generic; using System.Linq; using UnityEngine; + using Zones; /// /// Represents a gate. diff --git a/NwPluginAPI/Core/Extensions/PlayerExtensions.cs b/NwPluginAPI/Core/Extensions/PlayerExtensions.cs index 6f46088..cee913b 100644 --- a/NwPluginAPI/Core/Extensions/PlayerExtensions.cs +++ b/NwPluginAPI/Core/Extensions/PlayerExtensions.cs @@ -1,4 +1,4 @@ -namespace PluginAPI.Core +namespace PluginAPI.Core.Extensions { using InventorySystem.Configs; @@ -20,5 +20,7 @@ public static class PlayerExtensions /// The item category. /// Maximum amount of items which player can hold. public static int GetCategoryLimit(this Player plr, ItemCategory category) => InventoryLimits.GetCategoryLimit(category, plr.ReferenceHub); + + } } \ No newline at end of file diff --git a/NwPluginAPI/Core/Facility.cs b/NwPluginAPI/Core/Facility.cs index 3dc8a2a..82bea3f 100644 --- a/NwPluginAPI/Core/Facility.cs +++ b/NwPluginAPI/Core/Facility.cs @@ -1,14 +1,14 @@ namespace PluginAPI.Core { + using Doors; using Interactables.Interobjects; using Interactables.Interobjects.DoorUtils; using MapGeneration; - using Doors; - using Zones; using System; using System.Collections.Generic; using System.Linq; using UnityEngine; + using Zones; using FacilityZone = Zones.FacilityZone; /// diff --git a/NwPluginAPI/Core/FactoryManager.cs b/NwPluginAPI/Core/FactoryManager.cs index 8be8ed1..54247ed 100644 --- a/NwPluginAPI/Core/FactoryManager.cs +++ b/NwPluginAPI/Core/FactoryManager.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Core { + using Events; + using Factories; using System; using System.Collections.Generic; - using Factories; - using Events; /// /// Manages factories for plugin system. diff --git a/NwPluginAPI/Core/Items/Item.cs b/NwPluginAPI/Core/Items/Item.cs index 4d0b3a5..34de9c6 100644 --- a/NwPluginAPI/Core/Items/Item.cs +++ b/NwPluginAPI/Core/Items/Item.cs @@ -1,7 +1,7 @@ namespace PluginAPI.Core.Items { - using InventorySystem.Items; using Core; + using InventorySystem.Items; using System.Collections.Generic; using UnityEngine; diff --git a/NwPluginAPI/Core/Items/ItemPickup.cs b/NwPluginAPI/Core/Items/ItemPickup.cs index 69e8e29..2d7c7fe 100644 --- a/NwPluginAPI/Core/Items/ItemPickup.cs +++ b/NwPluginAPI/Core/Items/ItemPickup.cs @@ -1,10 +1,10 @@ namespace PluginAPI.Core.Items { + using Core; using InventorySystem; using InventorySystem.Items; using InventorySystem.Items.Pickups; using Mirror; - using Core; using System.Collections.Generic; using UnityEngine; diff --git a/NwPluginAPI/Core/Log.cs b/NwPluginAPI/Core/Log.cs index c07b64b..c51558e 100644 --- a/NwPluginAPI/Core/Log.cs +++ b/NwPluginAPI/Core/Log.cs @@ -1,10 +1,10 @@ namespace PluginAPI.Core { - using System; - using System.Reflection; using Enums; using GameCore; using PluginAPI.Loader; + using System; + using System.Reflection; /// /// Logger for plugin system. diff --git a/NwPluginAPI/Core/Map.cs b/NwPluginAPI/Core/Map.cs index 2ea0f5a..eeff2ae 100644 --- a/NwPluginAPI/Core/Map.cs +++ b/NwPluginAPI/Core/Map.cs @@ -1,10 +1,10 @@ -using MapGeneration; -using System.Collections.Generic; -using System.Linq; using Interactables.Interobjects; using LightContainmentZoneDecontamination; +using MapGeneration; using MapGeneration.Distributors; using PlayerRoles.PlayableScps.Scp079.Cameras; +using System.Collections.Generic; +using System.Linq; using UnityEngine; using Color = UnityEngine.Color; @@ -141,7 +141,7 @@ public static void FlickerLights(float duration, FacilityZone zone) foreach (var controller in RoomLightController.Instances) { - if(controller.Room.Zone == zone) + if (controller.Room.Zone == zone) controller.ServerFlickerLights(duration); } } diff --git a/NwPluginAPI/Core/Player.cs b/NwPluginAPI/Core/Player.cs index 9c0fae0..3b2a4f8 100644 --- a/NwPluginAPI/Core/Player.cs +++ b/NwPluginAPI/Core/Player.cs @@ -1,33 +1,33 @@ namespace PluginAPI.Core { - using System; - using System.Collections.Generic; - using System.Linq; + using CommandSystem; + using Factories; + using Footprinting; using Hints; + using Interfaces; using InventorySystem; + using InventorySystem.Disarming; using InventorySystem.Items; + using InventorySystem.Items.Armor; + using InventorySystem.Items.Firearms.Ammo; + using InventorySystem.Items.Pickups; + using MapGeneration; using Mirror; using PlayerRoles; using PlayerRoles.FirstPersonControl; + using PlayerRoles.Voice; using PlayerStatsSystem; - using Factories; - using Interfaces; + using PluginAPI.Core.Items; using RoundRestarting; + using System; + using System.Collections.Generic; + using System.Linq; using UnityEngine; + using Utils.Networking; using VoiceChat; using VoiceChat.Playbacks; using static Broadcast; - using InventorySystem.Disarming; using static InventorySystem.Disarming.DisarmedPlayers; - using Utils.Networking; - using Mirror.LiteNetLib4Mirror; - using Footprinting; - using MapGeneration; - using CommandSystem; - using InventorySystem.Items.Pickups; - using PluginAPI.Core.Items; - using PlayerRoles.Voice; - using InventorySystem.Items.Firearms.Ammo; /// /// Represents a player connected to server. @@ -651,9 +651,19 @@ public bool IsOverwatchEnabled /// /// Player info displayed while looking at the player. + ///
This can be used to hide elements of the player's name such as the role, badge, unit name, etc.
/// public PlayerInfo PlayerInfo { get; } + /// + /// Gets or sets the distance that others can see the player's information. + /// + public float InfoViewRange + { + get => ReferenceHub.nicknameSync.NetworkViewRange; + set => ReferenceHub.nicknameSync.NetworkViewRange = value; + } + /// /// Gets or sets the item in the player's hand, returns the default value if empty. /// @@ -669,12 +679,17 @@ public ItemBase CurrentItem } } + /// + /// Gets player's BodyArmor if they have one. + /// + public BodyArmor CurrentArmor => ReferenceHub.inventory.TryGetBodyArmor(out var armor) ? armor : null; + + /// /// Get player current room. /// public RoomIdentifier Room => RoomIdUtils.RoomAtPosition(GameObject.transform.position); - /// /// Get player current zone. /// @@ -726,9 +741,9 @@ public string RoleName /// /// Gets player - /// - /// Can be null. - /// + ///
+ /// Can be null. + ///
/// public VoiceModuleBase VoiceModule => ReferenceHub.roleManager.CurrentRole is IVoiceRole voiceRole ? voiceRole.VoiceModule : null; @@ -737,6 +752,11 @@ public string RoleName /// public VoiceChatChannel VoiceChannel => VoiceModule?.CurrentChannel ?? VoiceChatChannel.None; + /// + /// Gets if the player agree that his microphone was recorded or not. + /// + public bool AgreeToRecording => VoiceChatPrivacySettings.CheckUserFlags(ReferenceHub, VcPrivacyFlags.SettingsSelected | VcPrivacyFlags.AllowRecording | VcPrivacyFlags.AllowMicCapture); + /// /// Gets if the player has no items in his inventory. /// @@ -1256,7 +1276,7 @@ public void SetGroup(UserGroup group) /// /// The text which will be displayed. /// The duration of which the text will be visible. - public void ReceiveHint(string text, float duration = 3f) => ReferenceHub.hints.Show(new TextHint(text, new HintParameter[] { new StringHintParameter(text) }, null, duration)); + public void ShowHint(string text, float duration = 3f) => ReferenceHub.hints.Show(new TextHint(text, new HintParameter[] { new StringHintParameter(text) }, null, duration)); /// /// Sends the player a hint text with effects. @@ -1264,7 +1284,13 @@ public void SetGroup(UserGroup group) /// The text which will be displayed. /// The effects of text. /// The duration of which the text will be visible. - public void ReceiveHint(string text, HintEffect[] effects, float duration = 3f) => ReferenceHub.hints.Show(new TextHint(text, new HintParameter[] { new StringHintParameter(text) }, effects, duration)); + public void ShowHint(string text, HintEffect[] effects, float duration = 3f) => ReferenceHub.hints.Show(new TextHint(text, new HintParameter[] { new StringHintParameter(text) }, effects, duration)); + + /// + /// Sends the player a hint. + /// + /// The hint that will be sent to the player + public void ShowHint(Hint hint) => ReferenceHub.hints.Show(hint); /// /// Sends the player a hit marker. diff --git a/NwPluginAPI/Core/PluginHandler.cs b/NwPluginAPI/Core/PluginHandler.cs index c675f75..b5d655e 100644 --- a/NwPluginAPI/Core/PluginHandler.cs +++ b/NwPluginAPI/Core/PluginHandler.cs @@ -2,16 +2,16 @@ namespace PluginAPI.Core { - using System; - using System.Collections.Generic; - using System.IO; - using System.Reflection; using Attributes; using CommandSystem; using Loader.Features; using PluginAPI.Commands; using PluginAPI.Loader; using Serialization; + using System; + using System.Collections.Generic; + using System.IO; + using System.Reflection; using Directory = System.IO.Directory; using File = System.IO.File; diff --git a/NwPluginAPI/Core/Server.cs b/NwPluginAPI/Core/Server.cs index 41e5643..509459f 100644 --- a/NwPluginAPI/Core/Server.cs +++ b/NwPluginAPI/Core/Server.cs @@ -1,13 +1,13 @@ -using System; using CustomPlayerEffects; +using System; using UnityEngine; namespace PluginAPI.Core { - using System.Collections.Generic; - using Mirror; using Interfaces; + using Mirror; using RoundRestarting; + using System.Collections.Generic; using static BanHandler; using static Broadcast; @@ -291,7 +291,7 @@ public static BanDetails[] GetAllPlayersBanned() /// List of specified ban types. public static BanDetails[] GetAllPlayersBanned(BanType banType) => GetBans(banType).ToArray(); -#endregion + #endregion /// /// Restarts the server and reconnects all players. diff --git a/NwPluginAPI/Core/Statistics.cs b/NwPluginAPI/Core/Statistics.cs index 949f607..b1e2879 100644 --- a/NwPluginAPI/Core/Statistics.cs +++ b/NwPluginAPI/Core/Statistics.cs @@ -1,8 +1,8 @@ namespace PluginAPI.Core { - using System; using GameCore; using RoundRestarting; + using System; using UnityEngine; using static RoundSummary; diff --git a/NwPluginAPI/Core/Warhead.cs b/NwPluginAPI/Core/Warhead.cs index e593b39..6bdeec7 100644 --- a/NwPluginAPI/Core/Warhead.cs +++ b/NwPluginAPI/Core/Warhead.cs @@ -51,7 +51,7 @@ public static float DetonationTime set => AlphaWarheadController.Singleton.ForceTime(value); } -#region Detonation + #region Detonation /// /// Starts the detonation countdown. @@ -74,9 +74,9 @@ public static void Start(bool isAutomatic = true, bool suppressSubtitles = false /// public static void Detonate() => Server.Instance.GetComponent(true).ForceTime(0); -#endregion + #endregion -#region Shake Effect + #region Shake Effect /// /// Show the shake effect to all players. @@ -87,6 +87,6 @@ public static void Shake() // player.Warhead.Shake(); } -#endregion + #endregion } } \ No newline at end of file diff --git a/NwPluginAPI/Core/Zones/EntranceZone.cs b/NwPluginAPI/Core/Zones/EntranceZone.cs index bbc382d..ae18d75 100644 --- a/NwPluginAPI/Core/Zones/EntranceZone.cs +++ b/NwPluginAPI/Core/Zones/EntranceZone.cs @@ -1,8 +1,8 @@ namespace PluginAPI.Core.Zones { - using MapGeneration; using Doors; using Entrance; + using MapGeneration; using System.Collections.Generic; using System.Linq; diff --git a/NwPluginAPI/Core/Zones/FacilityRoom.cs b/NwPluginAPI/Core/Zones/FacilityRoom.cs index e11538f..cc7534a 100644 --- a/NwPluginAPI/Core/Zones/FacilityRoom.cs +++ b/NwPluginAPI/Core/Zones/FacilityRoom.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Core.Zones { + using Doors; using Interactables.Interobjects; using Interactables.Interobjects.DoorUtils; using MapGeneration; - using Doors; using System; using System.Collections.Generic; using UnityEngine; @@ -51,7 +51,7 @@ public class FacilityRoom /// public Quaternion Rotation => Transform.rotation; -#region Get Components + #region Get Components /// public T GetComponent(bool globalSearch = false, bool childSearch = false) where T : MonoBehaviour @@ -119,7 +119,7 @@ public bool TryGetComponent(out T component, bool globalSearch = false, bool return true; } -#endregion + #endregion internal void RegisterDoor(DoorVariant door) { @@ -150,7 +150,7 @@ public FacilityRoom(FacilityZone zone, RoomIdentifier room) Identifier = room; var lightController = room.GetComponentInChildren(); - if(lightController != null) + if (lightController != null) Lights = new RoomLight(lightController); Facility.RegisterDoors(this, room.gameObject.GetComponentsInChildren()); diff --git a/NwPluginAPI/Core/Zones/Heavy/Generator/Generator.cs b/NwPluginAPI/Core/Zones/Heavy/Generator/Generator.cs index 2cd070b..96e840d 100644 --- a/NwPluginAPI/Core/Zones/Heavy/Generator/Generator.cs +++ b/NwPluginAPI/Core/Zones/Heavy/Generator/Generator.cs @@ -1,6 +1,7 @@ -namespace PluginAPI.Core.Zones.Heavy +namespace PluginAPI.Core.Zones.Heavy.Generator { using MapGeneration.Distributors; + using PluginAPI.Core.Zones.Heavy; using UnityEngine; /// diff --git a/NwPluginAPI/Core/Zones/Heavy/Generator/GeneratorLogic.cs b/NwPluginAPI/Core/Zones/Heavy/Generator/GeneratorLogic.cs index 5b655ad..24efae4 100644 --- a/NwPluginAPI/Core/Zones/Heavy/Generator/GeneratorLogic.cs +++ b/NwPluginAPI/Core/Zones/Heavy/Generator/GeneratorLogic.cs @@ -1,4 +1,4 @@ -namespace PluginAPI.Core.Zones.Heavy +namespace PluginAPI.Core.Zones.Heavy.Generator { /// /// Handles a generator's logic. diff --git a/NwPluginAPI/Core/Zones/Heavy/HczRoom.cs b/NwPluginAPI/Core/Zones/Heavy/HczRoom.cs index cf87daa..65db03f 100644 --- a/NwPluginAPI/Core/Zones/Heavy/HczRoom.cs +++ b/NwPluginAPI/Core/Zones/Heavy/HczRoom.cs @@ -5,7 +5,7 @@ namespace PluginAPI.Core.Zones.Heavy public class HczRoom : FacilityRoom { - public Generator Generator { get; internal set; } + public Heavy.Generator.Generator Generator { get; internal set; } /// /// Initializes a new instance of the class. diff --git a/NwPluginAPI/Core/Zones/Heavy/Rooms/HczScp049.cs b/NwPluginAPI/Core/Zones/Heavy/Rooms/HczScp049.cs index abf7f24..884ef2e 100644 --- a/NwPluginAPI/Core/Zones/Heavy/Rooms/HczScp049.cs +++ b/NwPluginAPI/Core/Zones/Heavy/Rooms/HczScp049.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Core.Zones.Heavy.Rooms { - using MapGeneration; using Core; - using Zones; using Heavy; + using MapGeneration; + using Zones; /// /// Represents SCP-049's room. diff --git a/NwPluginAPI/Core/Zones/HeavyZone.cs b/NwPluginAPI/Core/Zones/HeavyZone.cs index 6327fb8..f378635 100644 --- a/NwPluginAPI/Core/Zones/HeavyZone.cs +++ b/NwPluginAPI/Core/Zones/HeavyZone.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Core.Zones { - using MapGeneration; using Doors; using Heavy; using Heavy.Rooms; + using MapGeneration; using System.Collections.Generic; using System.Linq; diff --git a/NwPluginAPI/Core/Zones/Light/Rooms/LczScp914.cs b/NwPluginAPI/Core/Zones/Light/Rooms/LczScp914.cs index 0872bd3..5fa6c89 100644 --- a/NwPluginAPI/Core/Zones/Light/Rooms/LczScp914.cs +++ b/NwPluginAPI/Core/Zones/Light/Rooms/LczScp914.cs @@ -1,11 +1,11 @@ namespace PluginAPI.Core.Zones.Light.Rooms { - using MapGeneration; using Core; - using Zones; using Light; + using MapGeneration; using Scp914; using UnityEngine; + using Zones; public class LczScp914 : LczRoom { diff --git a/NwPluginAPI/Core/Zones/LightZone.cs b/NwPluginAPI/Core/Zones/LightZone.cs index 6c1a30d..9ecebed 100644 --- a/NwPluginAPI/Core/Zones/LightZone.cs +++ b/NwPluginAPI/Core/Zones/LightZone.cs @@ -1,10 +1,10 @@ namespace PluginAPI.Core.Zones { - using LightContainmentZoneDecontamination; - using MapGeneration; using Doors; using Light; using Light.Rooms; + using LightContainmentZoneDecontamination; + using MapGeneration; using System.Collections.Generic; using System.Linq; diff --git a/NwPluginAPI/Core/Zones/Pocket/PocketDimension.cs b/NwPluginAPI/Core/Zones/Pocket/PocketDimension.cs index f008101..c6ff001 100644 --- a/NwPluginAPI/Core/Zones/Pocket/PocketDimension.cs +++ b/NwPluginAPI/Core/Zones/Pocket/PocketDimension.cs @@ -1,9 +1,9 @@ namespace PluginAPI.Core.Zones.Pocket { using MapGeneration; - using Zones; using System.Collections.Generic; using System.Linq; + using Zones; /// /// Represents the pocket dimension. diff --git a/NwPluginAPI/Core/Zones/Surface/Surface.cs b/NwPluginAPI/Core/Zones/Surface/Surface.cs index 716c185..63e0eed 100644 --- a/NwPluginAPI/Core/Zones/Surface/Surface.cs +++ b/NwPluginAPI/Core/Zones/Surface/Surface.cs @@ -1,6 +1,7 @@ -namespace PluginAPI.Core.Zones +namespace PluginAPI.Core.Zones.Surface { using MapGeneration; + using PluginAPI.Core.Zones; /// /// Represents the surface. diff --git a/NwPluginAPI/Core/Zones/SurfaceZone.cs b/NwPluginAPI/Core/Zones/SurfaceZone.cs index 27331ff..dedcda0 100644 --- a/NwPluginAPI/Core/Zones/SurfaceZone.cs +++ b/NwPluginAPI/Core/Zones/SurfaceZone.cs @@ -1,7 +1,7 @@ namespace PluginAPI.Core.Zones { - using MapGeneration; using Doors; + using MapGeneration; using System.Collections.Generic; using System.Linq; diff --git a/NwPluginAPI/Core/Zones/UnknownZone.cs b/NwPluginAPI/Core/Zones/UnknownZone.cs index 77b9419..bd8a9d1 100644 --- a/NwPluginAPI/Core/Zones/UnknownZone.cs +++ b/NwPluginAPI/Core/Zones/UnknownZone.cs @@ -1,7 +1,7 @@ -using System.Collections.Generic; -using System.Linq; using MapGeneration; using PluginAPI.Core.Doors; +using System.Collections.Generic; +using System.Linq; namespace PluginAPI.Core.Zones { diff --git a/NwPluginAPI/Enums/DamageType.cs b/NwPluginAPI/Enums/DamageType.cs index 2224758..785cd96 100644 --- a/NwPluginAPI/Enums/DamageType.cs +++ b/NwPluginAPI/Enums/DamageType.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace PluginAPI.Enums { /// diff --git a/NwPluginAPI/Enums/ServerEventType.cs b/NwPluginAPI/Enums/ServerEventType.cs index f4517ad..d4631ab 100644 --- a/NwPluginAPI/Enums/ServerEventType.cs +++ b/NwPluginAPI/Enums/ServerEventType.cs @@ -7,28 +7,28 @@ namespace PluginAPI.Enums { + using AdminToys; using CommandSystem; - using MapGeneration.Distributors; - using Core.Zones.Heavy; using Core.Interfaces; - using PlayerRoles; - using PlayerRoles.PlayableScps.Scp173; - using PlayerRoles.PlayableScps.Scp079; - using PlayerRoles.PlayableScps.Scp939; - using AdminToys; - using PlayerStatsSystem; using Core.Items; + using Interactables.Interobjects; + using Interactables.Interobjects.DoorUtils; using InventorySystem.Items; - using InventorySystem.Items.Usables; using InventorySystem.Items.Firearms; using InventorySystem.Items.Pickups; using InventorySystem.Items.ThrowableProjectiles; - using Respawning; - using UnityEngine; + using InventorySystem.Items.Usables; using MapGeneration; - using Interactables.Interobjects.DoorUtils; - using Interactables.Interobjects; + using MapGeneration.Distributors; + using PlayerRoles; + using PlayerRoles.PlayableScps.Scp079; + using PlayerRoles.PlayableScps.Scp173; + using PlayerRoles.PlayableScps.Scp939; + using PlayerStatsSystem; + using PluginAPI.Core.Zones.Heavy.Generator; + using Respawning; using Scp914; + using UnityEngine; /// /// Represents server event types. @@ -59,7 +59,7 @@ public enum ServerEventType : int /// /// Parameters: player, attacker, damageHandler. /// - PlayerDying = 2, + PlayerDying = 2, /// /// Executed when decontamination in LCZ starts. @@ -1042,7 +1042,7 @@ public enum ServerEventType : int /// /// Params: userId, group. /// Cancellable with . - /// + /// PlayerGetGroup = 125, /// diff --git a/NwPluginAPI/Events/Args/Map/CassieAnnouncesScpTerminationEvent.cs b/NwPluginAPI/Events/Args/Map/CassieAnnouncesScpTerminationEvent.cs index 4f89aa2..c569dc6 100644 --- a/NwPluginAPI/Events/Args/Map/CassieAnnouncesScpTerminationEvent.cs +++ b/NwPluginAPI/Events/Args/Map/CassieAnnouncesScpTerminationEvent.cs @@ -1,16 +1,14 @@ using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class CassieAnnouncesScpTerminationEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.CassieAnnouncesScpTermination; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public DamageHandlerBase DamageHandler { get; } [EventArgument] @@ -18,7 +16,7 @@ public class CassieAnnouncesScpTerminationEvent : IEventArguments public CassieAnnouncesScpTerminationEvent(ReferenceHub hub, DamageHandlerBase handler, string announcement) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); DamageHandler = handler; Announcement = announcement; } diff --git a/NwPluginAPI/Events/Args/Map/GeneratorActivatedEvent.cs b/NwPluginAPI/Events/Args/Map/GeneratorActivatedEvent.cs index 2b23703..960eddf 100644 --- a/NwPluginAPI/Events/Args/Map/GeneratorActivatedEvent.cs +++ b/NwPluginAPI/Events/Args/Map/GeneratorActivatedEvent.cs @@ -1,8 +1,8 @@ using MapGeneration.Distributors; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class GeneratorActivatedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Map/GrenadeExplodedEvent.cs b/NwPluginAPI/Events/Args/Map/GrenadeExplodedEvent.cs index f3a1f9c..a11b05a 100644 --- a/NwPluginAPI/Events/Args/Map/GrenadeExplodedEvent.cs +++ b/NwPluginAPI/Events/Args/Map/GrenadeExplodedEvent.cs @@ -1,10 +1,10 @@ -using UnityEngine; using Footprinting; using InventorySystem.Items.Pickups; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class GrenadeExplodedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Map/ItemSpawnedEvent.cs b/NwPluginAPI/Events/Args/Map/ItemSpawnedEvent.cs index 82fd283..b99534b 100644 --- a/NwPluginAPI/Events/Args/Map/ItemSpawnedEvent.cs +++ b/NwPluginAPI/Events/Args/Map/ItemSpawnedEvent.cs @@ -1,8 +1,8 @@ -using UnityEngine; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class ItemSpawnedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Map/LczDecontaminationAnnouncementEvent.cs b/NwPluginAPI/Events/Args/Map/LczDecontaminationAnnouncementEvent.cs index 7c08ff0..5d254e5 100644 --- a/NwPluginAPI/Events/Args/Map/LczDecontaminationAnnouncementEvent.cs +++ b/NwPluginAPI/Events/Args/Map/LczDecontaminationAnnouncementEvent.cs @@ -1,7 +1,7 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class LczDecontaminationAnnouncementEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Map/LczDecontaminationStartEvent.cs b/NwPluginAPI/Events/Args/Map/LczDecontaminationStartEvent.cs index dae4332..01a69fc 100644 --- a/NwPluginAPI/Events/Args/Map/LczDecontaminationStartEvent.cs +++ b/NwPluginAPI/Events/Args/Map/LczDecontaminationStartEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class LczDecontaminationStartEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Map/MapGeneratedEvent.cs b/NwPluginAPI/Events/Args/Map/MapGeneratedEvent.cs index dc95ef9..2e41cd9 100644 --- a/NwPluginAPI/Events/Args/Map/MapGeneratedEvent.cs +++ b/NwPluginAPI/Events/Args/Map/MapGeneratedEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Map { public class MapGeneratedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Player/PlaceBloodEvent.cs b/NwPluginAPI/Events/Args/Player/PlaceBloodEvent.cs index 6ef7e4b..1330e96 100644 --- a/NwPluginAPI/Events/Args/Player/PlaceBloodEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlaceBloodEvent.cs @@ -1,16 +1,14 @@ -using UnityEngine; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlaceBloodEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlaceBlood; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Vector3 Position { get; set; } diff --git a/NwPluginAPI/Events/Args/Player/PlaceBulletHoleEvent.cs b/NwPluginAPI/Events/Args/Player/PlaceBulletHoleEvent.cs index 4bafe2c..b187874 100644 --- a/NwPluginAPI/Events/Args/Player/PlaceBulletHoleEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlaceBulletHoleEvent.cs @@ -1,8 +1,8 @@ -using UnityEngine; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlaceBulletHoleEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Player/PlayerActivateGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerActivateGeneratorEvent.cs index 66f8260..f382513 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerActivateGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerActivateGeneratorEvent.cs @@ -1,22 +1,20 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerActivateGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerActivateGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } public PlayerActivateGeneratorEvent(ReferenceHub hub, Scp079Generator generator) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Generator = generator; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerAimWeaponEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerAimWeaponEvent.cs index 14b459d..321fb47 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerAimWeaponEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerAimWeaponEvent.cs @@ -1,16 +1,14 @@ using InventorySystem.Items.Firearms; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerAimWeaponEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerAimWeapon; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Firearm Firearm { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerAimWeaponEvent : IEventArguments public PlayerAimWeaponEvent(ReferenceHub hub, Firearm firearm, bool isAiming) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Firearm = firearm; IsAiming = isAiming; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerBannedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerBannedEvent.cs index 00dfc6c..31d0ee6 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerBannedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerBannedEvent.cs @@ -1,10 +1,9 @@ -using PluginAPI.Enums; +using PluginAPI.Core; using PluginAPI.Core.Attributes; - using PluginAPI.Core.Interfaces; -using PluginAPI.Core; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerBannedEvent : IEventArguments { @@ -12,7 +11,7 @@ public class PlayerBannedEvent : IEventArguments [EventArgument] public IPlayer Player { get; } [EventArgument] - public Player Issuer { get; } + public Core.Player Issuer { get; } [EventArgument] public string Reason { get; set; } [EventArgument] @@ -21,7 +20,7 @@ public class PlayerBannedEvent : IEventArguments public PlayerBannedEvent(ReferenceHub hub, ReferenceHub issuer, string reason, long duration) { Player = Core.Player.Get(hub); - Issuer = issuer == ReferenceHub.HostHub ? Server.Instance : Core.Player.Get(issuer); + Issuer = issuer == ReferenceHub.HostHub ? Core.Server.Instance : Core.Player.Get(issuer); Reason = reason; Duration = duration; } @@ -29,7 +28,7 @@ public PlayerBannedEvent(ReferenceHub hub, ReferenceHub issuer, string reason, l public PlayerBannedEvent(string userId, string nickName, string ipAddress, ReferenceHub issuer, string reason, long duration) { Player = new OfflinePlayer(userId, nickName, ipAddress); - Issuer = issuer == ReferenceHub.HostHub ? Server.Instance : Core.Player.Get(issuer); + Issuer = issuer == ReferenceHub.HostHub ? Core.Server.Instance : Core.Player.Get(issuer); Reason = reason; Duration = duration; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerCancelUsingItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerCancelUsingItemEvent.cs index 636314d..4634669 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerCancelUsingItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerCancelUsingItemEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Usables; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerCancelUsingItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerCancelUsingItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public UsableItem Item { get; } public PlayerCancelUsingItemEvent(ReferenceHub hub, UsableItem item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerChangeItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerChangeItemEvent.cs index dfa78a5..e7e1b53 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerChangeItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerChangeItemEvent.cs @@ -1,14 +1,13 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerChangeItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerChangeItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ushort OldItem { get; } [EventArgument] @@ -16,7 +15,7 @@ public class PlayerChangeItemEvent : IEventArguments public PlayerChangeItemEvent(ReferenceHub hub, ushort oldItem, ushort newItem) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); OldItem = oldItem; NewItem = newItem; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerChangeRadioRangeEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerChangeRadioRangeEvent.cs index b46937d..f8c649f 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerChangeRadioRangeEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerChangeRadioRangeEvent.cs @@ -1,17 +1,15 @@ using InventorySystem.Items.Radio; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using static InventorySystem.Items.Radio.RadioMessages; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerChangeRadioRangeEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerChangeRadioRange; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RadioItem Radio { get; } [EventArgument] @@ -19,7 +17,7 @@ public class PlayerChangeRadioRangeEvent : IEventArguments public PlayerChangeRadioRangeEvent(ReferenceHub hub, RadioItem radio, RadioRangeLevel range) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Radio = radio; Range = range; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerChangeRoleEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerChangeRoleEvent.cs index 8c8443f..90a9027 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerChangeRoleEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerChangeRoleEvent.cs @@ -1,16 +1,14 @@ using PlayerRoles; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerChangeRoleEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerChangeRole; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public PlayerRoleBase OldRole { get; } [EventArgument] @@ -20,7 +18,7 @@ public class PlayerChangeRoleEvent : IEventArguments public PlayerChangeRoleEvent(ReferenceHub hub, PlayerRoleBase oldRole, RoleTypeId newRole, RoleChangeReason reason) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); OldRole = oldRole; NewRole = newRole; ChangeReason = reason; diff --git a/NwPluginAPI/Events/Args/Player/PlayerChangeSpectatorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerChangeSpectatorEvent.cs index c8c9164..bd2dd06 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerChangeSpectatorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerChangeSpectatorEvent.cs @@ -1,24 +1,23 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerChangeSpectatorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerChangeSpectator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player OldTarget { get; } + public Core.Player OldTarget { get; } [EventArgument] - public Player NewTarget { get; set; } + public Core.Player NewTarget { get; set; } public PlayerChangeSpectatorEvent(ReferenceHub hub, ReferenceHub oldTarget, ReferenceHub newTarget) { - Player = Player.Get(hub); - OldTarget = Player.Get(oldTarget); - NewTarget= Player.Get(newTarget); + Player = Core.Player.Get(hub); + OldTarget = Core.Player.Get(oldTarget); + NewTarget= Core.Player.Get(newTarget); } PlayerChangeSpectatorEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerCheaterReportEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerCheaterReportEvent.cs index 34bb2f1..e8077da 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerCheaterReportEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerCheaterReportEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerCheaterReportEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerCheaterReport; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public string Reason { get; set; } public PlayerCheaterReportEvent(ReferenceHub hub, ReferenceHub target, string reason) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); Reason = reason; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerCheckReservedSlotEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerCheckReservedSlotEvent.cs index c9ba238..f6505de 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerCheckReservedSlotEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerCheckReservedSlotEvent.cs @@ -1,7 +1,7 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerCheckReservedSlotEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Player/PlayerCloseGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerCloseGeneratorEvent.cs index a1596aa..8a957f3 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerCloseGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerCloseGeneratorEvent.cs @@ -1,22 +1,20 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerCloseGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerCloseGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } public PlayerCloseGeneratorEvent(ReferenceHub hub, Scp079Generator generator) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Generator = generator; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerCoinFlipEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerCoinFlipEvent.cs index 57d695a..bea7881 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerCoinFlipEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerCoinFlipEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerCoinFlipEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerCoinFlip; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public bool IsTails { get; } public PlayerCoinFlipEvent(ReferenceHub hub, bool isTails) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); IsTails = isTails; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDamageEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDamageEvent.cs index ca03b7d..f1b1a27 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDamageEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDamageEvent.cs @@ -1,25 +1,23 @@ using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDamageEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDamage; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public DamageHandlerBase DamageHandler { get; } public PlayerDamageEvent(ReferenceHub hub, ReferenceHub target, DamageHandlerBase handler) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); DamageHandler = handler; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDamagedShootingTargetEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDamagedShootingTargetEvent.cs index 14496fd..b22dca7 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDamagedShootingTargetEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDamagedShootingTargetEvent.cs @@ -1,17 +1,15 @@ using AdminToys; using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDamagedShootingTargetEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDamagedShootingTarget; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ShootingTarget ShootingTarget { get; } [EventArgument] @@ -21,7 +19,7 @@ public class PlayerDamagedShootingTargetEvent : IEventArguments public PlayerDamagedShootingTargetEvent(ReferenceHub hub, ShootingTarget target, DamageHandlerBase handler, float damageAmount) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); ShootingTarget = target; DamageHandler = handler; DamageAmount = damageAmount; diff --git a/NwPluginAPI/Events/Args/Player/PlayerDamagedWindowEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDamagedWindowEvent.cs index f1700c8..6af34f3 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDamagedWindowEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDamagedWindowEvent.cs @@ -1,16 +1,14 @@ using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDamagedWindowEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDamagedWindow; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public BreakableWindow Window { get; } [EventArgument] @@ -20,7 +18,7 @@ public class PlayerDamagedWindowEvent : IEventArguments public PlayerDamagedWindowEvent(ReferenceHub hub, BreakableWindow window, DamageHandlerBase handler) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Window = window; DamageHandler = handler; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDeactivatedGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDeactivatedGeneratorEvent.cs index de88a6a..051d16f 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDeactivatedGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDeactivatedGeneratorEvent.cs @@ -1,16 +1,14 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDeactivatedGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDeactivatedGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDeathEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDeathEvent.cs index 2f9bc5d..2c8ce21 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDeathEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDeathEvent.cs @@ -1,18 +1,16 @@ using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDeathEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDeath; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Attacker { get; } + public Core.Player Attacker { get; } [EventArgument] public DamageHandlerBase DamageHandler { get; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDropAmmoEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDropAmmoEvent.cs index ca56f0b..c6e01f6 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDropAmmoEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDropAmmoEvent.cs @@ -1,14 +1,13 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDropAmmoEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDropAmmo; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemType Item { get; } [EventArgument] @@ -16,7 +15,7 @@ public class PlayerDropAmmoEvent : IEventArguments public PlayerDropAmmoEvent(ReferenceHub hub, ItemType item, int amount) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; Amount = amount; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDropItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDropItemEvent.cs index 9da9f08..125028b 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDropItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDropItemEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDropItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDropItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } public PlayerDropItemEvent(ReferenceHub hub, ItemBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDroppedAmmoEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDroppedAmmoEvent.cs index 0a20395..5e4b49c 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDroppedAmmoEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDroppedAmmoEvent.cs @@ -1,15 +1,14 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using InventorySystem.Items.Firearms.Ammo; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDroppedAmmoEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDroppedAmmo; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public AmmoPickup Item { get; set; } [EventArgument] @@ -19,7 +18,7 @@ public class PlayerDroppedAmmoEvent : IEventArguments public PlayerDroppedAmmoEvent(ReferenceHub hub, AmmoPickup item, int amount, int maxAmount) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; Amount = amount; MaxAmount = maxAmount; diff --git a/NwPluginAPI/Events/Args/Player/PlayerDroppedItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDroppedItemEvent.cs index f6dd223..169f3f7 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDroppedItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDroppedItemEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDroppedItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDropedpItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerDroppedItemEvent(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDryfireWeaponEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDryfireWeaponEvent.cs index 8e11a66..7c13c16 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDryfireWeaponEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDryfireWeaponEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Firearms; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDryfireWeaponEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDryfireWeapon; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Firearm Firearm { get; } public PlayerDryfireWeaponEvent(ReferenceHub hub, Firearm firearm) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Firearm = firearm; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerDyingEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerDyingEvent.cs index 7b868ea..7126c9e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerDyingEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerDyingEvent.cs @@ -1,25 +1,23 @@ using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerDyingEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerDying; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Attacker { get; } + public Core.Player Attacker { get; } [EventArgument] public DamageHandlerBase DamageHandler { get; } public PlayerDyingEvent(ReferenceHub hub, ReferenceHub attacker, DamageHandlerBase handler) { - Player = Player.Get(hub); - Attacker = Player.Get(attacker); + Player = Core.Player.Get(hub); + Attacker = Core.Player.Get(attacker); DamageHandler = handler; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerEnterPocketDimensionEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerEnterPocketDimensionEvent.cs index 490f9c2..a79b4bc 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerEnterPocketDimensionEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerEnterPocketDimensionEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerEnterPocketDimensionEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerEnterPocketDimension; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public PlayerEnterPocketDimensionEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } PlayerEnterPocketDimensionEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerEscapeEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerEscapeEvent.cs index 7ce4305..cbbe802 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerEscapeEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerEscapeEvent.cs @@ -1,22 +1,20 @@ using PlayerRoles; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerEscapeEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerEscape; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RoleTypeId NewRole { get; set; } public PlayerEscapeEvent(ReferenceHub hub, RoleTypeId newRole) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); NewRole = newRole; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerExitPocketDimensionEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerExitPocketDimensionEvent.cs index 6986989..62d2cfd 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerExitPocketDimensionEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerExitPocketDimensionEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerExitPocketDimensionEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerExitPocketDimension; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public bool IsSuccessful { get; set; } public PlayerExitPocketDimensionEvent(ReferenceHub hub, bool isSuccessful) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); IsSuccessful = isSuccessful; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandEvent.cs index 66eecaa..ccbab63 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandEvent.cs @@ -1,14 +1,13 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerGameConsoleCommandEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerGameConsoleCommand; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public string Command { get; } [EventArgument] @@ -16,7 +15,7 @@ public class PlayerGameConsoleCommandEvent : IEventArguments public PlayerGameConsoleCommandEvent(ReferenceHub hub, string command, string[] args) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Command = command; Arguments = args; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandExecutedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandExecutedEvent.cs index 2c16d02..61d597b 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandExecutedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerGameConsoleCommandExecutedEvent.cs @@ -1,14 +1,13 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerGameConsoleCommandExecutedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerGameConsoleCommandExecuted; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public string Command { get; } [EventArgument] @@ -20,7 +19,7 @@ public class PlayerGameConsoleCommandExecutedEvent : IEventArguments public PlayerGameConsoleCommandExecutedEvent(ReferenceHub hub, string command, string[] args, bool result, string response) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Command = command; Arguments = args; Result = result; diff --git a/NwPluginAPI/Events/Args/Player/PlayerGetGroupEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerGetGroupEvent.cs index 68d1e97..442f0e4 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerGetGroupEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerGetGroupEvent.cs @@ -1,7 +1,7 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerGetGroupEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Player/PlayerHandcuffEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerHandcuffEvent.cs index 8451d19..d9c6b8e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerHandcuffEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerHandcuffEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerHandcuffEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerHandcuff; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } public PlayerHandcuffEvent(ReferenceHub hub, ReferenceHub target) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); } PlayerHandcuffEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractDoorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractDoorEvent.cs index f88c24a..3ac5b5f 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractDoorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractDoorEvent.cs @@ -1,16 +1,14 @@ using Interactables.Interobjects.DoorUtils; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractDoorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractDoor; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public DoorVariant Door { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerInteractDoorEvent : IEventArguments public PlayerInteractDoorEvent(ReferenceHub hub, DoorVariant door, bool canOpen) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Door = door; CanOpen = canOpen; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractElevatorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractElevatorEvent.cs index 5217ca0..b72f606 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractElevatorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractElevatorEvent.cs @@ -1,22 +1,20 @@ using Interactables.Interobjects; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractElevatorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractElevator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ElevatorChamber Elevator { get; } public PlayerInteractElevatorEvent(ReferenceHub hub, ElevatorChamber elevator) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Elevator = elevator; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractGeneratorEvent.cs index 31799bb..5b78e3e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractGeneratorEvent.cs @@ -1,17 +1,15 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using static MapGeneration.Distributors.Scp079Generator; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } [EventArgument] diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractLockerEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractLockerEvent.cs index e9e47e0..b7dc388 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractLockerEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractLockerEvent.cs @@ -1,16 +1,14 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractLockerEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractLocker; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Locker Locker { get; } [EventArgument] @@ -20,7 +18,7 @@ public class PlayerInteractLockerEvent : IEventArguments public PlayerInteractLockerEvent(ReferenceHub hub, Locker locker, LockerChamber chamber, bool canOpen) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Locker = locker; Chamber = chamber; CanOpen = canOpen; diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractScp330Event.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractScp330Event.cs index 6d69915..1986165 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractScp330Event.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractScp330Event.cs @@ -1,14 +1,13 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractScp330Event : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractScp330; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public int Uses { get; set; } [EventArgument] @@ -18,7 +17,7 @@ public class PlayerInteractScp330Event : IEventArguments public PlayerInteractScp330Event(ReferenceHub hub, int uses) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Uses = uses; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerInteractShootingTargetEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerInteractShootingTargetEvent.cs index 9d20caf..4f9b02f 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerInteractShootingTargetEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerInteractShootingTargetEvent.cs @@ -1,22 +1,20 @@ using AdminToys; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerInteractShootingTargetEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerInteractShootingTarget; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ShootingTarget ShootingTarget { get; } public PlayerInteractShootingTargetEvent(ReferenceHub hub, ShootingTarget target) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); ShootingTarget = target; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerJoinedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerJoinedEvent.cs index c4c6eca..bf9ac0b 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerJoinedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerJoinedEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerJoinedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerJoined; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public PlayerJoinedEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } PlayerJoinedEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerKickedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerKickedEvent.cs index c2e4ae2..1a09183 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerKickedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerKickedEvent.cs @@ -1,16 +1,14 @@ using CommandSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerKickedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerKicked; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ICommandSender Issuer { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerKickedEvent : IEventArguments public PlayerKickedEvent(ReferenceHub hub, ICommandSender issuer, string reason) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Issuer = issuer; Reason = reason; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerLeftEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerLeftEvent.cs index 56afa6f..834a71c 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerLeftEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerLeftEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerLeftEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerLeft; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public PlayerLeftEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } PlayerLeftEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerMakeNoiseEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerMakeNoiseEvent.cs index 0519091..3f89b54 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerMakeNoiseEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerMakeNoiseEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerMakeNoiseEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerMakeNoise; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public PlayerMakeNoiseEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } PlayerMakeNoiseEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerMutedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerMutedEvent.cs index 7675c2c..f2f000c 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerMutedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerMutedEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerMutedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerMuted; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Issuer { get; } + public Core.Player Issuer { get; } [EventArgument] public bool IsIntercom { get; } public PlayerMutedEvent(ReferenceHub hub, ReferenceHub issuer, bool isIntercom) { - Player = Player.Get(hub); - Issuer = issuer == ReferenceHub.HostHub ? Server.Instance : Player.Get(issuer); + Player = Core.Player.Get(hub); + Issuer = issuer == ReferenceHub.HostHub ? Core.Server.Instance : Core.Player.Get(issuer); IsIntercom = isIntercom; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerOpenGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerOpenGeneratorEvent.cs index fc642a2..7f633a1 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerOpenGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerOpenGeneratorEvent.cs @@ -1,22 +1,20 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerOpenGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerOpenGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } public PlayerOpenGeneratorEvent(ReferenceHub hub, Scp079Generator generator) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Generator = generator; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerPickupAmmoEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerPickupAmmoEvent.cs index 84fc600..94ff37a 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerPickupAmmoEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerPickupAmmoEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerPickupAmmoEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerPickupAmmo; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerPickupAmmoEvent(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerPickupArmorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerPickupArmorEvent.cs index 2ca9520..2fa0736 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerPickupArmorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerPickupArmorEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerPickupArmorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerPickupArmor; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerPickupArmorEvent(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerPickupScp330Event.cs b/NwPluginAPI/Events/Args/Player/PlayerPickupScp330Event.cs index 5116e62..dc67b5e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerPickupScp330Event.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerPickupScp330Event.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerPickupScp330Event : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerPickupScp330; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerPickupScp330Event(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerPreCoinFlipEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerPreCoinFlipEvent.cs index 97fed76..5181377 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerPreCoinFlipEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerPreCoinFlipEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerPreCoinFlipEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerPreCoinFlip; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public PlayerPreCoinFlipEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } PlayerPreCoinFlipEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerPreauthEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerPreauthEvent.cs index d55a71b..0928a0c 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerPreauthEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerPreauthEvent.cs @@ -1,8 +1,7 @@ -using LiteNetLib; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerPreauthEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Player/PlayerRadioToggleEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerRadioToggleEvent.cs index 5a8bb22..4dce897 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerRadioToggleEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerRadioToggleEvent.cs @@ -1,16 +1,14 @@ using InventorySystem.Items.Radio; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerRadioToggleEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerRadioToggle; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RadioItem Radio { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerRadioToggleEvent : IEventArguments public PlayerRadioToggleEvent(ReferenceHub hub, RadioItem radio, bool newState) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Radio = radio; NewState = newState; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerReceiveEffectEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerReceiveEffectEvent.cs index 74059b4..b0607fc 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerReceiveEffectEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerReceiveEffectEvent.cs @@ -1,16 +1,14 @@ using CustomPlayerEffects; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerReceiveEffectEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerReceiveEffect; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public StatusEffectBase Effect { get; } [EventArgument] @@ -20,7 +18,7 @@ public class PlayerReceiveEffectEvent : IEventArguments public PlayerReceiveEffectEvent(ReferenceHub hub, StatusEffectBase effect, byte intensity, float duration) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Effect = effect; Intensity = intensity; Duration = duration; diff --git a/NwPluginAPI/Events/Args/Player/PlayerReloadWeaponEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerReloadWeaponEvent.cs index 799abcd..e266911 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerReloadWeaponEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerReloadWeaponEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Firearms; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerReloadWeaponEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerReloadWeapon; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Firearm Firearm { get; } public PlayerReloadWeaponEvent(ReferenceHub hub, Firearm firearm) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Firearm = firearm; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerRemoveHandcuffsEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerRemoveHandcuffsEvent.cs index a482a7d..01a94bf 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerRemoveHandcuffsEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerRemoveHandcuffsEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerRemoveHandcuffsEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerRemoveHandcuffs; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public bool CanRemoveHandcuffsAsScp { get; set; } = false; public PlayerRemoveHandcuffsEvent(ReferenceHub hub, ReferenceHub target) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); } PlayerRemoveHandcuffsEvent() { } diff --git a/NwPluginAPI/Events/Args/Player/PlayerReportEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerReportEvent.cs index 159a935..ee40474 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerReportEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerReportEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerReportEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerReport; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public string Reason { get; set; } public PlayerReportEvent(ReferenceHub hub, ReferenceHub target, string reason) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); Reason = reason; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerSearchPickupEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerSearchPickupEvent.cs index 3c1f1d2..14d7658 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerSearchPickupEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerSearchPickupEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerSearchPickupEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerSearchPickup; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerSearchPickupEvent(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerSearchedPickupEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerSearchedPickupEvent.cs index 743966f..736d2ba 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerSearchedPickupEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerSearchedPickupEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Pickups; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerSearchedPickupEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerSearchedPickup; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemPickupBase Item { get; } public PlayerSearchedPickupEvent(ReferenceHub hub, ItemPickupBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerShotWeaponEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerShotWeaponEvent.cs index fa7aaaf..674457d 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerShotWeaponEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerShotWeaponEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Firearms; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerShotWeaponEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerShotWeapon; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Firearm Firearm { get; } public PlayerShotWeaponEvent(ReferenceHub player, Firearm firearm) { - Player = Player.Get(player); + Player = Core.Player.Get(player); Firearm = firearm; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerSpawnEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerSpawnEvent.cs index 8417018..11a2a61 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerSpawnEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerSpawnEvent.cs @@ -1,22 +1,20 @@ using PlayerRoles; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerSpawnEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerSpawn; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RoleTypeId Role { get; } public PlayerSpawnEvent(ReferenceHub hub, RoleTypeId role) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Role = role; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerThrowItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerThrowItemEvent.cs index 70999b7..28a7db1 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerThrowItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerThrowItemEvent.cs @@ -1,18 +1,15 @@ -using UnityEngine; - using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerThrowItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerThrowItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } [EventArgument] @@ -20,7 +17,7 @@ public class PlayerThrowItemEvent : IEventArguments public PlayerThrowItemEvent(ReferenceHub hub, ItemBase item, Rigidbody rb) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; Rigidbody = rb; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerThrowProjectileEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerThrowProjectileEvent.cs index 397dba2..ecc31d7 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerThrowProjectileEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerThrowProjectileEvent.cs @@ -1,17 +1,15 @@ using InventorySystem.Items.ThrowableProjectiles; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using static InventorySystem.Items.ThrowableProjectiles.ThrowableItem; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerThrowProjectileEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerThrowProjectile; [EventArgument] - public Player Thrower { get; } + public Core.Player Thrower { get; } [EventArgument] public ThrowableItem Item { get; } [EventArgument] @@ -21,7 +19,7 @@ public class PlayerThrowProjectileEvent : IEventArguments public PlayerThrowProjectileEvent(ReferenceHub hub, ThrowableItem item, ProjectileSettings projectileSettings, bool fullForce) { - Thrower = Player.Get(hub); + Thrower = Core.Player.Get(hub); Item = item; ProjectileSettings = projectileSettings; FullForce = fullForce; diff --git a/NwPluginAPI/Events/Args/Player/PlayerToggleFlashlightEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerToggleFlashlightEvent.cs index c6bfee8..fadc4ba 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerToggleFlashlightEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerToggleFlashlightEvent.cs @@ -1,16 +1,14 @@ using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerToggleFlashlightEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerToggleFlashlight; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerToggleFlashlightEvent : IEventArguments public PlayerToggleFlashlightEvent(ReferenceHub hub, ItemBase item, bool isToggled) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; IsToggled = isToggled; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUnloadWeaponEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUnloadWeaponEvent.cs index 9f0406c..803a04e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUnloadWeaponEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUnloadWeaponEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Firearms; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUnloadWeaponEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUnloadWeapon; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Firearm Firearm { get; } public PlayerUnloadWeaponEvent(ReferenceHub hub, Firearm firearm) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Firearm = firearm; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUnlockGeneratorEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUnlockGeneratorEvent.cs index 519dc38..76f3efa 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUnlockGeneratorEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUnlockGeneratorEvent.cs @@ -1,22 +1,20 @@ using MapGeneration.Distributors; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUnlockGeneratorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUnlockGenerator; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Generator Generator { get; } public PlayerUnlockGeneratorEvent(ReferenceHub hub, Scp079Generator generator) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Generator = generator; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUnmutedEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUnmutedEvent.cs index 5885fd6..0a0a07f 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUnmutedEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUnmutedEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUnmutedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUnmuted; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Issuer { get; } + public Core.Player Issuer { get; } [EventArgument] public bool IsIntercom { get; } public PlayerUnmutedEvent(ReferenceHub hub, ReferenceHub issuer, bool isIntercom) { - Player = Player.Get(hub); - Issuer = issuer == ReferenceHub.HostHub ? Server.Instance : Player.Get(issuer); + Player = Core.Player.Get(hub); + Issuer = issuer == ReferenceHub.HostHub ? Core.Server.Instance : Core.Player.Get(issuer); IsIntercom = isIntercom; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUseHotkeyEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUseHotkeyEvent.cs index 96809fc..3393075 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUseHotkeyEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUseHotkeyEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUseHotkeyEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUseHotkey; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ActionName Action { get; } public PlayerUseHotkeyEvent(ReferenceHub hub, ActionName action) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Action = action; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUseItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUseItemEvent.cs index 076cc62..f26a7e1 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUseItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUseItemEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items.Usables; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUseItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUseItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public UsableItem Item { get; } public PlayerUseItemEvent(ReferenceHub hub, UsableItem item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUsedItemEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUsedItemEvent.cs index 6165d11..799b38d 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUsedItemEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUsedItemEvent.cs @@ -1,22 +1,20 @@ using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUsedItemEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUsedItem; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } public PlayerUsedItemEvent(ReferenceHub hub, ItemBase item) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUsingIntercomEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUsingIntercomEvent.cs index 0b96d6e..0ea1cd2 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUsingIntercomEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUsingIntercomEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using PlayerRoles.Voice; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUsingIntercomEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUsingIntercom; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public IntercomState IntercomState { get; } public PlayerUsingIntercomEvent(ReferenceHub hub, IntercomState state) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); IntercomState = state; } diff --git a/NwPluginAPI/Events/Args/Player/PlayerUsingRadioEvent.cs b/NwPluginAPI/Events/Args/Player/PlayerUsingRadioEvent.cs index f3f12be..ba86b1e 100644 --- a/NwPluginAPI/Events/Args/Player/PlayerUsingRadioEvent.cs +++ b/NwPluginAPI/Events/Args/Player/PlayerUsingRadioEvent.cs @@ -1,16 +1,14 @@ using InventorySystem.Items.Radio; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class PlayerUsingRadioEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.PlayerUsingRadio; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RadioItem Radio { get; } [EventArgument] @@ -18,7 +16,7 @@ public class PlayerUsingRadioEvent : IEventArguments public PlayerUsingRadioEvent(ReferenceHub hub, RadioItem radio, float drain) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Radio = radio; Drain = drain; } diff --git a/NwPluginAPI/Events/Args/Player/RagdollSpawnEvent.cs b/NwPluginAPI/Events/Args/Player/RagdollSpawnEvent.cs index dafd072..1438d97 100644 --- a/NwPluginAPI/Events/Args/Player/RagdollSpawnEvent.cs +++ b/NwPluginAPI/Events/Args/Player/RagdollSpawnEvent.cs @@ -1,17 +1,15 @@ using PlayerRoles; using PlayerStatsSystem; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Player { public class RagdollSpawnEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.RagdollSpawn; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public IRagdollRole Ragdoll { get; } [EventArgument] @@ -19,7 +17,7 @@ public class RagdollSpawnEvent : IEventArguments public RagdollSpawnEvent(ReferenceHub hub, IRagdollRole ragdoll, DamageHandlerBase handler) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Ragdoll = ragdoll; DamageHandler = handler; } diff --git a/NwPluginAPI/Events/Args/Scp049/Scp049ResurrectBodyEvent.cs b/NwPluginAPI/Events/Args/Scp049/Scp049ResurrectBodyEvent.cs index 74c1b8d..d91442a 100644 --- a/NwPluginAPI/Events/Args/Scp049/Scp049ResurrectBodyEvent.cs +++ b/NwPluginAPI/Events/Args/Scp049/Scp049ResurrectBodyEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp049 { public class Scp049ResurrectBodyEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp049ResurrectBody; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public BasicRagdoll Body { get; } public Scp049ResurrectBodyEvent(ReferenceHub hub, ReferenceHub target, BasicRagdoll body) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); Body = body; } diff --git a/NwPluginAPI/Events/Args/Scp049/Scp049StartResurrectingBodyEvent.cs b/NwPluginAPI/Events/Args/Scp049/Scp049StartResurrectingBodyEvent.cs index 16a1fff..da71092 100644 --- a/NwPluginAPI/Events/Args/Scp049/Scp049StartResurrectingBodyEvent.cs +++ b/NwPluginAPI/Events/Args/Scp049/Scp049StartResurrectingBodyEvent.cs @@ -1,16 +1,15 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp049 { public class Scp049StartResurrectingBodyEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp049StartResurrectingBody; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public BasicRagdoll Body { get; } [EventArgument] @@ -18,8 +17,8 @@ public class Scp049StartResurrectingBodyEvent : IEventArguments public Scp049StartResurrectingBodyEvent(ReferenceHub hub, ReferenceHub target, BasicRagdoll body, bool canResurrct) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); Body = body; CanResurrct = canResurrct; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutRoomEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutRoomEvent.cs index 3513bdf..de271ae 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutRoomEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutRoomEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using MapGeneration; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079BlackoutRoomEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079BlackoutRoom; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RoomIdentifier Room { get; } public Scp079BlackoutRoomEvent(ReferenceHub hub, RoomIdentifier room) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Room = room; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutZoneEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutZoneEvent.cs index 01ba005..c9ffa4e 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutZoneEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079BlackoutZoneEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using MapGeneration; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079BlackoutZoneEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079BlackoutZone; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public FacilityZone Zone { get; } public Scp079BlackoutZoneEvent(ReferenceHub hub, FacilityZone zone) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Zone = zone; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079CameraChangedEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079CameraChangedEvent.cs index 76c9444..b4cc5bc 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079CameraChangedEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079CameraChangedEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using PlayerRoles.PlayableScps.Scp079.Cameras; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079CameraChangedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079CameraChanged; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp079Camera Camera { get; } public Scp079CameraChangedEvent(ReferenceHub hub, Scp079Camera camera) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Camera = camera; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079CancelRoomLockdownEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079CancelRoomLockdownEvent.cs index 9e757dc..bc55b89 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079CancelRoomLockdownEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079CancelRoomLockdownEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using MapGeneration; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079CancelRoomLockdownEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079CancelRoomLockdown; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RoomIdentifier Room { get; } public Scp079CancelRoomLockdownEvent(ReferenceHub hub, RoomIdentifier room) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Room = room; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079GainExperienceEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079GainExperienceEvent.cs index f26a20c..ffee5b9 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079GainExperienceEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079GainExperienceEvent.cs @@ -1,15 +1,14 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using PlayerRoles.PlayableScps.Scp079; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079GainExperienceEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079GainExperience; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public int Amount { get; set; } [EventArgument] @@ -17,7 +16,7 @@ public class Scp079GainExperienceEvent : IEventArguments public Scp079GainExperienceEvent(ReferenceHub hub, int amount, Scp079HudTranslation reason) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Amount = amount; Reason = reason; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079LevelUpTierEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079LevelUpTierEvent.cs index 2eb6adc..ec01b24 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079LevelUpTierEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079LevelUpTierEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079LevelUpTierEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079LevelUpTier; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public int Tier { get; } public Scp079LevelUpTierEvent(ReferenceHub hub, int tier) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Tier = tier; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079LockDoorEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079LockDoorEvent.cs index 6da3c94..7550107 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079LockDoorEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079LockDoorEvent.cs @@ -1,22 +1,20 @@ using Interactables.Interobjects.DoorUtils; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079LockDoorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079LockDoor; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public DoorVariant Door { get; } public Scp079LockDoorEvent(ReferenceHub hub, DoorVariant door) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Door = door; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079LockdownRoomEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079LockdownRoomEvent.cs index a2cf700..7f37986 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079LockdownRoomEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079LockdownRoomEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using MapGeneration; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079LockdownRoomEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079LockdownRoom; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public RoomIdentifier Room { get; } public Scp079LockdownRoomEvent(ReferenceHub hub, RoomIdentifier room) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Room = room; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079UnlockDoorEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079UnlockDoorEvent.cs index f86c0e5..3f132bf 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079UnlockDoorEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079UnlockDoorEvent.cs @@ -1,22 +1,20 @@ using Interactables.Interobjects.DoorUtils; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079UnlockDoorEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079UnlockDoor; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public DoorVariant Door { get; } public Scp079UnlockDoorEvent(ReferenceHub hub, DoorVariant door) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Door = door; } diff --git a/NwPluginAPI/Events/Args/Scp079/Scp079UseTeslaEvent.cs b/NwPluginAPI/Events/Args/Scp079/Scp079UseTeslaEvent.cs index 21272cc..c8ab9aa 100644 --- a/NwPluginAPI/Events/Args/Scp079/Scp079UseTeslaEvent.cs +++ b/NwPluginAPI/Events/Args/Scp079/Scp079UseTeslaEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp079 { public class Scp079UseTeslaEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp079UseTesla; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public TeslaGate Tesla { get; } public Scp079UseTeslaEvent(ReferenceHub hub, TeslaGate tesla) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Tesla = tesla; } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096AddingTargetEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096AddingTargetEvent.cs index 4be2067..b4b8193 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096AddingTargetEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096AddingTargetEvent.cs @@ -1,23 +1,22 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096AddingTargetEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096AddingTarget; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } [EventArgument] public bool IsForLook { get; } public Scp096AddingTargetEvent(ReferenceHub hub, ReferenceHub target, bool isForLook) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); IsForLook = isForLook; } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096ChangeStateEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096ChangeStateEvent.cs index ce97c73..9b545a1 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096ChangeStateEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096ChangeStateEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using PlayerRoles.PlayableScps.Scp096; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096ChangeStateEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096ChangeState; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp096RageState RageState { get; } public Scp096ChangeStateEvent(ReferenceHub hub, Scp096RageState state) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); RageState = state; } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096ChargingEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096ChargingEvent.cs index 6bcd537..0a5535d 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096ChargingEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096ChargingEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096ChargingEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096Charging; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public Scp096ChargingEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } Scp096ChargingEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096EnragingEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096EnragingEvent.cs index 58b7367..360cc9d 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096EnragingEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096EnragingEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096EnragingEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096Enraging; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public float InitialDuration { get; } public Scp096EnragingEvent(ReferenceHub hub, float intialDuration) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); InitialDuration = intialDuration; } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096PryingGateEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096PryingGateEvent.cs index d7e17cb..2be81b2 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096PryingGateEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096PryingGateEvent.cs @@ -1,22 +1,20 @@ using Interactables.Interobjects; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096PryingGateEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096PryingGate; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public PryableDoor GateDoor { get; } public Scp096PryingGateEvent(ReferenceHub hub, PryableDoor door) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); GateDoor = door; } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096StartCryingEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096StartCryingEvent.cs index 0e31e32..5a98318 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096StartCryingEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096StartCryingEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096StartCryingEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096StartCrying; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public Scp096StartCryingEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } Scp096StartCryingEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp096/Scp096TryNotCryEvent.cs b/NwPluginAPI/Events/Args/Scp096/Scp096TryNotCryEvent.cs index 4a3b2fc..38789f7 100644 --- a/NwPluginAPI/Events/Args/Scp096/Scp096TryNotCryEvent.cs +++ b/NwPluginAPI/Events/Args/Scp096/Scp096TryNotCryEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp096 { public class Scp096TryNotCryEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp096TryNotCry; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public Scp096TryNotCryEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } Scp096TryNotCryEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp106/Scp106StalkingEvent.cs b/NwPluginAPI/Events/Args/Scp106/Scp106StalkingEvent.cs index fc900d7..f9be2db 100644 --- a/NwPluginAPI/Events/Args/Scp106/Scp106StalkingEvent.cs +++ b/NwPluginAPI/Events/Args/Scp106/Scp106StalkingEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp106 { public class Scp106StalkingEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp106Stalking; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public bool Activated { get; } public Scp106StalkingEvent(ReferenceHub hub, bool activated) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Activated = activated; } diff --git a/NwPluginAPI/Events/Args/Scp106/Scp106TeleportPlayerEvent.cs b/NwPluginAPI/Events/Args/Scp106/Scp106TeleportPlayerEvent.cs index 0a59e39..c486f6b 100644 --- a/NwPluginAPI/Events/Args/Scp106/Scp106TeleportPlayerEvent.cs +++ b/NwPluginAPI/Events/Args/Scp106/Scp106TeleportPlayerEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp106 { public class Scp106TeleportPlayerEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp106TeleportPlayer; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } public Scp106TeleportPlayerEvent(ReferenceHub hub, ReferenceHub target) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); } Scp106TeleportPlayerEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp173/Scp173BreakneckSpeedsEvent.cs b/NwPluginAPI/Events/Args/Scp173/Scp173BreakneckSpeedsEvent.cs index 61880f3..7f94766 100644 --- a/NwPluginAPI/Events/Args/Scp173/Scp173BreakneckSpeedsEvent.cs +++ b/NwPluginAPI/Events/Args/Scp173/Scp173BreakneckSpeedsEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp173 { public class Scp173BreakneckSpeedsEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp173BreakneckSpeeds; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public bool Activate { get; } public Scp173BreakneckSpeedsEvent(ReferenceHub hub, bool activate) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Activate = activate; } diff --git a/NwPluginAPI/Events/Args/Scp173/Scp173CreateTantrumEvent.cs b/NwPluginAPI/Events/Args/Scp173/Scp173CreateTantrumEvent.cs index 113ab29..547a098 100644 --- a/NwPluginAPI/Events/Args/Scp173/Scp173CreateTantrumEvent.cs +++ b/NwPluginAPI/Events/Args/Scp173/Scp173CreateTantrumEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp173 { public class Scp173CreateTantrumEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp173CreateTantrum; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public Scp173CreateTantrumEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } Scp173CreateTantrumEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp173/Scp173NewObserverEvent.cs b/NwPluginAPI/Events/Args/Scp173/Scp173NewObserverEvent.cs index ee0980f..d8efa12 100644 --- a/NwPluginAPI/Events/Args/Scp173/Scp173NewObserverEvent.cs +++ b/NwPluginAPI/Events/Args/Scp173/Scp173NewObserverEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp173 { public class Scp173NewObserverEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp173NewObserver; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } public Scp173NewObserverEvent(ReferenceHub hub, ReferenceHub target) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); } Scp173NewObserverEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp173/Scp173PlaySoundEvent.cs b/NwPluginAPI/Events/Args/Scp173/Scp173PlaySoundEvent.cs index 5b94786..2a51aba 100644 --- a/NwPluginAPI/Events/Args/Scp173/Scp173PlaySoundEvent.cs +++ b/NwPluginAPI/Events/Args/Scp173/Scp173PlaySoundEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using static PlayerRoles.PlayableScps.Scp173.Scp173AudioPlayer; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp173 { public class Scp173PlaySoundEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp173PlaySound; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp173SoundId SoundId { get; } public Scp173PlaySoundEvent(ReferenceHub hub, Scp173SoundId id) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); SoundId = id; } diff --git a/NwPluginAPI/Events/Args/Scp173/Scp173SnapPlayerEvent.cs b/NwPluginAPI/Events/Args/Scp173/Scp173SnapPlayerEvent.cs index c8653b3..ca7ef05 100644 --- a/NwPluginAPI/Events/Args/Scp173/Scp173SnapPlayerEvent.cs +++ b/NwPluginAPI/Events/Args/Scp173/Scp173SnapPlayerEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp173 { public class Scp173SnapPlayerEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp173SnapPlayer; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] - public Player Target { get; } + public Core.Player Target { get; } public Scp173SnapPlayerEvent(ReferenceHub hub, ReferenceHub target) { - Player = Player.Get(hub); - Target = Player.Get(target); + Player = Core.Player.Get(hub); + Target = Core.Player.Get(target); } Scp173SnapPlayerEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914ActivateEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914ActivateEvent.cs index 9ed1680..d064bd9 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914ActivateEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914ActivateEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914ActivateEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp914Activate; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp914KnobSetting KnobSetting { get; } public Scp914ActivateEvent(ReferenceHub hub, Scp914KnobSetting setting) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); KnobSetting = setting; } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914InventoryItemUpgradedEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914InventoryItemUpgradedEvent.cs index df2d417..0a4f437 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914InventoryItemUpgradedEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914InventoryItemUpgradedEvent.cs @@ -1,17 +1,15 @@ using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914InventoryItemUpgradedEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp914InventoryItemUpgraded; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } [EventArgument] @@ -19,7 +17,7 @@ public class Scp914InventoryItemUpgradedEvent : IEventArguments public Scp914InventoryItemUpgradedEvent(ReferenceHub hub, ItemBase item, Scp914KnobSetting setting) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; KnobSetting = setting; } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914KnobChangeEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914KnobChangeEvent.cs index 4b6f4b1..8545022 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914KnobChangeEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914KnobChangeEvent.cs @@ -1,15 +1,14 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914KnobChangeEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp914KnobChange; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp914KnobSetting KnobSetting { get; set; } [EventArgument] @@ -17,7 +16,7 @@ public class Scp914KnobChangeEvent : IEventArguments public Scp914KnobChangeEvent(ReferenceHub hub, Scp914KnobSetting setting, Scp914KnobSetting oldSetting) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); KnobSetting = setting; PreviousKnobSetting = oldSetting; } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914PickupUpgradedEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914PickupUpgradedEvent.cs index 63210b6..a92d3fe 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914PickupUpgradedEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914PickupUpgradedEvent.cs @@ -1,10 +1,10 @@ -using UnityEngine; using InventorySystem.Items.Pickups; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914PickupUpgradedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914ProcessPlayerEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914ProcessPlayerEvent.cs index 3d4dbf9..560d9c1 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914ProcessPlayerEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914ProcessPlayerEvent.cs @@ -1,17 +1,15 @@ -using UnityEngine; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914ProcessPlayerEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp914ProcessPlayer; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp914KnobSetting KnobSetting { get; } [EventArgument] @@ -19,7 +17,7 @@ public class Scp914ProcessPlayerEvent : IEventArguments public Scp914ProcessPlayerEvent(ReferenceHub hub, Scp914KnobSetting setting, Vector3 outPosition) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); KnobSetting = setting; OutPosition = outPosition; } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914UpgradeInventoryEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914UpgradeInventoryEvent.cs index dc62d53..443d046 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914UpgradeInventoryEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914UpgradeInventoryEvent.cs @@ -1,17 +1,15 @@ using InventorySystem.Items; - -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914UpgradeInventoryEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp914UpgradeInventory; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public ItemBase Item { get; } [EventArgument] @@ -19,7 +17,7 @@ public class Scp914UpgradeInventoryEvent : IEventArguments public Scp914UpgradeInventoryEvent(ReferenceHub hub, ItemBase item, Scp914KnobSetting setting) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Item = item; KnobSetting = setting; } diff --git a/NwPluginAPI/Events/Args/Scp914/Scp914UpgradePickupEvent.cs b/NwPluginAPI/Events/Args/Scp914/Scp914UpgradePickupEvent.cs index bbadf06..08ad7a3 100644 --- a/NwPluginAPI/Events/Args/Scp914/Scp914UpgradePickupEvent.cs +++ b/NwPluginAPI/Events/Args/Scp914/Scp914UpgradePickupEvent.cs @@ -1,10 +1,10 @@ -using UnityEngine; using InventorySystem.Items.Pickups; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Scp914; +using UnityEngine; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp914 { public class Scp914UpgradePickupEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Scp939/Scp939AttackEvent.cs b/NwPluginAPI/Events/Args/Scp939/Scp939AttackEvent.cs index 0eca1c4..24675c2 100644 --- a/NwPluginAPI/Events/Args/Scp939/Scp939AttackEvent.cs +++ b/NwPluginAPI/Events/Args/Scp939/Scp939AttackEvent.cs @@ -1,20 +1,19 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp939 { public class Scp939AttackEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp939Attack; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public IDestructible Target { get; } public Scp939AttackEvent(ReferenceHub hub, IDestructible target) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); Target = target; } diff --git a/NwPluginAPI/Events/Args/Scp939/Scp939CreateAmnesticCloudEvent.cs b/NwPluginAPI/Events/Args/Scp939/Scp939CreateAmnesticCloudEvent.cs index 3968704..f99df45 100644 --- a/NwPluginAPI/Events/Args/Scp939/Scp939CreateAmnesticCloudEvent.cs +++ b/NwPluginAPI/Events/Args/Scp939/Scp939CreateAmnesticCloudEvent.cs @@ -1,18 +1,17 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp939 { public class Scp939CreateAmnesticCloudEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp939CreateAmnesticCloud; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } public Scp939CreateAmnesticCloudEvent(ReferenceHub hub) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); } Scp939CreateAmnesticCloudEvent() { } diff --git a/NwPluginAPI/Events/Args/Scp939/Scp939LungeEvent.cs b/NwPluginAPI/Events/Args/Scp939/Scp939LungeEvent.cs index db95c41..647fe2a 100644 --- a/NwPluginAPI/Events/Args/Scp939/Scp939LungeEvent.cs +++ b/NwPluginAPI/Events/Args/Scp939/Scp939LungeEvent.cs @@ -1,21 +1,20 @@ -using PluginAPI.Core; -using PluginAPI.Enums; -using PluginAPI.Core.Attributes; using PlayerRoles.PlayableScps.Scp939; +using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Scp939 { public class Scp939LungeEvent : IEventArguments { public ServerEventType BaseType { get; } = ServerEventType.Scp939Lunge; [EventArgument] - public Player Player { get; } + public Core.Player Player { get; } [EventArgument] public Scp939LungeState State { get; } public Scp939LungeEvent(ReferenceHub hub, Scp939LungeState state) { - Player = Player.Get(hub); + Player = Core.Player.Get(hub); State = state; } diff --git a/NwPluginAPI/Events/Args/Server/BanIssuedEvent.cs b/NwPluginAPI/Events/Args/Server/BanIssuedEvent.cs index 92acb44..8ce3522 100644 --- a/NwPluginAPI/Events/Args/Server/BanIssuedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/BanIssuedEvent.cs @@ -1,9 +1,8 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; - +using PluginAPI.Enums; using static BanHandler; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class BanIssuedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/BanRevokedEvent.cs b/NwPluginAPI/Events/Args/Server/BanRevokedEvent.cs index c70ac7d..ff0de58 100644 --- a/NwPluginAPI/Events/Args/Server/BanRevokedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/BanRevokedEvent.cs @@ -2,7 +2,7 @@ using PluginAPI.Enums; using static BanHandler; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class BanRevokedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/BanUpdatedEvent.cs b/NwPluginAPI/Events/Args/Server/BanUpdatedEvent.cs index 483d288..12c2934 100644 --- a/NwPluginAPI/Events/Args/Server/BanUpdatedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/BanUpdatedEvent.cs @@ -1,9 +1,8 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; - +using PluginAPI.Enums; using static BanHandler; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class BanUpdatedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/ConsoleCommandEvent.cs b/NwPluginAPI/Events/Args/Server/ConsoleCommandEvent.cs index 21ca611..c787bad 100644 --- a/NwPluginAPI/Events/Args/Server/ConsoleCommandEvent.cs +++ b/NwPluginAPI/Events/Args/Server/ConsoleCommandEvent.cs @@ -1,8 +1,8 @@ using CommandSystem; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class ConsoleCommandEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/ConsoleCommandExecutedEvent.cs b/NwPluginAPI/Events/Args/Server/ConsoleCommandExecutedEvent.cs index 8d01927..c76cf95 100644 --- a/NwPluginAPI/Events/Args/Server/ConsoleCommandExecutedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/ConsoleCommandExecutedEvent.cs @@ -1,8 +1,8 @@ using CommandSystem; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class ConsoleCommandExecutedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RemoteAdminCommandEvent.cs b/NwPluginAPI/Events/Args/Server/RemoteAdminCommandEvent.cs index 61995b6..8209f6d 100644 --- a/NwPluginAPI/Events/Args/Server/RemoteAdminCommandEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RemoteAdminCommandEvent.cs @@ -1,8 +1,8 @@ using CommandSystem; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RemoteAdminCommandEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RemoteAdminCommandExecutedEvent.cs b/NwPluginAPI/Events/Args/Server/RemoteAdminCommandExecutedEvent.cs index 9334f41..3e9816a 100644 --- a/NwPluginAPI/Events/Args/Server/RemoteAdminCommandExecutedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RemoteAdminCommandExecutedEvent.cs @@ -1,8 +1,8 @@ using CommandSystem; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RemoteAdminCommandExecutedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RoundEndConditionsCheckEvent.cs b/NwPluginAPI/Events/Args/Server/RoundEndConditionsCheckEvent.cs index 8989dcb..0cdfd2a 100644 --- a/NwPluginAPI/Events/Args/Server/RoundEndConditionsCheckEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RoundEndConditionsCheckEvent.cs @@ -1,7 +1,7 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RoundEndConditionsCheckEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RoundEndEvent.cs b/NwPluginAPI/Events/Args/Server/RoundEndEvent.cs index 7da8a13..178da6c 100644 --- a/NwPluginAPI/Events/Args/Server/RoundEndEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RoundEndEvent.cs @@ -1,8 +1,8 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using static RoundSummary; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RoundEndEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RoundRestartEvent.cs b/NwPluginAPI/Events/Args/Server/RoundRestartEvent.cs index 9ef0f7a..2c24773 100644 --- a/NwPluginAPI/Events/Args/Server/RoundRestartEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RoundRestartEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RoundRestartEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/RoundStartEvent.cs b/NwPluginAPI/Events/Args/Server/RoundStartEvent.cs index 5936692..000505d 100644 --- a/NwPluginAPI/Events/Args/Server/RoundStartEvent.cs +++ b/NwPluginAPI/Events/Args/Server/RoundStartEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class RoundStartEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/TeamRespawnEvent.cs b/NwPluginAPI/Events/Args/Server/TeamRespawnEvent.cs index 8043fc6..28615a9 100644 --- a/NwPluginAPI/Events/Args/Server/TeamRespawnEvent.cs +++ b/NwPluginAPI/Events/Args/Server/TeamRespawnEvent.cs @@ -1,10 +1,9 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Respawning; using System.Collections.Generic; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class TeamRespawnEvent : IEventArguments { @@ -12,7 +11,7 @@ public class TeamRespawnEvent : IEventArguments [EventArgument] public SpawnableTeamType Team { get; set; } [EventArgument] - public List Players { get; set; } = new List(); + public List Players { get; set; } = new(); [EventArgument] public int NextWaveMaxSize { get; set; } @@ -20,9 +19,9 @@ public TeamRespawnEvent(SpawnableTeamType team, List spectators) { Team = team; - foreach(var spectator in spectators) + foreach (var spectator in spectators) { - if (Player.TryGet(spectator, out Player plr)) + if (Core.Player.TryGet(spectator, out Core.Player plr)) Players.Add(plr); } } diff --git a/NwPluginAPI/Events/Args/Server/TeamRespawnSelectedEvent.cs b/NwPluginAPI/Events/Args/Server/TeamRespawnSelectedEvent.cs index dc9d610..fce4a58 100644 --- a/NwPluginAPI/Events/Args/Server/TeamRespawnSelectedEvent.cs +++ b/NwPluginAPI/Events/Args/Server/TeamRespawnSelectedEvent.cs @@ -1,8 +1,8 @@ -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; using Respawning; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class TeamRespawnSelectedEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Server/WaitingForPlayersEvent.cs b/NwPluginAPI/Events/Args/Server/WaitingForPlayersEvent.cs index 1cefcbc..e73bad9 100644 --- a/NwPluginAPI/Events/Args/Server/WaitingForPlayersEvent.cs +++ b/NwPluginAPI/Events/Args/Server/WaitingForPlayersEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Server { public class WaitingForPlayersEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Warhead/WarheadDetonationEvent.cs b/NwPluginAPI/Events/Args/Warhead/WarheadDetonationEvent.cs index 4b861bb..4d42a43 100644 --- a/NwPluginAPI/Events/Args/Warhead/WarheadDetonationEvent.cs +++ b/NwPluginAPI/Events/Args/Warhead/WarheadDetonationEvent.cs @@ -1,6 +1,6 @@ using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Warhead { public class WarheadDetonationEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Warhead/WarheadStartEvent.cs b/NwPluginAPI/Events/Args/Warhead/WarheadStartEvent.cs index 8dec90c..0a07958 100644 --- a/NwPluginAPI/Events/Args/Warhead/WarheadStartEvent.cs +++ b/NwPluginAPI/Events/Args/Warhead/WarheadStartEvent.cs @@ -1,8 +1,7 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Warhead { public class WarheadStartEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Args/Warhead/WarheadStopEvent.cs b/NwPluginAPI/Events/Args/Warhead/WarheadStopEvent.cs index caa48e0..9a3c42a 100644 --- a/NwPluginAPI/Events/Args/Warhead/WarheadStopEvent.cs +++ b/NwPluginAPI/Events/Args/Warhead/WarheadStopEvent.cs @@ -1,8 +1,7 @@ -using PluginAPI.Core; -using PluginAPI.Enums; using PluginAPI.Core.Attributes; +using PluginAPI.Enums; -namespace PluginAPI.Events +namespace PluginAPI.Events.Args.Warhead { public class WarheadStopEvent : IEventArguments { diff --git a/NwPluginAPI/Events/Event.cs b/NwPluginAPI/Events/Event.cs index 39d2749..21bc67a 100644 --- a/NwPluginAPI/Events/Event.cs +++ b/NwPluginAPI/Events/Event.cs @@ -38,7 +38,7 @@ public Event(IEventArguments args) EventArg = args; EventArgType = EventArg.GetType(); - foreach(var property in EventArgType.GetProperties(BindingFlags.Public | BindingFlags.Instance)) + foreach (var property in EventArgType.GetProperties(BindingFlags.Public | BindingFlags.Instance)) { var argument = property.GetCustomAttribute(); diff --git a/NwPluginAPI/Events/EventManager.cs b/NwPluginAPI/Events/EventManager.cs index 2077739..beaac7f 100644 --- a/NwPluginAPI/Events/EventManager.cs +++ b/NwPluginAPI/Events/EventManager.cs @@ -1,14 +1,14 @@ namespace PluginAPI.Events { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Reflection; using Core; using Core.Attributes; using Core.Factories; using Enums; using Loader; + using System; + using System.Collections.Generic; + using System.Linq; + using System.Reflection; /// /// Manages plugin events. @@ -33,7 +33,7 @@ public static class EventManager internal static void Init() { - foreach(var type in typeof(EventManager).Assembly.GetTypes()) + foreach (var type in typeof(EventManager).Assembly.GetTypes()) { var interfaces = type.GetInterfaces(); try @@ -327,7 +327,7 @@ public static T ExecuteEvent(IEventArguments args) where T : struct Dictionary evToIndex = new Dictionary(); int index = 0; - foreach(var parameter in ev.Parameters) + foreach (var parameter in ev.Parameters) { input[index] = parameter.PropertyInfo.GetValue(args); diff --git a/NwPluginAPI/Events/IEventCancellation.cs b/NwPluginAPI/Events/IEventCancellation.cs index 4baaad1..9f25d0b 100644 --- a/NwPluginAPI/Events/IEventCancellation.cs +++ b/NwPluginAPI/Events/IEventCancellation.cs @@ -1,5 +1,4 @@ using System; -using LiteNetLib.Utils; // ReSharper disable MemberCanBePrivate.Global // ReSharper disable UnusedAutoPropertyAccessor.Global diff --git a/NwPluginAPI/Helpers/Paths.cs b/NwPluginAPI/Helpers/Paths.cs index 9221afd..171bfb0 100644 --- a/NwPluginAPI/Helpers/Paths.cs +++ b/NwPluginAPI/Helpers/Paths.cs @@ -1,10 +1,10 @@ namespace PluginAPI.Helpers { - using System; - using System.IO; using Core; using Loader.Features; using NorthwoodLib; + using System; + using System.IO; /// /// Contains all important folder paths. diff --git a/NwPluginAPI/Loader/AssemblyLoader.cs b/NwPluginAPI/Loader/AssemblyLoader.cs index 03801c3..962acc3 100644 --- a/NwPluginAPI/Loader/AssemblyLoader.cs +++ b/NwPluginAPI/Loader/AssemblyLoader.cs @@ -1,17 +1,17 @@ namespace PluginAPI.Loader { - using System.IO.Compression; + using Core; + using Core.Extensions; + using Features; + using Helpers; + using PluginAPI.Events; using System; using System.Collections.Generic; using System.IO; + using System.IO.Compression; using System.Linq; using System.Reflection; - using Core; - using Core.Extensions; - using Helpers; - using Features; using Log = Core.Log; - using PluginAPI.Events; /// /// Manages initialization of plugin system and loading of plugins. diff --git a/NwPluginAPI/Roles/Humans/BaseHuman.cs b/NwPluginAPI/Roles/Humans/BaseHuman.cs index c208f0c..d47d9f2 100644 --- a/NwPluginAPI/Roles/Humans/BaseHuman.cs +++ b/NwPluginAPI/Roles/Humans/BaseHuman.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans { public class BaseHuman : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Chaos/BaseChaos.cs b/NwPluginAPI/Roles/Humans/Chaos/BaseChaos.cs index 0d39012..bebe990 100644 --- a/NwPluginAPI/Roles/Humans/Chaos/BaseChaos.cs +++ b/NwPluginAPI/Roles/Humans/Chaos/BaseChaos.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Chaos { public class BaseChaos : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Chaos/ChaosConscript.cs b/NwPluginAPI/Roles/Humans/Chaos/ChaosConscript.cs index e0cd0bc..a07c7d9 100644 --- a/NwPluginAPI/Roles/Humans/Chaos/ChaosConscript.cs +++ b/NwPluginAPI/Roles/Humans/Chaos/ChaosConscript.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Chaos { public class ChaosConscript : BaseChaos where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Chaos/ChaosMarauder.cs b/NwPluginAPI/Roles/Humans/Chaos/ChaosMarauder.cs index a473669..e74f9e7 100644 --- a/NwPluginAPI/Roles/Humans/Chaos/ChaosMarauder.cs +++ b/NwPluginAPI/Roles/Humans/Chaos/ChaosMarauder.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Chaos { public class ChaosMarauder : BaseChaos where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Chaos/ChaosRepressor.cs b/NwPluginAPI/Roles/Humans/Chaos/ChaosRepressor.cs index 26b111f..9fc77c0 100644 --- a/NwPluginAPI/Roles/Humans/Chaos/ChaosRepressor.cs +++ b/NwPluginAPI/Roles/Humans/Chaos/ChaosRepressor.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Chaos { public class ChaosRepressor : BaseChaos where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Chaos/ChaosRifleman.cs b/NwPluginAPI/Roles/Humans/Chaos/ChaosRifleman.cs index db8af59..e862089 100644 --- a/NwPluginAPI/Roles/Humans/Chaos/ChaosRifleman.cs +++ b/NwPluginAPI/Roles/Humans/Chaos/ChaosRifleman.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Chaos { public class ChaosRifleman : BaseChaos where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/ClassD.cs b/NwPluginAPI/Roles/Humans/ClassD.cs index 650d5a3..440eb29 100644 --- a/NwPluginAPI/Roles/Humans/ClassD.cs +++ b/NwPluginAPI/Roles/Humans/ClassD.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans { public class ClassD : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/FacilityGuard.cs b/NwPluginAPI/Roles/Humans/FacilityGuard.cs index 0ed8aeb..7950160 100644 --- a/NwPluginAPI/Roles/Humans/FacilityGuard.cs +++ b/NwPluginAPI/Roles/Humans/FacilityGuard.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans { public class FacilityGuard : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Ntf/BaseNineTailedFox.cs b/NwPluginAPI/Roles/Humans/Ntf/BaseNineTailedFox.cs index aec4b17..5a17321 100644 --- a/NwPluginAPI/Roles/Humans/Ntf/BaseNineTailedFox.cs +++ b/NwPluginAPI/Roles/Humans/Ntf/BaseNineTailedFox.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Ntf { public class BaseNineTailedFox : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Ntf/NtfCaptain.cs b/NwPluginAPI/Roles/Humans/Ntf/NtfCaptain.cs index aaf6416..0fecdd5 100644 --- a/NwPluginAPI/Roles/Humans/Ntf/NtfCaptain.cs +++ b/NwPluginAPI/Roles/Humans/Ntf/NtfCaptain.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Ntf { public class NtfCaptain : BaseNineTailedFox where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Ntf/NtfPrivate.cs b/NwPluginAPI/Roles/Humans/Ntf/NtfPrivate.cs index 9683426..200fb7d 100644 --- a/NwPluginAPI/Roles/Humans/Ntf/NtfPrivate.cs +++ b/NwPluginAPI/Roles/Humans/Ntf/NtfPrivate.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Ntf { public class NtfPrivate : BaseNineTailedFox where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Ntf/NtfSergeant.cs b/NwPluginAPI/Roles/Humans/Ntf/NtfSergeant.cs index d2db3fd..346a254 100644 --- a/NwPluginAPI/Roles/Humans/Ntf/NtfSergeant.cs +++ b/NwPluginAPI/Roles/Humans/Ntf/NtfSergeant.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Ntf { public class NtfSergeant : BaseNineTailedFox where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Ntf/NtfSpecialist.cs b/NwPluginAPI/Roles/Humans/Ntf/NtfSpecialist.cs index 12d9c57..7cc8da1 100644 --- a/NwPluginAPI/Roles/Humans/Ntf/NtfSpecialist.cs +++ b/NwPluginAPI/Roles/Humans/Ntf/NtfSpecialist.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans.Ntf { public class NtfSpecialist : BaseNineTailedFox where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Scientist.cs b/NwPluginAPI/Roles/Humans/Scientist.cs index 5a0691b..fd043ee 100644 --- a/NwPluginAPI/Roles/Humans/Scientist.cs +++ b/NwPluginAPI/Roles/Humans/Scientist.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans { public class Scientist : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Humans/Tutorial.cs b/NwPluginAPI/Roles/Humans/Tutorial.cs index 53629d2..b3a00b2 100644 --- a/NwPluginAPI/Roles/Humans/Tutorial.cs +++ b/NwPluginAPI/Roles/Humans/Tutorial.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Humans { public class Tutorial : BaseHuman where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Other/CustomRole.cs b/NwPluginAPI/Roles/Other/CustomRole.cs index 431b600..f7d6df8 100644 --- a/NwPluginAPI/Roles/Other/CustomRole.cs +++ b/NwPluginAPI/Roles/Other/CustomRole.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Other { public class CustomRole : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Other/None.cs b/NwPluginAPI/Roles/Other/None.cs index a16b1cd..fae8819 100644 --- a/NwPluginAPI/Roles/Other/None.cs +++ b/NwPluginAPI/Roles/Other/None.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Other { public class None : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Other/Overwatch.cs b/NwPluginAPI/Roles/Other/Overwatch.cs index ffd606c..dc99e70 100644 --- a/NwPluginAPI/Roles/Other/Overwatch.cs +++ b/NwPluginAPI/Roles/Other/Overwatch.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Other { public class Overwatch : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Other/Spectator.cs b/NwPluginAPI/Roles/Other/Spectator.cs index 0fdcc08..30053aa 100644 --- a/NwPluginAPI/Roles/Other/Spectator.cs +++ b/NwPluginAPI/Roles/Other/Spectator.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Other { public class Spectator : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/BaseScp.cs b/NwPluginAPI/Roles/Scps/BaseScp.cs index 550aa75..7133f76 100644 --- a/NwPluginAPI/Roles/Scps/BaseScp.cs +++ b/NwPluginAPI/Roles/Scps/BaseScp.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class BaseScp : BaseRole where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp049.cs b/NwPluginAPI/Roles/Scps/Scp049.cs index 6a26e0c..005d895 100644 --- a/NwPluginAPI/Roles/Scps/Scp049.cs +++ b/NwPluginAPI/Roles/Scps/Scp049.cs @@ -2,7 +2,7 @@ using PluginAPI.Core; using static PlayerRoles.PlayableScps.Scp049.Scp049AudioPlayer; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp049 : BaseScp where TPlayer : Player { @@ -21,9 +21,9 @@ public TPlayer Target return _currentTarget; } - } + } - public Scp049(Scp049Role role) : base(role) + public Scp049(Scp049Role role) : base(role) { RoleBase = role; RoleBase.SubroutineModule.TryGetSubroutine(out SenseAbility); diff --git a/NwPluginAPI/Roles/Scps/Scp0492.cs b/NwPluginAPI/Roles/Scps/Scp0492.cs index dff3d9a..6c2fa8b 100644 --- a/NwPluginAPI/Roles/Scps/Scp0492.cs +++ b/NwPluginAPI/Roles/Scps/Scp0492.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp0492 : BaseScp where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp079.cs b/NwPluginAPI/Roles/Scps/Scp079.cs index b16b8dc..96703a9 100644 --- a/NwPluginAPI/Roles/Scps/Scp079.cs +++ b/NwPluginAPI/Roles/Scps/Scp079.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp079 : BaseScp where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp096.cs b/NwPluginAPI/Roles/Scps/Scp096.cs index 5ffc0a3..756a320 100644 --- a/NwPluginAPI/Roles/Scps/Scp096.cs +++ b/NwPluginAPI/Roles/Scps/Scp096.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp096 : BaseScp where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp106.cs b/NwPluginAPI/Roles/Scps/Scp106.cs index af21061..67139eb 100644 --- a/NwPluginAPI/Roles/Scps/Scp106.cs +++ b/NwPluginAPI/Roles/Scps/Scp106.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp106 : BaseScp where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp173.cs b/NwPluginAPI/Roles/Scps/Scp173.cs index 7194265..ec3767a 100644 --- a/NwPluginAPI/Roles/Scps/Scp173.cs +++ b/NwPluginAPI/Roles/Scps/Scp173.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp173 : BaseScp where TPlayer : Player { diff --git a/NwPluginAPI/Roles/Scps/Scp939.cs b/NwPluginAPI/Roles/Scps/Scp939.cs index b15f15a..736528c 100644 --- a/NwPluginAPI/Roles/Scps/Scp939.cs +++ b/NwPluginAPI/Roles/Scps/Scp939.cs @@ -1,7 +1,7 @@ using PlayerRoles; using PluginAPI.Core; -namespace PluginAPI.Roles +namespace PluginAPI.Roles.Scps { public class Scp939 : BaseScp where TPlayer : Player { diff --git a/TemplatePlugin/EventHandlers.cs b/TemplatePlugin/EventHandlers.cs index 6c22c83..1b4dfc3 100644 --- a/TemplatePlugin/EventHandlers.cs +++ b/TemplatePlugin/EventHandlers.cs @@ -5,6 +5,16 @@ namespace TemplatePlugin using PluginAPI.Core.Attributes; using Factory; using PluginAPI.Events; + using PluginAPI.Events.Args.Scp939; + using PluginAPI.Events.Args.Scp079; + using PluginAPI.Events.Args.Server; + using PluginAPI.Events.Args.Scp173; + using PluginAPI.Events.Args.Scp914; + using PluginAPI.Events.Args.Scp096; + using PluginAPI.Events.Args.Scp106; + using PluginAPI.Events.Args.Player; + using PluginAPI.Events.Args.Warhead; + using PluginAPI.Events.Args.Scp049; public class EventHandlers { diff --git a/TemplatePlugin/MainClass.cs b/TemplatePlugin/MainClass.cs index e44b266..634e5ec 100644 --- a/TemplatePlugin/MainClass.cs +++ b/TemplatePlugin/MainClass.cs @@ -28,6 +28,7 @@ namespace TemplatePlugin using static InventorySystem.Items.Radio.RadioMessages; using PluginAPI.Core.Interfaces; using PlayerRoles.PlayableScps.Scp939; + using PluginAPI.Events.Args.Player; public class MainClass { diff --git a/TemplatePlugin/Roles/CustomScp049.cs b/TemplatePlugin/Roles/CustomScp049.cs index be3f2e9..7565e43 100644 --- a/TemplatePlugin/Roles/CustomScp049.cs +++ b/TemplatePlugin/Roles/CustomScp049.cs @@ -1,7 +1,7 @@ using PlayerRoles.PlayableScps.Scp049; using PluginAPI.Core.Attributes; using PluginAPI.Enums; -using PluginAPI.Roles; +using PluginAPI.Roles.Scps; using TemplatePlugin.Factory; namespace TemplatePlugin.Roles