Run format

ScalarVector1 · ScalarVector1 · commit fc2bd66e1f54 · 2026-03-05T23:49:18.000-05:00
diff --git a/Content/Abilities/Faewhip/Whip.cs b/Content/Abilities/Faewhip/Whip.cs
@@ -1,6 +1,6 @@
 ﻿using StarlightRiver.Core.Loaders;
-using StarlightRiver.Core.Systems.DummyTileSystem;
 using StarlightRiver.Core.Systems;
+using StarlightRiver.Core.Systems.DummyTileSystem;
 using System;
 using Terraria.GameInput;
 using static Terraria.ModLoader.ModContent;
diff --git a/Content/Bosses/SquidBoss/NPCs.ArenaBlocker.cs b/Content/Bosses/SquidBoss/NPCs.ArenaBlocker.cs
@@ -74,7 +74,7 @@ public override void AI()
 
 		private void ForceColliding(On_Player.orig_Update_NPCCollision orig, Player self)
 		{
-			foreach(NPC npc in Main.ActiveNPCs)
+			foreach (NPC npc in Main.ActiveNPCs)
 			{
 				int specialHit = 0;
 				float damageMult = 0f;
diff --git a/Content/Foregrounds/Foregrounds.OvergrowForeground.cs b/Content/Foregrounds/Foregrounds.OvergrowForeground.cs
@@ -10,7 +10,7 @@ class OvergrowForeground : Foreground
 		public override void Load()
 		{
 			particles = new ParticleSystem("StarlightRiver/Assets/GUI/HolyBig", UpdateOvergrowWells);
-		}  
+		}
 
 		public override bool Visible => Main.LocalPlayer.InModBiome(ModContent.GetInstance<OvergrowBiome>());
 
diff --git a/Content/GUI/DialogUI.cs b/Content/GUI/DialogUI.cs
@@ -267,7 +267,7 @@ public static void ClearButtons()
 
 		public static void AddButton(string message, Action onClick)
 		{
-			var font = Terraria.GameContent.FontAssets.MouseText.Value;
+			ReLogic.Graphics.DynamicSpriteFont font = Terraria.GameContent.FontAssets.MouseText.Value;
 			var add = new RichTextButton(message, onClick, new Vector2(widthOff, HeightOff));
 			add.Width.Set(ChatManager.GetStringSize(font, message, Vector2.One).X + 20, 0);
 			add.Height.Set(32, 0);
diff --git a/Content/Items/BaseTypes/BaseCritterItem.cs b/Content/Items/BaseTypes/BaseCritterItem.cs
@@ -55,4 +55,4 @@ public override void SetDefaults()
 			Item.rare = rarity;
 		}
 	}
-}
+}
diff --git a/Content/Items/BaseTypes/BaseMaterial.cs b/Content/Items/BaseTypes/BaseMaterial.cs
@@ -44,4 +44,4 @@ public override void SetDefaults()
 			Item.rare = rarity;
 		}
 	}
-}
+}
diff --git a/Content/Items/BaseTypes/BaseTileItem.cs b/Content/Items/BaseTypes/BaseTileItem.cs
@@ -76,4 +76,4 @@ public override void SetDefaults()
 			SafeSetDefaults();
 		}
 	}
-}
+}
diff --git a/Content/Items/BaseTypes/BaseWallItem.cs b/Content/Items/BaseTypes/BaseWallItem.cs
@@ -49,4 +49,4 @@ public override void SetDefaults()
 			Item.rare = rarity;
 		}
 	}
-}
+}
diff --git a/Content/Items/BaseTypes/RelicItem.cs b/Content/Items/BaseTypes/RelicItem.cs
@@ -42,7 +42,7 @@ public override bool PreDrawInInventory(Item item, SpriteBatch spriteBatch, Vect
 				RelicAccessorySystem.RelicParticleSystem?.AddParticle(pos, Vector2.Zero, 0, Main.UIScale * Main.rand.NextFloat(0.85f, 1.15f), Color.White, 20, Vector2.Zero, new Rectangle(0, 0, 14, 14));
 			}
 
-			var tex = Assets.Masks.GlowAlpha.Value;
+			Texture2D tex = Assets.Masks.GlowAlpha.Value;
 			spriteBatch.Draw(tex, position, null, new Color(255, 220, 100, 0) * 0.5f, 0, tex.Size() / 2f, 0.5f, 0, 0);
 
 			return base.PreDrawInInventory(item, spriteBatch, position, frame, drawColor, ItemColor, origin, scale);
diff --git a/Content/Items/BaseTypes/Weapons/BaseFlail.cs b/Content/Items/BaseTypes/Weapons/BaseFlail.cs
@@ -153,7 +153,9 @@ public override void AI()
 			if (falling) //falling towards ground, returns after hitting ground
 			{
 				if (strucktile || ++Timer >= 180)
+				{
 					Return(launchspeed, Owner);
+				}
 				else
 				{
 					FallingExtras(Owner);
diff --git a/Content/Items/BaseTypes/Weapons/BaseHeavyFlail.cs b/Content/Items/BaseTypes/Weapons/BaseHeavyFlail.cs
@@ -77,7 +77,9 @@ public override void AI()
 			//Owner.itemAnimation = 10;
 
 			if (Owner.channel)
+			{
 				Projectile.timeLeft = 180;
+			}
 			else if (State != 4)
 			{
 				Projectile.velocity *= 0.5f;
diff --git a/Content/Items/BaseTypes/Weapons/BaseWhip.cs b/Content/Items/BaseTypes/Weapons/BaseWhip.cs
@@ -186,7 +186,9 @@ public override bool PreDraw(ref Color lightColor)
 				bool draw = true;
 
 				if (i == 0)
+				{
 					origin.Y += handleOffset;
+				}
 				else if (i == points.Count - 2)
 				{
 					whipFrame.Y = height * 4;
diff --git a/Content/Items/BaseTypes/Weapons/MultiAmmoWeapon.cs b/Content/Items/BaseTypes/Weapons/MultiAmmoWeapon.cs
@@ -186,7 +186,9 @@ public sealed override void ModifyTooltips(List<TooltipLine> tooltips)
 				return;
 
 			if (!Main.LocalPlayer.controlDown)
+			{
 				tooltips.Add(new TooltipLine(Mod, "Ammo", "[c/646464:Press DOWN for ammo information]"));
+			}
 			else
 			{
 				string ammoList = "Valid Ammunition:\n";
diff --git a/Content/Items/Debug.cs b/Content/Items/Debug.cs
@@ -150,7 +150,7 @@ private bool PlaceDisplayCaseOn(Chest chest)
 		{
 			//ModContent.GetInstance<StarlightWorld>().GraymatterGen(new GenerationProgress(), null);
 
-			foreach(Chest chest in Main.chest)
+			foreach (Chest chest in Main.chest)
 			{
 				PlaceDisplayCaseOn(chest);
 			}
diff --git a/Content/Prefixes/Accessory/Cursed/Unfaithful.cs b/Content/Prefixes/Accessory/Cursed/Unfaithful.cs
@@ -21,7 +21,7 @@ public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Unfaithful");
 		}
-			
+
 		public override void ModifyValue(ref float valueMult)
 		{
 			valueMult *= 2f;
diff --git a/Content/Prefixes/Accessory/Relic/Flawless.cs b/Content/Prefixes/Accessory/Relic/Flawless.cs
@@ -54,4 +54,4 @@ public override IEnumerable<TooltipLine> GetTooltipLines(Item item)
 			};
 		}
 	}
-}
+}
diff --git a/Content/Prefixes/Accessory/Relic/Hextouched.cs b/Content/Prefixes/Accessory/Relic/Hextouched.cs
@@ -54,4 +54,4 @@ public override IEnumerable<TooltipLine> GetTooltipLines(Item item)
 			};
 		}
 	}
-}
+}
diff --git a/Content/Prefixes/Accessory/Relic/Perfected.cs b/Content/Prefixes/Accessory/Relic/Perfected.cs
@@ -24,7 +24,7 @@ public override void SetStaticDefaults()
 		}
 
 		public override void ModifyValue(ref float valueMult)
-		{	
+		{
 			valueMult *= 20f;
 		}
 
@@ -53,4 +53,4 @@ public override IEnumerable<TooltipLine> GetTooltipLines(Item item)
 			};
 		}
 	}
-}
+}
diff --git a/Content/Prefixes/Accessory/Relic/Starborn.cs b/Content/Prefixes/Accessory/Relic/Starborn.cs
@@ -54,5 +54,4 @@ public override IEnumerable<TooltipLine> GetTooltipLines(Item item)
 			};
 		}
 	}
-}
-	
+}
diff --git a/Content/Prefixes/Accessory/StaminaPrefixes.cs b/Content/Prefixes/Accessory/StaminaPrefixes.cs
@@ -33,7 +33,7 @@ public override void ModifyValue(ref float valueMult)
 			valueMult *= 1 + 0.05f * power;
 		}
 
-		public override void ApplyAccessoryEffects(Player player) 
+		public override void ApplyAccessoryEffects(Player player)
 		{
 			player.GetHandler().StaminaRegenRate += power;
 		}
diff --git a/Core/Systems/NoBuildingSystem/NoBuildGlobalItem.cs b/Core/Systems/NoBuildingSystem/NoBuildGlobalItem.cs
@@ -1,6 +1,6 @@
-﻿using StarlightRiver.Content.Bosses.SquidBoss;
+﻿using StarlightRiver.Content;
+using StarlightRiver.Content.Bosses.SquidBoss;
 using StarlightRiver.Content.Tiles.Permafrost;
-using StarlightRiver.Content;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -208,4 +208,4 @@ private void FailFX(Point16 pos)
 				Dust.NewDust(pos.ToVector2() * 16, 16, 16, ModContent.DustType<Content.Dusts.Glow>(), 0, 0, 0, Color.Red, 0.2f);
 		}
 	}
-}
+}
diff --git a/Core/Systems/NoBuildingSystem/NoBuildGlobalProjectile.cs b/Core/Systems/NoBuildingSystem/NoBuildGlobalProjectile.cs
@@ -7,7 +7,7 @@
 
 namespace StarlightRiver.Core.Systems.NoBuildingSystem
 {
-	public class NoBuildGlobalProjectile : GlobalProjectile 
+	public class NoBuildGlobalProjectile : GlobalProjectile
 	{
 		public override bool AppliesToEntity(Projectile entity, bool lateInstantiation)
 		{
@@ -29,4 +29,4 @@ public override void PostAI(Projectile Projectile)
 			}
 		}
 	}
-}
+}
diff --git a/Core/Systems/NoBuildingSystem/NoBuildGlobalTile.cs b/Core/Systems/NoBuildingSystem/NoBuildGlobalTile.cs
@@ -19,4 +19,4 @@ public override bool CanExplode(int i, int j, int type)
 			return base.CanExplode(i, j, type);
 		}
 	}
-}
+}
diff --git a/Core/Systems/WaterAddonSystem/WaterAddon.cs b/Core/Systems/WaterAddonSystem/WaterAddon.cs
@@ -28,4 +28,4 @@ public sealed override void Register()
 
 		}
 	}
-}
+}
diff --git a/Core/Systems/WaterAddonSystem/WaterAddonManager.cs b/Core/Systems/WaterAddonSystem/WaterAddonManager.cs
@@ -125,4 +125,4 @@ private void NewDraw()
 			}
 		}
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public override void AI()`
`74`	`74`
`75`	`75`	`private void ForceColliding(On_Player.orig_Update_NPCCollision orig, Player self)`
`76`	`76`	`{`
`77`		`- foreach(NPC npc in Main.ActiveNPCs)`
	`77`	`+ foreach (NPC npc in Main.ActiveNPCs)`
`78`	`78`	`{`
`79`	`79`	`int specialHit = 0;`
`80`	`80`	`float damageMult = 0f;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class OvergrowForeground : Foreground`
`10`	`10`	`public override void Load()`
`11`	`11`	`{`
`12`	`12`	`particles = new ParticleSystem("StarlightRiver/Assets/GUI/HolyBig", UpdateOvergrowWells);`
`13`		`- }`
	`13`	`+ }`
`14`	`14`
`15`	`15`	`public override bool Visible => Main.LocalPlayer.InModBiome(ModContent.GetInstance<OvergrowBiome>());`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public static void ClearButtons()`
`267`	`267`
`268`	`268`	`public static void AddButton(string message, Action onClick)`
`269`	`269`	`{`
`270`		`- var font = Terraria.GameContent.FontAssets.MouseText.Value;`
	`270`	`+ ReLogic.Graphics.DynamicSpriteFont font = Terraria.GameContent.FontAssets.MouseText.Value;`
`271`	`271`	`var add = new RichTextButton(message, onClick, new Vector2(widthOff, HeightOff));`
`272`	`272`	`add.Width.Set(ChatManager.GetStringSize(font, message, Vector2.One).X + 20, 0);`
`273`	`273`	`add.Height.Set(32, 0);`
Original file line number	Diff line number	Diff line change
`@@ -55,4 +55,4 @@ public override void SetDefaults()`
`55`	`55`	`Item.rare = rarity;`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`-}`
	`58`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ public override void SetDefaults()`
`44`	`44`	`Item.rare = rarity;`
`45`	`45`	`}`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,4 @@ public override void SetDefaults()`
`76`	`76`	`SafeSetDefaults();`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`-}`
	`79`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,4 @@ public override void SetDefaults()`
`49`	`49`	`Item.rare = rarity;`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public override bool PreDrawInInventory(Item item, SpriteBatch spriteBatch, Vect`
`42`	`42`	`RelicAccessorySystem.RelicParticleSystem?.AddParticle(pos, Vector2.Zero, 0, Main.UIScale * Main.rand.NextFloat(0.85f, 1.15f), Color.White, 20, Vector2.Zero, new Rectangle(0, 0, 14, 14));`
`43`	`43`	`}`
`44`	`44`
`45`		`- var tex = Assets.Masks.GlowAlpha.Value;`
	`45`	`+ Texture2D tex = Assets.Masks.GlowAlpha.Value;`
`46`	`46`	`spriteBatch.Draw(tex, position, null, new Color(255, 220, 100, 0) * 0.5f, 0, tex.Size() / 2f, 0.5f, 0, 0);`
`47`	`47`
`48`	`48`	`return base.PreDrawInInventory(item, spriteBatch, position, frame, drawColor, ItemColor, origin, scale);`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,9 @@ public override void AI()`
`153`	`153`	`if (falling) //falling towards ground, returns after hitting ground`
`154`	`154`	`{`
`155`	`155`	`if (strucktile \|\| ++Timer >= 180)`
	`156`	`+ {`
`156`	`157`	`Return(launchspeed, Owner);`
	`158`	`+ }`
`157`	`159`	`else`
`158`	`160`	`{`
`159`	`161`	`FallingExtras(Owner);`