- 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

@@ -1,166 +1,166 @@
-using System;
+using System;
-using System.IO;
+using System.IO;
-using Terraria;
+using Terraria;
-using Terraria.ID;
+using Terraria.ID;
-using Terraria.ModLoader;
+using Terraria.ModLoader;
-using Decimation.NPCs.Arachnus;
+using Decimation.Content.NPCs.Arachnus;
-using Decimation.NPCs.AncientDuneWorm;
+using Decimation.Content.NPCs.AncientDuneWorm;
-using Decimation.UI;
+using Decimation.Content.UI;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using Decimation.Core.Util;
+using Decimation.Lib.Util;
-using Terraria.UI;
+using Terraria.UI;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-
+
-namespace Decimation
+namespace Decimation.Content
-{
+{
-    public class Decimation : Mod
+    public class Decimation : Mod
-    {
+    {
-        public static Decimation Instance { set; get; }
+        public static Decimation Instance { set; get; }
-
+
-        public static AmuletSlotState amuletSlotState;
+        public static AmuletSlotState amuletSlotState;
-        private UserInterface amuletSlotInterface;
+        private UserInterface amuletSlotInterface;
-
+
-        internal UserInterface skeletonUserInterface;
+        internal UserInterface skeletonUserInterface;
-
+
-        public Decimation()
+        public Decimation()
-        {
+        {
-            Instance = this;
+            Instance = this;
-
+
-            Properties = new ModProperties()
+            Properties = new ModProperties()
-            {
+            {
-                Autoload = true,
+                Autoload = true,
-                AutoloadGores = true,
+                AutoloadGores = true,
-                AutoloadSounds = true
+                AutoloadSounds = true
-            };
+            };
-
+
-            References.mod = this;
+            References.mod = this;
-        }
+        }
-
+
-        public override void Load()
+        public override void Load()
-        {
+        {
-            if (!Main.dedServ)
+            if (!Main.dedServ)
-            {
+            {
-                amuletSlotState = new AmuletSlotState();
+                amuletSlotState = new AmuletSlotState();
-                amuletSlotState.Activate();
+                amuletSlotState.Activate();
-                amuletSlotInterface = new UserInterface();
+                amuletSlotInterface = new UserInterface();
-                amuletSlotInterface.SetState(amuletSlotState);
+                amuletSlotInterface.SetState(amuletSlotState);
-
+
-                skeletonUserInterface = new UserInterface();
+                skeletonUserInterface = new UserInterface();
-            }
+            }
-        }
+        }
-
+
-        public override void UpdateUI(GameTime gameTime)
+        public override void UpdateUI(GameTime gameTime)
-        {
+        {
-            Player player = Main.LocalPlayer;
+            Player player = Main.LocalPlayer;
-            if (player.GetModPlayer<DecimationPlayer>().necrosisStoneEquipped && player.respawnTimer != 0)
+            if (player.GetModPlayer<DecimationPlayer>().necrosisStoneEquipped && player.respawnTimer != 0)
-                player.respawnTimer -= 1;
+                player.respawnTimer -= 1;
-
+
-            amuletSlotInterface?.Update(gameTime);
+            amuletSlotInterface?.Update(gameTime);
-            skeletonUserInterface?.Update(gameTime);
+            skeletonUserInterface?.Update(gameTime);
-        }
+        }
-
+
-        public override void ModifyInterfaceLayers(List<GameInterfaceLayer> layers)
+        public override void ModifyInterfaceLayers(List<GameInterfaceLayer> layers)
-        {
+        {
-            int inventoryIndex = layers.FindIndex(layer => layer.Name.Equals("Vanilla: Inventory"));
+            int inventoryIndex = layers.FindIndex(layer => layer.Name.Equals("Vanilla: Inventory"));
-
+
-            if (inventoryIndex != -1)
+            if (inventoryIndex != -1)
-            {
+            {
-                layers.Insert(inventoryIndex + 1, new LegacyGameInterfaceLayer(
+                layers.Insert(inventoryIndex + 1, new LegacyGameInterfaceLayer(
-                    "Decimation: Amulet Slot",
+                    "Decimation: Amulet Slot",
-                    delegate
+                    delegate
-                    {
+                    {
-                        if (Main.playerInventory)
+                        if (Main.playerInventory)
-                            amuletSlotInterface.Draw(Main.spriteBatch, new GameTime());
+                            amuletSlotInterface.Draw(Main.spriteBatch, new GameTime());
-                        return true;
+                        return true;
-                    },
+                    },
-                    InterfaceScaleType.UI)
+                    InterfaceScaleType.UI)
-                );
+                );
-
+
-                layers.Insert(inventoryIndex + 2, new LegacyGameInterfaceLayer(
+                layers.Insert(inventoryIndex + 2, new LegacyGameInterfaceLayer(
-                    "Decimation: Skeleton UI",
+                    "Decimation: Skeleton UI",
-                    delegate
+                    delegate
-                    {
+                    {
-                        skeletonUserInterface.Draw(Main.spriteBatch, new GameTime());
+                        skeletonUserInterface.Draw(Main.spriteBatch, new GameTime());
-                        return true;
+                        return true;
-                    },
+                    },
-                    InterfaceScaleType.UI)
+                    InterfaceScaleType.UI)
-                );
+                );
-            }
+            }
-        }
+        }
-
+
-        public override void PostSetupContent()
+        public override void PostSetupContent()
-        {
+        {
-            Mod bossChecklist = ModLoader.GetMod("BossChecklist");
+            Mod bossChecklist = ModLoader.GetMod("BossChecklist");
-            if (bossChecklist != null)
+            if (bossChecklist != null)
-            {
+            {
-                bossChecklist.Call("AddBossWithInfo", "The Bloodshot Eye", 2.5f, (Func<bool>)(() => DecimationWorld.downedBloodshotEye), "INSERT LATER");
+                bossChecklist.Call("AddBossWithInfo", "The Bloodshot Eye", 2.5f, (Func<bool>)(() => DecimationWorld.downedBloodshotEye), "INSERT LATER");
-                bossChecklist.Call("AddBossWithInfo", "The Ancient Dune Worm", 5.7f, (Func<bool>)(() => DecimationWorld.downedDuneWorm), "INSERT LATER");
+                bossChecklist.Call("AddBossWithInfo", "The Ancient Dune Worm", 5.7f, (Func<bool>)(() => DecimationWorld.downedDuneWorm), "INSERT LATER");
-                bossChecklist.Call("AddBossWithInfo", "Arachnus", 20f, (Func<bool>)(() => DecimationWorld.downedArachnus), "INSERT LATER");
+                bossChecklist.Call("AddBossWithInfo", "Arachnus", 20f, (Func<bool>)(() => DecimationWorld.downedArachnus), "INSERT LATER");
-            }
+            }
-        }
+        }
-
+
-        public override void AddRecipeGroups()
+        public override void AddRecipeGroups()
-        {
+        {
-            RecipeGroup gems = new RecipeGroup(() => Lang.misc[37] + " Gem", new int[]
+            RecipeGroup gems = new RecipeGroup(() => Lang.misc[37] + " Gem", new int[]
-            {
+            {
-                ItemID.Amethyst,
+                ItemID.Amethyst,
-                ItemID.Topaz,
+                ItemID.Topaz,
-                ItemID.Emerald,
+                ItemID.Emerald,
-                ItemID.Sapphire,
+                ItemID.Sapphire,
-                ItemID.Ruby,
+                ItemID.Ruby,
-                ItemID.Diamond,
+                ItemID.Diamond,
-            });
+            });
-
+
-            RecipeGroup threads = new RecipeGroup(() => Lang.misc[37] + " Thread", new int[]
+            RecipeGroup threads = new RecipeGroup(() => Lang.misc[37] + " Thread", new int[]
-            {
+            {
-                ItemID.BlackThread,
+                ItemID.BlackThread,
-                ItemID.GreenThread,
+                ItemID.GreenThread,
-                ItemID.PinkThread
+                ItemID.PinkThread
-            });
+            });
-
+
-            RecipeGroup.RegisterGroup("AnyGem", gems);
+            RecipeGroup.RegisterGroup("AnyGem", gems);
-            RecipeGroup.RegisterGroup("AnyThread", threads);
+            RecipeGroup.RegisterGroup("AnyThread", threads);
-        }
+        }
-
+
-        public override void HandlePacket(BinaryReader reader, int whoAmI)
+        public override void HandlePacket(BinaryReader reader, int whoAmI)
-        {
+        {
-            DecimationModMessageType msgType = (DecimationModMessageType)reader.ReadByte();
+            DecimationModMessageType msgType = (DecimationModMessageType)reader.ReadByte();
-
+
-            switch (msgType)
+            switch (msgType)
-            {
+            {
-                case DecimationModMessageType.Arachnus:
+                case DecimationModMessageType.Arachnus:
-                    Arachnus arachnus = (Arachnus)Main.npc[reader.ReadInt32()].modNPC;
+                    Arachnus arachnus = (Arachnus)Main.npc[reader.ReadInt32()].modNPC;
-                    if (arachnus != null && arachnus.npc.active)
+                    if (arachnus != null && arachnus.npc.active)
-                    {
+                    {
-                        arachnus.HandlePacket(reader);
+                        arachnus.HandlePacket(reader);
-                    }
+                    }
-                    break;
+                    break;
-                case DecimationModMessageType.DuneWorm:
+                case DecimationModMessageType.DuneWorm:
-                    AncientDuneWormHead duneWorm = (AncientDuneWormHead)Main.npc[reader.ReadInt32()].modNPC;
+                    AncientDuneWormHead duneWorm = (AncientDuneWormHead)Main.npc[reader.ReadInt32()].modNPC;
-                    if (duneWorm != null && duneWorm.npc.active)
+                    if (duneWorm != null && duneWorm.npc.active)
-                    {
+                    {
-                        // TODO multiplayer
+                        // TODO multiplayer
-                        //duneWorm.HandlePacket(reader);
+                        //duneWorm.HandlePacket(reader);
-                    }
+                    }
-                    break;
+                    break;
-                case DecimationModMessageType.SpawnBoss:
+                case DecimationModMessageType.SpawnBoss:
-                    int type = reader.ReadInt32();
+                    int type = reader.ReadInt32();
-                    int player = reader.ReadInt32();
+                    int player = reader.ReadInt32();
-                    Main.PlaySound(15, (int)Main.player[player].position.X, (int)Main.player[player].position.Y, 0);
+                    Main.PlaySound(15, (int)Main.player[player].position.X, (int)Main.player[player].position.Y, 0);
-                    if (Main.netMode != 1)
+                    if (Main.netMode != 1)
-                        NPC.SpawnOnPlayer(player, type);
+                        NPC.SpawnOnPlayer(player, type);
-                    break;
+                    break;
-                default:
+                default:
-                    ErrorLogger.Log("DecimationMod: Unknown Message type: " + msgType);
+                    ErrorLogger.Log("DecimationMod: Unknown Message type: " + msgType);
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    enum DecimationModMessageType : byte
+    enum DecimationModMessageType : byte
-    {
+    {
-        Arachnus,
+        Arachnus,
-        DuneWorm,
+        DuneWorm,
-        SpawnBoss
+        SpawnBoss
-    }
+    }
 }

Content/DecimationWorld.cs

@@ -1,100 +1,100 @@
-using System.IO;
+using System.IO;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using Terraria;
+using Terraria;
-using Terraria.ModLoader;
+using Terraria.ModLoader;
-using Terraria.World.Generation;
+using Terraria.World.Generation;
-using Terraria.GameContent.Generation;
+using Terraria.GameContent.Generation;
-using Terraria.ModLoader.IO;
+using Terraria.ModLoader.IO;
-using Decimation.Structures;
+using Decimation.Content.Structures;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
-using System;
+using System;
-using Terraria.ID;
+using Terraria.ID;
-
+
-namespace Decimation
+namespace Decimation.Content
-{
+{
-    public class DecimationWorld : ModWorld
+    public class DecimationWorld : ModWorld
-    {
+    {
-        public static bool downedBloodshotEye;
+        public static bool downedBloodshotEye;
-        public static bool downedDuneWorm;
+        public static bool downedDuneWorm;
-        public static bool downedArachnus;
+        public static bool downedArachnus;
-        public static bool downedWyvern;
+        public static bool downedWyvern;
-
+
-        public override void Initialize()
+        public override void Initialize()
-        {
+        {
-            downedBloodshotEye = false;
+            downedBloodshotEye = false;
-            downedDuneWorm = false;
+            downedDuneWorm = false;
-            downedArachnus = false;
+            downedArachnus = false;
-            downedWyvern = false;
+            downedWyvern = false;
-        }
+        }
-
+
-        public override TagCompound Save()
+        public override TagCompound Save()
-        {
+        {
-            var downed = new List<string>();
+            var downed = new List<string>();
-            if (downedBloodshotEye) downed.Add("downedBloodshotEye");
+            if (downedBloodshotEye) downed.Add("downedBloodshotEye");
-            if (downedDuneWorm) downed.Add("downedDuneWorm");
+            if (downedDuneWorm) downed.Add("downedDuneWorm");
-            if (downedArachnus) downed.Add("downedArachnus");
+            if (downedArachnus) downed.Add("downedArachnus");
-            if (downedWyvern) downed.Add("downedWyvern");
+            if (downedWyvern) downed.Add("downedWyvern");
-            return new TagCompound  {
+            return new TagCompound  {
-                {"downed", downed},
+                {"downed", downed},
-            };
+            };
-        }
+        }
-        public override void Load(TagCompound tag)
+        public override void Load(TagCompound tag)
-        {
+        {
-            var downed = tag.GetList<string>("downed");
+            var downed = tag.GetList<string>("downed");
-            downedBloodshotEye = downed.Contains("downedBloodshotEye");
+            downedBloodshotEye = downed.Contains("downedBloodshotEye");
-            downedDuneWorm = downed.Contains("downedDuneWorm");
+            downedDuneWorm = downed.Contains("downedDuneWorm");
-            downedArachnus = downed.Contains("downedArachnus");
+            downedArachnus = downed.Contains("downedArachnus");
-            downedWyvern = downed.Contains("downedWyvern");
+            downedWyvern = downed.Contains("downedWyvern");
-        }
+        }
-        public override void NetSend(BinaryWriter writer)
+        public override void NetSend(BinaryWriter writer)
-        {
+        {
-            BitsByte flags = new BitsByte();
+            BitsByte flags = new BitsByte();
-            flags[0] = downedBloodshotEye; //+1 flag number for each new boss
+            flags[0] = downedBloodshotEye; //+1 flag number for each new boss
-            flags[1] = downedDuneWorm;
+            flags[1] = downedDuneWorm;
-            flags[2] = downedArachnus;
+            flags[2] = downedArachnus;
-            flags[3] = downedWyvern;
+            flags[3] = downedWyvern;
-            writer.Write(flags);
+            writer.Write(flags);
-        }
+        }
-        public override void NetReceive(BinaryReader reader)
+        public override void NetReceive(BinaryReader reader)
-        {
+        {
-            BitsByte flags = reader.ReadByte();
+            BitsByte flags = reader.ReadByte();
-            downedBloodshotEye = flags[0];
+            downedBloodshotEye = flags[0];
-            downedDuneWorm = flags[1];
+            downedDuneWorm = flags[1];
-            downedArachnus = flags[2];
+            downedArachnus = flags[2];
-            downedWyvern = flags[3];
+            downedWyvern = flags[3];
-        }
+        }
-        public override void LoadLegacy(BinaryReader reader)
+        public override void LoadLegacy(BinaryReader reader)
-        {
+        {
-            int loadVersion = reader.ReadInt32();
+            int loadVersion = reader.ReadInt32();
-            if (loadVersion == 1)
+            if (loadVersion == 1)
-            {
+            {
-                byte flags = reader.ReadByte();
+                byte flags = reader.ReadByte();
-                DecimationWorld.downedBloodshotEye = ((flags & 1) != 0);
+                DecimationWorld.downedBloodshotEye = ((flags & 1) != 0);
-                DecimationWorld.downedDuneWorm = ((flags & 2) != 0); //double flag numbers with each new boss
+                DecimationWorld.downedDuneWorm = ((flags & 2) != 0); //double flag numbers with each new boss
-                DecimationWorld.downedArachnus = ((flags & 4) != 0);
+                DecimationWorld.downedArachnus = ((flags & 4) != 0);
-                DecimationWorld.downedWyvern = ((flags & 8) != 0);
+                DecimationWorld.downedWyvern = ((flags & 8) != 0);
-            }
+            }
-            else if (loadVersion == 2)
+            else if (loadVersion == 2)
-            {
+            {
-                byte flags = reader.ReadByte();
+                byte flags = reader.ReadByte();
-                byte flags2 = reader.ReadByte();
+                byte flags2 = reader.ReadByte();
-                DecimationWorld.downedBloodshotEye = ((flags & 1) != 0);
+                DecimationWorld.downedBloodshotEye = ((flags & 1) != 0);
-                DecimationWorld.downedDuneWorm = ((flags & 2) != 0);
+                DecimationWorld.downedDuneWorm = ((flags & 2) != 0);
-                DecimationWorld.downedArachnus = ((flags & 4) != 0);
+                DecimationWorld.downedArachnus = ((flags & 4) != 0);
-                DecimationWorld.downedWyvern = ((flags & 8) != 0);
+                DecimationWorld.downedWyvern = ((flags & 8) != 0);
-            }
+            }
-        }
+        }
-
+
-        // For custom biome
+        // For custom biome
-        public override void ModifyWorldGenTasks(List<GenPass> tasks, ref float totalWeight)
+        public override void ModifyWorldGenTasks(List<GenPass> tasks, ref float totalWeight)
-        {
+        {
-            ShrineoftheMoltenOne biome = new ShrineoftheMoltenOne();
+            ShrineoftheMoltenOne biome = new ShrineoftheMoltenOne();
-
+
-            int genIndex = tasks.FindIndex(genpass => genpass.Name.Equals("Micro Biomes"));
+            int genIndex = tasks.FindIndex(genpass => genpass.Name.Equals("Micro Biomes"));
-            tasks.Insert(genIndex + 1, new PassLegacy("[Decimation] The Shrine of the Molten One", delegate (GenerationProgress progress)
+            tasks.Insert(genIndex + 1, new PassLegacy("[Decimation] The Shrine of the Molten One", delegate (GenerationProgress progress)
-            {
+            {
-                biome.Generate();
+                biome.Generate();
-            }));
+            }));
-        }
+        }
-    }
+    }
-}
+}

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.Content.Buffs.Buffs;
-using Decimation.Items.Misc.Souls;
+using Decimation.Content.Items.Misc.Souls;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 46;
-            height = 62;
+            item.height = 62;
-            rarity = Rarity.LightPurple;
+            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.Content.Buffs.Buffs;
-using Decimation.Items.Misc.Souls;
+using Decimation.Content.Items.Misc.Souls;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 46;
-            height = 62;
+            item.height = 62;
-            rarity = Rarity.LightPurple;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 24;
-            height = 24;
+            item.height = 24;
-            rarity = Rarity.Green;
+            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.Content.Items.Misc;
-using Decimation.Items.Misc.Souls;
+using Decimation.Content.Items.Misc.Souls;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 30;
-            height = 30;
+            item.height = 30;
-            rarity = Rarity.Red;
+            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.Content.Buffs.Buffs;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 46;
-            height = 62;
+            item.height = 62;
-            rarity = Rarity.LightPurple;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 62;
-            height = 46;
+            item.height = 46;
-            rarity = Rarity.Green;
+            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.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 24;
-            height = 32;
+            item.height = 32;
-            rarity = Rarity.Lime;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 62;
-            height = 46;
+            item.height = 46;
-            rarity = Rarity.Green;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 54;
-            height = 46;
+            item.height = 46;
-            rarity = Rarity.Green;
+            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;
+            item.width = 30;
-            height = 20;
+            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;
+            item.width = 20;
-            height = 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;
+            item.width = 22;
-            height = 28;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 20;
-            height = 20;
+            item.height = 20;
-            rarity = Rarity.Rainbow;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 30;
-            height = 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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 32;
-            height = 32;
+            item.height = 32;
-            rarity = Rarity.Green;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 24;
-            height = 24;
+            item.height = 24;
-            rarity = Rarity.Green;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 30;
-            height = 28;
+            item.height = 28;
-            rarity = Rarity.Rainbow;
+            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.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 24;
-            height = 24;
+            item.height = 24;
-            rarity = Rarity.Green;
+            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.Content.Items.Ores;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 46;
-            height = 36;
+            item.height = 36;
-            rarity = Rarity.Rainbow;
+            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.Content.Items.Misc.CondensedSouls;
-using Decimation.Items.Ores;
+using Decimation.Content.Items.Ores;
-using Decimation.Projectiles;
+using Decimation.Content.Projectiles;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 26;
-            height = 26;
+            item.height = 26;
-            rarity = Rarity.Red;
+            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.Content.Buffs.Debuffs;
-using Decimation.Items.Misc;
+using Decimation.Content.Items.Misc;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.width = 8;
-            height = 8;
+            item.height = 8;
-            damages = 25;
+            item.knockBack = 1;
-            projKnockBack = 1;
+            item.rare = Rarity.Orange.GetRarityValue();
-            rarity = Rarity.Orange;
+            item.value = Item.buyPrice(0, 0, 10);
-            value = Item.buyPrice(0, 0, 10);
+            item.consumable = true;
-            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;
+            item.width = 16;
-            width = 16;
+            item.height = 16;
-            height = 16;
+            item.maxStack = 999;
-            this.item.maxStack = 999;
+            item.consumable = true;
-            this.item.consumable = true;
+            item.knockBack = 1f;
-            projKnockBack = 1f;
+            item.value = Item.sellPrice(0, 0, 1);
-            this.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.Content.Items.Misc;
-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 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;
+            item.knockBack = 2;
-            projKnockBack = 2;
+            item.width = 14;
-            width = 14;
+            item.height = 32;
-            height = 32;
+            item.value = Item.buyPrice(0, 0, 0, 55);
-            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.Content.Buffs.Debuffs;
-using Decimation.Items.Ores;
+using Decimation.Content.Items.Ores;
-using Decimation.Tiles;
+using Decimation.Content.Tiles;
-using Decimation.Core.Items;
+using Decimation.Lib.Items;
-using Decimation.Core.Util;
+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;
+            item.knockBack = 2;
-            projKnockBack = 2;
+            item.rare = Rarity.Orange.GetRarityValue();
-            rarity = Rarity.Orange;
+            item.width = 8;
-            width = 8;
+            item.height = 8;
-            height = 8;
+            item.value = Item.buyPrice(0, 0, 10);
-            value = Item.buyPrice(0, 0, 10);
+            item.consumable = true;
-            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)