From d666892635b971590a53728667735d16a77f0863 Mon Sep 17 00:00:00 2001 From: Joker Date: Thu, 30 Sep 2021 13:26:53 -0700 Subject: [PATCH] Updoot to exiled beta & newest SL version --- CustomItems/Config.cs | 2 -- CustomItems/Configs/Items.cs | 2 -- CustomItems/CustomItems.csproj | 20 ++++++++++++-------- CustomItems/Items/AntiMemeticPills.cs | 2 +- CustomItems/Items/AutoGun.cs | 5 +---- CustomItems/Items/C4Charge.cs | 3 +-- CustomItems/Items/DeflectorShield.cs | 3 +-- CustomItems/Items/EmpGrenade.cs | 4 +--- CustomItems/Items/GrenadeLauncher.cs | 4 +--- CustomItems/Items/ImplosionGrenade.cs | 3 +-- CustomItems/Items/LethalInjection.cs | 2 +- CustomItems/Items/LuckyCoin.cs | 3 +-- CustomItems/Items/MediGun.cs | 7 ++----- CustomItems/Items/Scp127.cs | 2 +- CustomItems/Items/Scp1499.cs | 2 +- CustomItems/Items/Scp2818.cs | 3 +-- CustomItems/Items/Scp714.cs | 2 +- CustomItems/Items/SniperRifle.cs | 2 +- CustomItems/Items/TranquilizerGun.cs | 2 +- CustomItems/Patches/AddClass.cs | 1 - CustomItems/Properties/AssemblyInfo.cs | 4 ++-- CustomItems/packages.config | 2 +- 22 files changed, 32 insertions(+), 48 deletions(-) diff --git a/CustomItems/Config.cs b/CustomItems/Config.cs index fd03a9e..8b05a10 100644 --- a/CustomItems/Config.cs +++ b/CustomItems/Config.cs @@ -7,8 +7,6 @@ #pragma warning disable SA1200 -using CustomItems.Configs; - namespace CustomItems { using System; diff --git a/CustomItems/Configs/Items.cs b/CustomItems/Configs/Items.cs index 7f0f0c2..9843c0f 100644 --- a/CustomItems/Configs/Items.cs +++ b/CustomItems/Configs/Items.cs @@ -14,8 +14,6 @@ namespace CustomItems.Configs using System.Collections.Generic; using System.ComponentModel; - using Exiled.API.Enums; - /// /// All item config settings. /// diff --git a/CustomItems/CustomItems.csproj b/CustomItems/CustomItems.csproj index 21ed5a2..bbeb322 100644 --- a/CustomItems/CustomItems.csproj +++ b/CustomItems/CustomItems.csproj @@ -54,38 +54,42 @@ $(EXILED_REFERENCES)\CommandSystem.Core.dll - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.API.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Bootstrap.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CreditTags.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CustomItems.dll + True + + + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CustomRoles.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Events.dll True ..\..\EXILED\bin\Debug\Exiled.Example.dll - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Loader.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Permissions.dll True - ..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll + ..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Updater.dll True diff --git a/CustomItems/Items/AntiMemeticPills.cs b/CustomItems/Items/AntiMemeticPills.cs index e7f2277..2ffd54f 100644 --- a/CustomItems/Items/AntiMemeticPills.cs +++ b/CustomItems/Items/AntiMemeticPills.cs @@ -10,9 +10,9 @@ namespace CustomItems.Items using System.Collections.Generic; using CustomPlayerEffects; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; diff --git a/CustomItems/Items/AutoGun.cs b/CustomItems/Items/AutoGun.cs index 5067465..6c2a5b6 100644 --- a/CustomItems/Items/AutoGun.cs +++ b/CustomItems/Items/AutoGun.cs @@ -9,15 +9,12 @@ namespace CustomItems.Items { using System.Collections.Generic; using System.ComponentModel; - using Exiled.API.Extensions; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; - using Hints; - using MEC; using UnityEngine; /// diff --git a/CustomItems/Items/C4Charge.cs b/CustomItems/Items/C4Charge.cs index 8a874cb..89c59b6 100644 --- a/CustomItems/Items/C4Charge.cs +++ b/CustomItems/Items/C4Charge.cs @@ -13,12 +13,11 @@ namespace CustomItems.Items using Exiled.API.Enums; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using InventorySystem.Items.ThrowableProjectiles; - using Mirror; using UnityEngine; using YamlDotNet.Serialization; diff --git a/CustomItems/Items/DeflectorShield.cs b/CustomItems/Items/DeflectorShield.cs index 0f60ed3..421c2dc 100644 --- a/CustomItems/Items/DeflectorShield.cs +++ b/CustomItems/Items/DeflectorShield.cs @@ -10,14 +10,13 @@ namespace CustomItems.Items using System; using System.Collections.Generic; using System.ComponentModel; - using CustomPlayerEffects; using Exiled.API.Enums; using Exiled.API.Extensions; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.EventArgs; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using YamlDotNet.Serialization; diff --git a/CustomItems/Items/EmpGrenade.cs b/CustomItems/Items/EmpGrenade.cs index 03e5b11..68b4961 100644 --- a/CustomItems/Items/EmpGrenade.cs +++ b/CustomItems/Items/EmpGrenade.cs @@ -15,18 +15,16 @@ namespace CustomItems.Items using Exiled.API.Extensions; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using Exiled.Events.Handlers; - using Interactables.Interobjects.DoorUtils; using InventorySystem.Items.Firearms.Attachments; using MEC; using UnityEngine; using Item = Exiled.API.Features.Items.Item; using KeycardPermissions = Interactables.Interobjects.DoorUtils.KeycardPermissions; - using Map = Exiled.Events.Handlers.Map; using Player = Exiled.API.Features.Player; /// diff --git a/CustomItems/Items/GrenadeLauncher.cs b/CustomItems/Items/GrenadeLauncher.cs index a5442d8..070dd02 100644 --- a/CustomItems/Items/GrenadeLauncher.cs +++ b/CustomItems/Items/GrenadeLauncher.cs @@ -13,17 +13,15 @@ namespace CustomItems.Items using Exiled.API.Enums; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using InventorySystem.Items.Firearms.BasicMessages; using InventorySystem.Items.ThrowableProjectiles; using MEC; - using Mirror; using UnityEngine; using CollisionHandler = Exiled.API.Features.Components.CollisionHandler; - using Debug = System.Diagnostics.Debug; /// public class GrenadeLauncher : CustomWeapon diff --git a/CustomItems/Items/ImplosionGrenade.cs b/CustomItems/Items/ImplosionGrenade.cs index dc07ca2..b6a3624 100644 --- a/CustomItems/Items/ImplosionGrenade.cs +++ b/CustomItems/Items/ImplosionGrenade.cs @@ -11,14 +11,13 @@ namespace CustomItems.Items using System.Collections.Generic; using System.ComponentModel; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using InventorySystem.Items.ThrowableProjectiles; using MEC; using UnityEngine; - using Map = Exiled.Events.Handlers.Map; using Scp106 = Exiled.Events.Handlers.Scp106; /// diff --git a/CustomItems/Items/LethalInjection.cs b/CustomItems/Items/LethalInjection.cs index 68713c4..3a3f932 100644 --- a/CustomItems/Items/LethalInjection.cs +++ b/CustomItems/Items/LethalInjection.cs @@ -11,9 +11,9 @@ namespace CustomItems.Items using System.ComponentModel; using CustomPlayerEffects; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using PlayableScps; diff --git a/CustomItems/Items/LuckyCoin.cs b/CustomItems/Items/LuckyCoin.cs index cd53b72..cc2e3cd 100644 --- a/CustomItems/Items/LuckyCoin.cs +++ b/CustomItems/Items/LuckyCoin.cs @@ -9,12 +9,11 @@ namespace CustomItems.Items { using System.Collections.Generic; using System.ComponentModel; - using Exiled.API.Enums; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using UnityEngine; diff --git a/CustomItems/Items/MediGun.cs b/CustomItems/Items/MediGun.cs index 1532057..ab1eb60 100644 --- a/CustomItems/Items/MediGun.cs +++ b/CustomItems/Items/MediGun.cs @@ -7,18 +7,15 @@ namespace CustomItems.Items { - using System; using System.Collections.Generic; using System.ComponentModel; using Exiled.API.Enums; using Exiled.API.Extensions; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; - using InventorySystem.Items.Firearms; - using InventorySystem.Items.Firearms.Modules; using UnityEngine; using Firearm = Exiled.API.Features.Items.Firearm; @@ -138,7 +135,7 @@ protected override void OnShooting(ShootingEventArgs ev) return; float num3 = Vector3.Distance(ev.Shooter.CameraTransform.transform.position, ev.ShotPosition); - float damage = firearm.Base.HitregModule.BaseStats.DamageAtDistance(firearm.Base, num3); + float damage = firearm.Base.BaseStats.DamageAtDistance(firearm.Base, num3); if (player.Team.GetSide() == ev.Shooter.Team.GetSide()) { diff --git a/CustomItems/Items/Scp127.cs b/CustomItems/Items/Scp127.cs index a35c5d5..854c75c 100644 --- a/CustomItems/Items/Scp127.cs +++ b/CustomItems/Items/Scp127.cs @@ -11,9 +11,9 @@ namespace CustomItems.Items using System.ComponentModel; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using InventorySystem.Items.Firearms; using MEC; diff --git a/CustomItems/Items/Scp1499.cs b/CustomItems/Items/Scp1499.cs index 41b5b54..c3677fa 100644 --- a/CustomItems/Items/Scp1499.cs +++ b/CustomItems/Items/Scp1499.cs @@ -12,9 +12,9 @@ namespace CustomItems.Items using CustomPlayerEffects; using Exiled.API.Enums; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using UnityEngine; diff --git a/CustomItems/Items/Scp2818.cs b/CustomItems/Items/Scp2818.cs index 95a31dd..6d25e3f 100644 --- a/CustomItems/Items/Scp2818.cs +++ b/CustomItems/Items/Scp2818.cs @@ -10,12 +10,11 @@ namespace CustomItems.Items using System; using System.Collections.Generic; using System.ComponentModel; - using System.Linq; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using UnityEngine; diff --git a/CustomItems/Items/Scp714.cs b/CustomItems/Items/Scp714.cs index e97dd07..4a40a34 100644 --- a/CustomItems/Items/Scp714.cs +++ b/CustomItems/Items/Scp714.cs @@ -12,9 +12,9 @@ namespace CustomItems.Items using System.ComponentModel; using Exiled.API.Enums; using Exiled.API.Features; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; /// diff --git a/CustomItems/Items/SniperRifle.cs b/CustomItems/Items/SniperRifle.cs index fde4ee8..ba0a59b 100644 --- a/CustomItems/Items/SniperRifle.cs +++ b/CustomItems/Items/SniperRifle.cs @@ -10,9 +10,9 @@ namespace CustomItems.Items using System.Collections.Generic; using System.ComponentModel; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using YamlDotNet.Serialization; diff --git a/CustomItems/Items/TranquilizerGun.cs b/CustomItems/Items/TranquilizerGun.cs index 012fb5d..0f60a56 100644 --- a/CustomItems/Items/TranquilizerGun.cs +++ b/CustomItems/Items/TranquilizerGun.cs @@ -14,9 +14,9 @@ namespace CustomItems.Items using CustomPlayerEffects; using Exiled.API.Features; using Exiled.API.Features.Items; + using Exiled.API.Features.Spawn; using Exiled.CustomItems.API; using Exiled.CustomItems.API.Features; - using Exiled.CustomItems.API.Spawn; using Exiled.Events.EventArgs; using MEC; using Mirror; diff --git a/CustomItems/Patches/AddClass.cs b/CustomItems/Patches/AddClass.cs index 9dd0c54..962cff5 100644 --- a/CustomItems/Patches/AddClass.cs +++ b/CustomItems/Patches/AddClass.cs @@ -9,7 +9,6 @@ namespace CustomItems.Patches { using Events; using Exiled.API.Features; - using HarmonyLib; using Subclass; /// diff --git a/CustomItems/Properties/AssemblyInfo.cs b/CustomItems/Properties/AssemblyInfo.cs index 83520d0..58247d8 100644 --- a/CustomItems/Properties/AssemblyInfo.cs +++ b/CustomItems/Properties/AssemblyInfo.cs @@ -38,5 +38,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.3.0")] -[assembly: AssemblyFileVersion("3.0.3.0")] \ No newline at end of file +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] \ No newline at end of file diff --git a/CustomItems/packages.config b/CustomItems/packages.config index ed6b00c..19afa8d 100644 --- a/CustomItems/packages.config +++ b/CustomItems/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file