Move KitItem* to Essentials.Kit.Item

uEssentials · Feb 21, 2016 · fa7727c · fa7727c
1 parent 21e1727
commit fa7727c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/src/Commands/MiscCommands.cs b/src/Commands/MiscCommands.cs
@@ -31,7 +31,7 @@
 using Essentials.Core.Command;
 using Essentials.Core.Components.Player;
 using Essentials.I18n;
-using Essentials.Kit;
+using Essentials.Kit.Item;
 using SDG.Unturned;
 using UnityEngine;
 

diff --git a/src/Kit/KitItem.cs → src/Kit/Item/KitItem.cs b/src/Kit/KitItem.cs → src/Kit/Item/KitItem.cs
@@ -28,7 +28,7 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace Essentials.Kit
+namespace Essentials.Kit.Item
 {
     /// <summary>
     /// Author: leonardosc
@@ -65,7 +65,7 @@ public class KitItem
         /// </summary>
         /// <returns> Instance of SDG.Unturned.Item of this item </returns>>
         [JsonIgnore]
-        public virtual Item UnturnedItem => new Item( Id, Amount, Durability, Metadata );
+        public virtual SDG.Unturned.Item UnturnedItem => new SDG.Unturned.Item( Id, Amount, Durability, Metadata );
 
         public KitItem( ushort id, byte durability, byte amount )
         {

diff --git a/src/Kit/KitItemMagazine.cs → src/Kit/Item/KitItemMagazine.cs b/src/Kit/KitItemMagazine.cs → src/Kit/Item/KitItemMagazine.cs
@@ -22,13 +22,13 @@
 using Essentials.Api.Unturned;
 using SDG.Unturned;
 
-namespace Essentials.Kit
+namespace Essentials.Kit.Item
 {
     public class KitItemMagazine : KitItem
     {
         public byte Ammo { get; set; }
 
-        public override Item UnturnedItem => new Item( Id, Ammo, Durability );
+        public override SDG.Unturned.Item UnturnedItem => new SDG.Unturned.Item( Id, Ammo, Durability );
 
         public KitItemMagazine( ushort id, byte durability, byte amount, byte ammo ) : base( id, durability, amount )
         {

diff --git a/src/Kit/KitItemWeapon.cs → src/Kit/Item/KitItemWeapon.cs b/src/Kit/KitItemWeapon.cs → src/Kit/Item/KitItemWeapon.cs
@@ -25,7 +25,7 @@
 using Rocket.Unturned.Items;
 using SDG.Unturned;
 
-namespace Essentials.Kit
+namespace Essentials.Kit.Item
 {
     /// <summary>
     /// Author: leonardosc
@@ -80,7 +80,7 @@ public class KitItemWeapon : KitItem
         /// </summary>
         /// <returns> Instance of SDG.Unturned.Item of this item </returns>>
         [JsonIgnore]
-        public override Item UnturnedItem
+        public override SDG.Unturned.Item UnturnedItem
         {
             get
             {

diff --git a/src/Kit/JsonKitData.cs b/src/Kit/JsonKitData.cs
@@ -25,6 +25,7 @@
 using Essentials.Api;
 using Essentials.Common.Util;
 using Essentials.Core.Storage;
+using Essentials.Kit.Item;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Rocket.Unturned.Items;

diff --git a/src/Kit/Kit.cs b/src/Kit/Kit.cs
@@ -24,6 +24,7 @@
 using Essentials.Api.Unturned;
 using Essentials.Common;
 using Essentials.I18n;
+using Essentials.Kit.Item;
 using Newtonsoft.Json;
 
 namespace Essentials.Kit