- Changed Bloodshot Eye's music to Boss 1 Orchestra ( https://www.youtube.com/watch?time_continue=120&v=r-9nKGc85FQ )

- Added support for animated projectiles
- Refactoring
- Removed useless fields
- Fixed swords not dealing damages
- Added Hour Hand (from Evie's PR)

Content/Buffs/Buffs/Commander.cs

@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
 	internal class Commander : DecimationBuff
 	{

Content/Buffs/Buffs/DemonicallyBewitched.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
     internal class DemonicallyBewitched : DecimationBuff
     {

Content/Buffs/Buffs/FatesSmile.cs

@@ -2,7 +2,7 @@
 using Terraria.ModLoader;
 using Terraria.DataStructures;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
     internal class FatesSmile : DecimationBuff
     {

Content/Buffs/Buffs/MysticFlame.cs

@@ -1,6 +1,6 @@
 using Terraria;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
    internal class MysticFlame : DecimationBuff
     {

Content/Buffs/Buffs/NaturesAura.cs

@@ -2,7 +2,7 @@
 using Terraria.ModLoader;
 using Terraria.DataStructures;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
     internal class NaturesAura : DecimationBuff
     {

Content/Buffs/Buffs/ScarabEndurance.cs

@@ -1,10 +1,10 @@
-using Decimation.Projectiles;
+using Decimation.Content.Projectiles;
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
     internal class ScarabEndurance : DecimationBuff
     {

Content/Buffs/Buffs/SlimyFeet.cs

@@ -3,7 +3,7 @@ using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
    internal class SlimyFeet : DecimationBuff
     {

Content/Buffs/Buffs/Ubered.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
    internal class Ubered : DecimationBuff
     {

Content/Buffs/Buffs/Vampire.cs

@@ -3,7 +3,7 @@ using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
    internal class Vampire : DecimationBuff
     {

Content/Buffs/Buffs/Warlock.cs

@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
 	internal class Warlock : DecimationBuff
     {

Content/Buffs/Buffs/Werepire.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Buffs
+namespace Decimation.Content.Buffs.Buffs
 {
    internal class Werepire : DecimationBuff
     {

Content/Buffs/Debuffs/Amnesia.cs

@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class Amnesia : DecimationBuff
     {

Content/Buffs/Debuffs/AvianFlu.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
     internal class AvianFlu : DecimationBuff
     {

Content/Buffs/Debuffs/Corrosion.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class Corrosion : DecimationBuff
     {

Content/Buffs/Debuffs/Discombobulated.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class Discombobulated : DecimationBuff
     {

Content/Buffs/Debuffs/Enveloped.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class Enveloped : DecimationBuff
     {

Content/Buffs/Debuffs/Hyperthermic.cs

@@ -3,7 +3,7 @@ using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
     internal class Hyperthermic : DecimationBuff
     {

Content/Buffs/Debuffs/InfernalGaze.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class InfernalGaze : DecimationBuff
     {

Content/Buffs/Debuffs/PiercingGaze.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class PiercingGaze : DecimationBuff
     {

Content/Buffs/Debuffs/Singed.cs

@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
    internal class Singed : DecimationBuff
     {

Content/Buffs/Debuffs/Slimed.cs

@@ -2,7 +2,7 @@ using Terraria;
 using Terraria.ModLoader;
 using Terraria.DataStructures;
 
-namespace Decimation.Buffs.Debuffs
+namespace Decimation.Content.Buffs.Debuffs
 {
     internal class Slimed : DecimationBuff
     {

Content/Buffs/DecimationBuff.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Terraria.ModLoader;
 using Terraria;
 
-namespace Decimation.Buffs
+namespace Decimation.Content.Buffs
 {
     internal abstract class DecimationBuff : ModBuff
     {

Content/Decimation.cs

@@ -3,15 +3,15 @@ using System.IO;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
-using Decimation.NPCs.Arachnus;
-using Decimation.NPCs.AncientDuneWorm;
-using Decimation.UI;
+using Decimation.Content.NPCs.Arachnus;
+using Decimation.Content.NPCs.AncientDuneWorm;
+using Decimation.Content.UI;
 using System.Collections.Generic;
-using Decimation.Core.Util;
+using Decimation.Lib.Util;
 using Terraria.UI;
 using Microsoft.Xna.Framework;
 
-namespace Decimation
+namespace Decimation.Content
 {
     public class Decimation : Mod
     {

Content/DecimationPlayerImpl.cs

@@ -1,11 +1,11 @@
 using System;
-using Decimation.Buffs.Buffs;
-using Decimation.Core;
-using Decimation.Core.Amulets;
-using Decimation.Core.Collections;
-using Decimation.Core.Util;
-using Decimation.Items.Amulets;
-using Decimation.Items.Misc;
+using Decimation.Content.Buffs.Buffs;
+using Decimation.Lib;
+using Decimation.Lib.Amulets;
+using Decimation.Lib.Collections;
+using Decimation.Lib.Util;
+using Decimation.Content.Items.Amulets;
+using Decimation.Content.Items.Misc;
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.Graphics.Shaders;
@@ -13,7 +13,7 @@ using Terraria.ID;
 using Terraria.ModLoader;
 using Terraria.ModLoader.IO;
 
-namespace Decimation
+namespace Decimation.Content
 {
     public class DecimationPlayer : DecimationModPlayer
     {
@@ -323,7 +323,11 @@ namespace Decimation
                     npc.AddBuff(BuffID.Confused, 600);
             }
 
-            if (tideTurnerEquipped && Main.rand.NextBool(2)) this.player.statLife += damage;
+            if (tideTurnerEquipped && Main.rand.NextBool(2))
+            {
+                Main.NewText("Tide Turner");
+                this.player.statLife += damage;
+            }
 
             foreach (Player otherPlayer in Main.player)
                 if (otherPlayer.whoAmI != this.player.whoAmI)

Content/DecimationWorld.cs

@@ -5,12 +5,12 @@ using Terraria.ModLoader;
 using Terraria.World.Generation;
 using Terraria.GameContent.Generation;
 using Terraria.ModLoader.IO;
-using Decimation.Structures;
+using Decimation.Content.Structures;
 using Microsoft.Xna.Framework;
 using System;
 using Terraria.ID;
 
-namespace Decimation
+namespace Decimation.Content
 {
     public class DecimationWorld : ModWorld
     {

Content/Dusts/Blood.cs

@@ -3,7 +3,7 @@ using Terraria;
 using Terraria.ModLoader;
 using Terraria.ID;
 
-namespace Decimation.Dusts
+namespace Decimation.Content.Dusts
 {
     class Blood : ModDust
     {

Content/Items/Accessories/AlucardPendant.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Decimation.Buffs.Buffs;
-using Decimation.Items.Misc.Souls;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Buffs.Buffs;
+using Decimation.Content.Items.Misc.Souls;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class AlucardPendant : DecimationAccessory
     {
@@ -20,9 +20,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 46;
-            height = 62;
-            rarity = Rarity.LightPurple;
+            item.width = 46;
+            item.height = 62;
+            item.rare = Rarity.LightPurple.GetRarityValue();
             this.item.value = Item.buyPrice(0, 4);
         }
 

Content/Items/Accessories/CelestialTransmogrifier.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Decimation.Buffs.Buffs;
-using Decimation.Items.Misc.Souls;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Buffs.Buffs;
+using Decimation.Content.Items.Misc.Souls;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class CelestialTransmogrifier : DecimationAccessory
     {
@@ -22,9 +22,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 46;
-            height = 62;
-            rarity = Rarity.LightPurple;
+            item.width = 46;
+            item.height = 62;
+            item.rare = Rarity.LightPurple.GetRarityValue();
 
             this.item.value = Item.buyPrice(0, 4);
         }

Content/Items/Accessories/CrystalSkull.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class CrystalSkull : DecimationAccessory
     {
@@ -15,9 +15,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 24;
-            height = 24;
-            rarity = Rarity.Green;
+            item.width = 24;
+            item.height = 24;
+            item.rare = Rarity.Green.GetRarityValue();
             this.item.value = Item.buyPrice(0, 0, 0, 10);
             this.item.defense = 2;
         }
@@ -39,5 +39,7 @@ namespace Decimation.Items.Accessories
             player.AddBuff(BuffID.Thorns, 1);
             Lighting.AddLight(player.Center, new Vector3(0.9f * 0.6f, 0.9f * 0.1f, 0.9f));
         }
+        
+        
     }
 }

Content/Items/Accessories/DeadeyesQuiver.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Decimation.Items.Misc;
-using Decimation.Items.Misc.Souls;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Items.Misc;
+using Decimation.Content.Items.Misc.Souls;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class DeadeyesQuiver : DecimationAccessory
     {
@@ -19,9 +19,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 30;
-            height = 30;
-            rarity = Rarity.Red;
+            item.width = 30;
+            item.height = 30;
+            item.rare = Rarity.Red.GetRarityValue();
             this.item.value = Item.buyPrice(0, 15);
         }
 

Content/Items/Accessories/DraculaPendant.cs

@@ -1,11 +1,11 @@
-using Decimation.Buffs.Buffs;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Buffs.Buffs;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class DraculaPendant : DecimationAccessory
     {
@@ -18,9 +18,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 46;
-            height = 62;
-            rarity = Rarity.LightPurple;
+            item.width = 46;
+            item.height = 62;
+            item.rare = Rarity.LightPurple.GetRarityValue();
             this.item.value = Item.buyPrice(0, 4);
         }
 

Content/Items/Accessories/EnchantedFocuser.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class EnchantedFocuser : DecimationAccessory
     {
@@ -14,9 +14,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 62;
-            height = 46;
-            rarity = Rarity.Green;
+            item.width = 62;
+            item.height = 46;
+            item.rare = Rarity.Green.GetRarityValue();
             this.item.value = Item.buyPrice(0, 0, 0, 10);
         }
 

Content/Items/Accessories/EndlessPouchofLife.cs

@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class EndlessPouchofLife : DecimationAccessory
     {
@@ -18,9 +18,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 24;
-            height = 32;
-            rarity = Rarity.Lime;
+            item.width = 24;
+            item.height = 32;
+            item.rare = Rarity.Lime.GetRarityValue();
             this.item.value = Item.buyPrice(0, 50);
         }
 

Content/Items/Accessories/EnergyFocuser.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class EnergyFocuser : DecimationAccessory
     {
@@ -14,9 +14,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 62;
-            height = 46;
-            rarity = Rarity.Green;
+            item.width = 62;
+            item.height = 46;
+            item.rare = Rarity.Green.GetRarityValue();
             this.item.value = Item.buyPrice(0, 0, 0, 10);
         }
 

Content/Items/Accessories/Focuser.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class Focuser : DecimationAccessory
     {
@@ -14,9 +14,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 54;
-            height = 46;
-            rarity = Rarity.Green;
+            item.width = 54;
+            item.height = 46;
+            item.rare = Rarity.Green.GetRarityValue();
             this.item.value = Item.buyPrice(0, 0, 0, 10);
         }
 

Content/Items/Accessories/GraniteLinedTunic.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class GraniteLinedTunic : DecimationAccessory
     {
@@ -12,8 +12,8 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 30;
-            height = 20;
+            item.width = 30;
+            item.height = 20;
         }
 
         public override void UpdateAccessory(Player player, bool hideVisual)

Content/Items/Accessories/JestersQuiver.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class JestersQuiver : DecimationAccessory
     {
@@ -15,8 +15,8 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 20;
-            height = 20;
+            item.width = 20;
+            item.height = 20;
         }
 
         public override void UpdateAccessory(Player player, bool hideVisual)

Content/Items/Accessories/LightweightGlove.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
- using Decimation.Core.Items;
+ using Decimation.Lib.Items;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class LightweightGlove : DecimationAccessory
     {
@@ -16,8 +16,8 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 22;
-            height = 28;
+            item.width = 22;
+            item.height = 28;
         }
 
         public override void UpdateAccessory(Player player, bool hideVisual)

Content/Items/Accessories/NecrosisStone.cs

@@ -1,8 +1,8 @@
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class NecrosisStone : DecimationAccessory
     {
@@ -13,9 +13,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 20;
-            height = 20;
-            rarity = Rarity.Rainbow;
+            item.width = 20;
+            item.height = 20;
+            item.rare = Rarity.Rainbow.GetRarityValue();
             this.item.value = Item.buyPrice(0, 5);
             this.item.expert = true;
         }

Content/Items/Accessories/RangersPouch.cs

@@ -2,10 +2,10 @@
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
- using Decimation.Core.Items;
-using Decimation.Core.Util;
+ using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class RangersPouch : DecimationAccessory
     {
@@ -15,10 +15,10 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 30;
-            height = 30;
+            item.width = 30;
+            item.height = 30;
             item.value = 10;
-            rarity = Rarity.Green;
+            item.rare = Rarity.Green.GetRarityValue();
         }
 
         protected override List<ModRecipe> GetAdditionalRecipes()

Content/Items/Accessories/RangersQuiver.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class RangersQuiver : DecimationAccessory
     {
@@ -16,9 +16,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 32;
-            height = 32;
-            rarity = Rarity.Green;
+            item.width = 32;
+            item.height = 32;
+            item.rare = Rarity.Green.GetRarityValue();
             this.item.value = Item.buyPrice(0, 0, 0, 10);
         }
 

Content/Items/Accessories/RedHotShackle.cs

@@ -5,10 +5,10 @@ using Terraria;
 using Terraria.DataStructures;
 using Terraria.ID;
 using Terraria.ModLoader;
- using Decimation.Core.Items;
-using Decimation.Core.Util;
+ using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class RedHotShackle : DecimationAccessory
     {
@@ -17,9 +17,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 24;
-            height = 24;
-            rarity = Rarity.Green;
+            item.width = 24;
+            item.height = 24;
+            item.rare = Rarity.Green.GetRarityValue();
             item.value = Item.buyPrice(0, 0, 2);
             item.defense = 1;
         }

Content/Items/Accessories/ShinySentinel.cs

@@ -1,8 +1,8 @@
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class ShinySentinel : DecimationAccessory
     {
@@ -11,9 +11,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 30;
-            height = 28;
-            rarity = Rarity.Rainbow;
+            item.width = 30;
+            item.height = 28;
+            item.rare = Rarity.Rainbow.GetRarityValue();
             this.item.value = Item.buyPrice(0, 45);
             this.item.expert = true;
         }

Content/Items/Accessories/SlimeBracelet.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class SlimeBracelet : DecimationAccessory
     {
@@ -14,9 +14,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 24;
-            height = 24;
-            rarity = Rarity.Green;
+            item.width = 24;
+            item.height = 24;
+            item.rare = Rarity.Green.GetRarityValue();
 
             this.item.value = Item.buyPrice(0, 0, 0, 10);
         }

Content/Items/Accessories/TideTurner.cs

@@ -1,13 +1,13 @@
 using System.Collections.Generic;
-using Decimation.Items.Ores;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Items.Ores;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories
+namespace Decimation.Content.Items.Accessories
 {
     internal class TideTurner : DecimationAccessory
     {
@@ -20,9 +20,9 @@ namespace Decimation.Items.Accessories
 
         protected override void InitAccessory()
         {
-            width = 46;
-            height = 36;
-            rarity = Rarity.Rainbow;
+            item.width = 46;
+            item.height = 36;
+            item.rare = Rarity.Rainbow.GetRarityValue();
             item.value = Item.buyPrice(0, 3);
             item.defense = 3;
             item.shieldSlot = 5;

Content/Items/Accessories/Wings/ScarabWings.cs

@@ -1,16 +1,16 @@
 using System.Collections.Generic;
-using Decimation.Items.Misc.CondensedSouls;
-using Decimation.Items.Ores;
-using Decimation.Projectiles;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Items.Misc.CondensedSouls;
+using Decimation.Content.Items.Ores;
+using Decimation.Content.Projectiles;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Accessories.Wings
+namespace Decimation.Content.Items.Accessories.Wings
 {
     [AutoloadEquip(EquipType.Wings)]
     internal class ScarabWings : DecimationAccessory
@@ -20,9 +20,9 @@ namespace Decimation.Items.Accessories.Wings
 
         protected override void InitAccessory()
         {
-            width = 26;
-            height = 26;
-            rarity = Rarity.Red;
+            item.width = 26;
+            item.height = 26;
+            item.rare = Rarity.Red.GetRarityValue();
 
             this.item.value = Item.buyPrice(0, 5);
         }

Content/Items/Ammo/MoltenStyngerBolt.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Decimation.Buffs.Debuffs;
-using Decimation.Items.Misc;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Buffs.Debuffs;
+using Decimation.Content.Items.Misc;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Ammo
+namespace Decimation.Content.Items.Ammo
 {
     internal class MoltenStyngerBolt : DecimationAmmo
     {
@@ -16,16 +16,16 @@ namespace Decimation.Items.Ammo
         protected override string ItemTooltip => "Explodes into molten shrapnel.";
         protected override string Projectile => "MoltenStyngerBolt";
         protected override int Ammo => AmmoID.StyngerBolt;
+        protected override int Damages => 25;
 
         protected override void InitAmmo()
         {
-            width = 8;
-            height = 8;
-            damages = 25;
-            projKnockBack = 1;
-            rarity = Rarity.Orange;
-            value = Item.buyPrice(0, 0, 10);
-            consumable = true;
+            item.width = 8;
+            item.height = 8;
+            item.knockBack = 1;
+            item.rare = Rarity.Orange.GetRarityValue();
+            item.value = Item.buyPrice(0, 0, 10);
+            item.consumable = true;
 
             this.item.shootSpeed = 2f;
         }

Content/Items/Ammo/Pebble.cs

@@ -1,9 +1,9 @@
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Ammo
+namespace Decimation.Content.Items.Ammo
 {
     internal class Pebble : DecimationAmmo
     {
@@ -11,16 +11,16 @@ namespace Decimation.Items.Ammo
         protected override string ItemTooltip => "For use with slings and slingshots";
         protected override string Projectile => "Pebble";
         protected override int Ammo => ModContent.ItemType<Pebble>();
+        protected override int Damages => 11;
 
         protected override void InitAmmo()
         {
-            damages = 11;
-            width = 16;
-            height = 16;
-            this.item.maxStack = 999;
-            this.item.consumable = true;
-            projKnockBack = 1f;
-            this.item.value = Item.sellPrice(0, 0, 1);
+            item.width = 16;
+            item.height = 16;
+            item.maxStack = 999;
+            item.consumable = true;
+            item.knockBack = 1f;
+            item.value = Item.sellPrice(0, 0, 1);
         }
 
         protected override ModRecipe GetRecipe()

Content/Items/Ammo/SiphonArrow.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Decimation.Items.Misc;
-using Decimation.Core.Items;
+using Decimation.Content.Items.Misc;
+using Decimation.Lib.Items;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Ammo
+namespace Decimation.Content.Items.Ammo
 {
     internal class SiphonArrow : DecimationAmmo
     {
@@ -13,14 +13,14 @@ namespace Decimation.Items.Ammo
         protected override string ItemTooltip => "Aspires other's life";
         protected override string Projectile => "SiphonArrow";
         protected override int Ammo => AmmoID.Arrow;
+        protected override int Damages => 11;
 
         protected override void InitAmmo()
         {
-            damages = 11;
-            projKnockBack = 2;
-            width = 14;
-            height = 32;
-            value = Item.buyPrice(0, 0, 0, 55);
+            item.knockBack = 2;
+            item.width = 14;
+            item.height = 32;
+            item.value = Item.buyPrice(0, 0, 0, 55);
 
             this.item.shootSpeed = 2.5f;
         }

Content/Items/Ammo/TitanicStyngerBolt.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Decimation.Buffs.Debuffs;
-using Decimation.Items.Ores;
-using Decimation.Tiles;
-using Decimation.Core.Items;
-using Decimation.Core.Util;
+using Decimation.Content.Buffs.Debuffs;
+using Decimation.Content.Items.Ores;
+using Decimation.Content.Tiles;
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Ammo
+namespace Decimation.Content.Items.Ammo
 {
     internal class TitanicStyngerBolt : DecimationAmmo
     {
@@ -16,16 +16,16 @@ namespace Decimation.Items.Ammo
         protected override string ItemTooltip => "Explodes into deadly shrapnel.";
         protected override string Projectile => "TitanicStyngerBolt";
         protected override int Ammo => AmmoID.StyngerBolt;
+        protected override int Damages => 35;
 
         protected override void InitAmmo()
         {
-            damages = 35;
-            projKnockBack = 2;
-            rarity = Rarity.Orange;
-            width = 8;
-            height = 8;
-            value = Item.buyPrice(0, 0, 10);
-            consumable = true;
+            item.knockBack = 2;
+            item.rare = Rarity.Orange.GetRarityValue();
+            item.width = 8;
+            item.height = 8;
+            item.value = Item.buyPrice(0, 0, 10);
+            item.consumable = true;
 
             this.item.shootSpeed = 2f;
         }

Content/Items/Amulets/BuildersAmulet.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using Decimation.Core.Amulets;
+using Decimation.Lib.Amulets;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Amulets
+namespace Decimation.Content.Items.Amulets
 {
     internal class BuildersAmulet : Amulet
     {
@@ -13,7 +13,7 @@ namespace Decimation.Items.Amulets
 
         protected override void InitAmulet()
         {
-            height = 34;
+            item.height = 34;
         }
 
         protected override void UpdateAmulet(Player player)

Content/Items/Amulets/CreatorAmulet.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
-using Decimation.Core.Amulets;
+using Decimation.Lib.Amulets;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Decimation.Items.Amulets
+namespace Decimation.Content.Items.Amulets
 {
     internal class CreatorAmulet : Amulet
     {
@@ -13,7 +13,7 @@ namespace Decimation.Items.Amulets
 
         protected override void InitAmulet()
         {
-            height = 32;
+            item.height = 32;
         }
 
         protected override void UpdateAmulet(Player player)