Updoot to exiled beta & newest SL version

Exiled-Team · Sep 30, 2021 · d666892 · d666892
1 parent 2b919c2
commit d666892
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 48 deletions.
diff --git 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
@@ -14,8 +14,6 @@ namespace CustomItems.Configs
     using System.Collections.Generic;
     using System.ComponentModel;
 
-    using Exiled.API.Enums;
-
     /// <summary>
     /// All item config settings.
     /// </summary>

diff --git a/CustomItems/CustomItems.csproj b/CustomItems/CustomItems.csproj
@@ -54,38 +54,42 @@
       <HintPath>$(EXILED_REFERENCES)\CommandSystem.Core.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.API, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.API.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.API.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Bootstrap, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Bootstrap.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Bootstrap.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.CreditTags, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CreditTags.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CreditTags.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.CustomItems, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.CustomItems.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CustomItems.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Exiled.CustomRoles, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.CustomRoles.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Events, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Events.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Events.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Example, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\..\EXILED\bin\Debug\Exiled.Example.dll</HintPath>
     </Reference>
     <Reference Include="Exiled.Loader, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Loader.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Loader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Permissions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Permissions.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Permissions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Exiled.Updater, Version=3.1.1.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\EXILED.3.0.0-alpha.84\lib\net472\Exiled.Updater.dll</HintPath>
+      <HintPath>..\packages\EXILED.3.0.0-beta\lib\net472\Exiled.Updater.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">

diff --git 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
@@ -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;
 
     /// <inheritdoc />

diff --git 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
@@ -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
@@ -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;
 
     /// <inheritdoc />

diff --git 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;
 
     /// <inheritdoc />
     public class GrenadeLauncher : CustomWeapon

diff --git 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;
 
     /// <inheritdoc />

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
 
     /// <inheritdoc/>

diff --git 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
@@ -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
@@ -9,7 +9,6 @@ namespace CustomItems.Patches
 {
     using Events;
     using Exiled.API.Features;
-    using HarmonyLib;
     using Subclass;
 
     /// <summary>

diff --git 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")]
+[assembly: AssemblyVersion("4.0.0.0")]
+[assembly: AssemblyFileVersion("4.0.0.0")]
diff --git a/CustomItems/packages.config b/CustomItems/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EXILED" version="3.0.0-alpha.84" targetFramework="net472" />
+  <package id="EXILED" version="3.0.0-beta" targetFramework="net472" />
   <package id="Lib.Harmony" version="2.0.4" targetFramework="net472" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
 </packages>