From f3cfce7792b470dbb0bcc31883c42ce505715acb Mon Sep 17 00:00:00 2001
From: Big Duckie <bigduckie@outlook.com>
Date: Tue, 5 Jul 2022 17:03:46 -0600
Subject: [PATCH] Clean up tool code.

---
 Items/Tools/GoddessPick.cs       | 21 +++++++++++----------
 Items/Tools/GoldenDiggingClaw.cs | 32 ++++++++++++++++----------------
 Items/Tools/GoldenHamaxe.cs      | 21 +++++++++++----------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/Items/Tools/GoddessPick.cs b/Items/Tools/GoddessPick.cs
index ab404be..9542269 100644
--- a/Items/Tools/GoddessPick.cs
+++ b/Items/Tools/GoddessPick.cs
@@ -15,6 +15,7 @@ public class GoddessPick : ModItem
 	public override void SetDefaults()
 	{
 		Item.damage = 22;
+		Item.DamageType = DamageClass.Melee;
 		Item.width = 50;
 		Item.height = 50;
 		Item.useTime = 10;
@@ -33,20 +34,20 @@ public class GoddessPick : ModItem
 	{
 		if (Main.rand.NextBool(3))
 		{
-			int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
-			Main.dust[num1].scale = 1f;
-			Main.dust[num1].velocity.Y = 0f;
-			Main.dust[num1].velocity.X = 0.5f;
-			Main.dust[num1].noGravity = true;
+			int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
+			Main.dust[dust].scale = 1f;
+			Main.dust[dust].velocity.Y = 0f;
+			Main.dust[dust].velocity.X = 0.5f;
+			Main.dust[dust].noGravity = true;
 		}
 	}
 
 	public override void AddRecipes()
 	{
-		Recipe val = CreateRecipe();
-		val.AddIngredient(ItemID.Picksaw, 1);
-		val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12);
-		val.AddTile(TileID.AdamantiteForge);
-		val.Register();
+		CreateRecipe()
+			.AddIngredient(ItemID.Picksaw)
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12)
+			.AddTile(TileID.AdamantiteForge)
+			.Register();
 	}
 }
diff --git a/Items/Tools/GoldenDiggingClaw.cs b/Items/Tools/GoldenDiggingClaw.cs
index be7b6bd..f947078 100644
--- a/Items/Tools/GoldenDiggingClaw.cs
+++ b/Items/Tools/GoldenDiggingClaw.cs
@@ -9,13 +9,13 @@ public class GoldenDiggingClaw : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Golden Digging Claw");
 		Tooltip.SetDefault("[c/FF3C2B:Mining speed too high may result in no funcionality]");
 	}
 
 	public override void SetDefaults()
 	{
 		Item.damage = 60;
+		Item.DamageType = DamageClass.Melee;
 		Item.width = 38;
 		Item.height = 38;
 		Item.useTime = 3;
@@ -33,27 +33,27 @@ public class GoldenDiggingClaw : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe val = CreateRecipe();
-		val.AddIngredient(ItemID.ShroomiteDiggingClaw);
-		val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 18);
-		val.AddIngredient(ItemID.LunarBar, 22);
-		val.AddIngredient(ItemID.FragmentSolar, 8);
-		val.AddIngredient(ItemID.FragmentNebula, 8);
-		val.AddIngredient(ItemID.FragmentStardust, 8);
-		val.AddIngredient(ItemID.FragmentVortex, 8);
-		val.AddTile(TileID.LunarCraftingStation);
-		val.Register();
+		CreateRecipe()
+			.AddIngredient(ItemID.ShroomiteDiggingClaw)
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 18)
+			.AddIngredient(ItemID.LunarBar, 22)
+			.AddIngredient(ItemID.FragmentSolar, 8)
+			.AddIngredient(ItemID.FragmentNebula, 8)
+			.AddIngredient(ItemID.FragmentStardust, 8)
+			.AddIngredient(ItemID.FragmentVortex, 8)
+			.AddTile(TileID.LunarCraftingStation)
+			.Register();
 	}
 
 	public override void MeleeEffects(Player player, Rectangle hitbox)
 	{
 		if (Main.rand.NextBool(3))
 		{
-			int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
-			Main.dust[num1].scale = 1f;
-			Main.dust[num1].velocity.Y = 0f;
-			Main.dust[num1].velocity.X = 0.5f;
-			Main.dust[num1].noGravity = true;
+			int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
+			Main.dust[dust].scale = 1f;
+			Main.dust[dust].velocity.Y = 0f;
+			Main.dust[dust].velocity.X = 0.5f;
+			Main.dust[dust].noGravity = true;
 		}
 	}
 }
diff --git a/Items/Tools/GoldenHamaxe.cs b/Items/Tools/GoldenHamaxe.cs
index fe215c0..d684385 100644
--- a/Items/Tools/GoldenHamaxe.cs
+++ b/Items/Tools/GoldenHamaxe.cs
@@ -15,6 +15,7 @@ public class GoldenHamaxe : ModItem
 	public override void SetDefaults()
 	{
 		Item.damage = 68;
+		Item.DamageType = DamageClass.Melee;
 		Item.width = 70;
 		Item.height = 60;
 		Item.useTime = 10;
@@ -32,22 +33,22 @@ public class GoldenHamaxe : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe val = CreateRecipe();
-		val.AddIngredient(ItemID.Picksaw, 1);
-		val.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12);
-		val.AddTile(TileID.AdamantiteForge);
-		val.Register();
+		CreateRecipe()
+			.AddIngredient(ItemID.Picksaw, 1)
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12)
+			.AddTile(TileID.AdamantiteForge)
+			.Register();
 	}
 
 	public override void MeleeEffects(Player player, Rectangle hitbox)
 	{
 		if (Main.rand.NextBool(3))
 		{
-			int num1 = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
-			Main.dust[num1].scale = 1f;
-			Main.dust[num1].velocity.Y = 0f;
-			Main.dust[num1].velocity.X = 0.5f;
-			Main.dust[num1].noGravity = true;
+			int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, ModContent.DustType<Dusts.MeatDust>());
+			Main.dust[dust].scale = 1f;
+			Main.dust[dust].velocity.Y = 0f;
+			Main.dust[dust].velocity.X = 0.5f;
+			Main.dust[dust].noGravity = true;
 		}
 	}
 }