formatting

Werebearguy · May 15, 2020 · f69b29e · f69b29e
1 parent 033ddec
commit f69b29e
Show file tree

Hide file tree

Showing 25 changed files with 83 additions and 93 deletions.
diff --git a/Buffs/WyvernCampfireBuff.cs b/Buffs/WyvernCampfireBuff.cs
@@ -12,7 +12,7 @@ public override void ModifyBuffTip(int type, ref string tip, ref int rare)
         {
             if (type == BuffID.Campfire && Main.LocalPlayer.GetModPlayer<AssPlayer>().wyvernCampfire)
             {
-                tip += "\nWyvern Campfire nearby" + 
+                tip += "\nWyvern Campfire nearby" +
                     "\nYou are protected from Wyverns" +
                     "\nHarpy feathers don't knock you away";
             }

diff --git a/Effects/ShaderManager.cs b/Effects/ShaderManager.cs
@@ -6,75 +6,75 @@
 
 namespace AssortedCrazyThings.Effects
 {
-	/// <summary>
-	/// Responsible for dealing with shaders
-	/// </summary>
-	public static class ShaderManager
-	{
-		public static Effect CircleEffect { get; private set; }
+    /// <summary>
+    /// Responsible for dealing with shaders
+    /// </summary>
+    public static class ShaderManager
+    {
+        public static Effect CircleEffect { get; private set; }
 
-		public static Effect SetupCircleEffect(Vector2 center, int radius, Color edgeColor, Color bodyBolor = default)
-		{
-			Effect circle = CircleEffect;
-			if (circle != null)
-			{
-				circle.Parameters["ScreenPos"].SetValue(Main.screenPosition);
-				circle.Parameters["ScreenDim"].SetValue(new Vector2(Main.screenWidth, Main.screenHeight));
-				circle.Parameters["EntCenter"].SetValue(center);
-				circle.Parameters["EdgeColor"].SetValue(edgeColor.ToVector4());
-				circle.Parameters["BodyColor"].SetValue((bodyBolor == default ? Color.Transparent : bodyBolor).ToVector4());
-				circle.Parameters["Radius"].SetValue(radius);
-				circle.Parameters["HpPercent"].SetValue(1f);
-				circle.Parameters["ShrinkResistScale"].SetValue(1f / 24f);
-			}
-			return circle;
-		}
+        public static Effect SetupCircleEffect(Vector2 center, int radius, Color edgeColor, Color bodyBolor = default)
+        {
+            Effect circle = CircleEffect;
+            if (circle != null)
+            {
+                circle.Parameters["ScreenPos"].SetValue(Main.screenPosition);
+                circle.Parameters["ScreenDim"].SetValue(new Vector2(Main.screenWidth, Main.screenHeight));
+                circle.Parameters["EntCenter"].SetValue(center);
+                circle.Parameters["EdgeColor"].SetValue(edgeColor.ToVector4());
+                circle.Parameters["BodyColor"].SetValue((bodyBolor == default ? Color.Transparent : bodyBolor).ToVector4());
+                circle.Parameters["Radius"].SetValue(radius);
+                circle.Parameters["HpPercent"].SetValue(1f);
+                circle.Parameters["ShrinkResistScale"].SetValue(1f / 24f);
+            }
+            return circle;
+        }
 
-		public static void ApplyToScreenOnce(SpriteBatch spriteBatch, Effect effect, bool restore = true)
-		{
-			if (effect == null) return;
+        public static void ApplyToScreenOnce(SpriteBatch spriteBatch, Effect effect, bool restore = true)
+        {
+            if (effect == null) return;
 
-			//Apply the shader to the spritebatch from now on
-			StartEffectOnSpriteBatch(spriteBatch, effect);
+            //Apply the shader to the spritebatch from now on
+            StartEffectOnSpriteBatch(spriteBatch, effect);
 
-			DrawEmptyCanvasToScreen(spriteBatch);
+            DrawEmptyCanvasToScreen(spriteBatch);
 
-			//Normally you want to apply the shader once, and restore. This is for when you repeatedly apply a different effect without restoring vanilla
-			if (restore)
-			{
-				//Stop applying the shader, continue normal behavior
-				RestoreVanillaSpriteBatchSettings(spriteBatch);
-			}
-		}
+            //Normally you want to apply the shader once, and restore. This is for when you repeatedly apply a different effect without restoring vanilla
+            if (restore)
+            {
+                //Stop applying the shader, continue normal behavior
+                RestoreVanillaSpriteBatchSettings(spriteBatch);
+            }
+        }
 
-		public static void StartEffectOnSpriteBatch(SpriteBatch spriteBatch, Effect effect)
-		{
-			spriteBatch.End();
-			spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, Main.DefaultSamplerState, DepthStencilState.None, Main.instance.Rasterizer, effect, Main.GameViewMatrix.TransformationMatrix);
-		}
+        public static void StartEffectOnSpriteBatch(SpriteBatch spriteBatch, Effect effect)
+        {
+            spriteBatch.End();
+            spriteBatch.Begin(SpriteSortMode.Immediate, BlendState.AlphaBlend, Main.DefaultSamplerState, DepthStencilState.None, Main.instance.Rasterizer, effect, Main.GameViewMatrix.TransformationMatrix);
+        }
 
-		public static void DrawEmptyCanvasToScreen(SpriteBatch spriteBatch)
-		{
-			spriteBatch.Draw(Main.magicPixel, new Rectangle(0, 0, Main.screenWidth, Main.screenHeight), Color.Transparent);
-		}
+        public static void DrawEmptyCanvasToScreen(SpriteBatch spriteBatch)
+        {
+            spriteBatch.Draw(Main.magicPixel, new Rectangle(0, 0, Main.screenWidth, Main.screenHeight), Color.Transparent);
+        }
 
-		public static void RestoreVanillaSpriteBatchSettings(SpriteBatch spriteBatch)
-		{
-			spriteBatch.End();
-			spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, Main.DefaultSamplerState, DepthStencilState.None, Main.instance.Rasterizer, null, Main.GameViewMatrix.TransformationMatrix);
-		}
+        public static void RestoreVanillaSpriteBatchSettings(SpriteBatch spriteBatch)
+        {
+            spriteBatch.End();
+            spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, Main.DefaultSamplerState, DepthStencilState.None, Main.instance.Rasterizer, null, Main.GameViewMatrix.TransformationMatrix);
+        }
 
-		public static void Load()
-		{
-			if (Main.netMode != NetmodeID.Server)
-			{
-				CircleEffect = AssUtils.Instance.GetEffect("Effects/CircleShader/Circle");
-			}
-		}
+        public static void Load()
+        {
+            if (Main.netMode != NetmodeID.Server)
+            {
+                CircleEffect = AssUtils.Instance.GetEffect("Effects/CircleShader/Circle");
+            }
+        }
 
-		public static void Unload()
-		{
-			CircleEffect = null;
-		}
-	}
+        public static void Unload()
+        {
+            CircleEffect = null;
+        }
+    }
 }
diff --git a/Items/CaughtDungeonSoul.cs b/Items/CaughtDungeonSoul.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
-using System.Linq;
-using AssortedCrazyThings.Base;
+using AssortedCrazyThings.Base;
 using AssortedCrazyThings.NPCs.DungeonBird;
 using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+using System.Linq;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/Items/ChunkysEye.cs b/Items/ChunkysEye.cs
@@ -1,4 +1,3 @@
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace AssortedCrazyThings.Items

diff --git a/Items/DesiccatedLeather.cs b/Items/DesiccatedLeather.cs
@@ -1,5 +1,4 @@
 using Terraria;
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace AssortedCrazyThings.Items

diff --git a/Items/DroneUnlockables/DroneUnlockable.cs b/Items/DroneUnlockables/DroneUnlockable.cs
@@ -76,7 +76,7 @@ public class DroneRecipe : ModRecipe
     {
         public DroneType UnlockedType;
 
-        public DroneRecipe(Mod mod, DroneType unlockedType): base(mod)
+        public DroneRecipe(Mod mod, DroneType unlockedType) : base(mod)
         {
             UnlockedType = unlockedType;
         }

diff --git a/Items/Gitgud/GitgudItem.cs b/Items/Gitgud/GitgudItem.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Terraria;
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace AssortedCrazyThings.Items.Gitgud

diff --git a/Items/IdolOfDecay.cs b/Items/IdolOfDecay.cs
@@ -1,6 +1,6 @@
-using System.Linq;
-using AssortedCrazyThings.Base;
+using AssortedCrazyThings.Base;
 using AssortedCrazyThings.NPCs.DungeonBird;
+using System.Linq;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/Items/MeatballsEye.cs b/Items/MeatballsEye.cs
@@ -1,4 +1,3 @@
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace AssortedCrazyThings.Items

diff --git a/Items/Weapons/EverhallowedLantern.cs b/Items/Weapons/EverhallowedLantern.cs
@@ -1,5 +1,4 @@
-using AssortedCrazyThings.Base;
-using AssortedCrazyThings.Buffs;
+using AssortedCrazyThings.Buffs;
 using AssortedCrazyThings.Projectiles.Minions.CompanionDungeonSouls;
 using AssortedCrazyThings.UI;
 using Microsoft.Xna.Framework;

diff --git a/Items/Weapons/SlimeHandlerKnapsack.cs b/Items/Weapons/SlimeHandlerKnapsack.cs
@@ -13,7 +13,8 @@ namespace AssortedCrazyThings.Items.Weapons
 {
     public class SlimeHandlerKnapsack : MinionItemBase
     {
-        public static CircleUIConf GetUIConf() {
+        public static CircleUIConf GetUIConf()
+        {
             List<string> textureNames = new List<string>() {
                         AssUtils.Instance.Name + "/Projectiles/Minions/SlimePackMinions/SlimeMinionPreview",
                         AssUtils.Instance.Name + "/Projectiles/Minions/SlimePackMinions/SlimeMinionAssortedPreview",

diff --git a/NPCs/ChunkysEye.cs b/NPCs/ChunkysEye.cs
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/NPCs/CuteSlimes/CuteSlimeBaseNPC.cs b/NPCs/CuteSlimes/CuteSlimeBaseNPC.cs
@@ -1,7 +1,7 @@
-using System.IO;
 using AssortedCrazyThings.Base;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System.IO;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/NPCs/MeatballsEye.cs b/NPCs/MeatballsEye.cs
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;

diff --git a/Projectiles/Minions/Drones/HealingDrone.cs b/Projectiles/Minions/Drones/HealingDrone.cs
@@ -1,7 +1,6 @@
 using AssortedCrazyThings.Base;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 using Terraria;
 using Terraria.ID;
 

diff --git a/Projectiles/Minions/Drones/HeavyLaserDrone.cs b/Projectiles/Minions/Drones/HeavyLaserDrone.cs
@@ -51,7 +51,7 @@ private Vector2 BarrelPos
 
         private bool CanOverlay => ChargeTimer >= AnimationDuration && (projectile.frame == 3 || projectile.frame == 7);
 
-        private float OverlayOpacity => (ChargeTimer - AnimationDuration) / (float) byte.MaxValue;
+        private float OverlayOpacity => (ChargeTimer - AnimationDuration) / (float)byte.MaxValue;
 
         private bool playedOverheatSound = false;
 

diff --git a/Projectiles/Minions/Drones/ShieldDrone.cs b/Projectiles/Minions/Drones/ShieldDrone.cs
@@ -1,7 +1,6 @@
 using AssortedCrazyThings.Base;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 using Terraria;
 using Terraria.ID;
 
@@ -150,7 +149,7 @@ protected override void CustomAI()
 
             if (CanShield)
             {
-                Vector2 shootOffset = new Vector2(0 , sinY);
+                Vector2 shootOffset = new Vector2(0, sinY);
                 Vector2 shootOrigin = projectile.Center + shootOffset;
                 Vector2 target = player.MountedCenter + new Vector2(0f, -5f);
 

diff --git a/Projectiles/Minions/MagicSlimeSlingStuff/MagicSlimeSlingFired.cs b/Projectiles/Minions/MagicSlimeSlingStuff/MagicSlimeSlingFired.cs
@@ -125,7 +125,7 @@ public override void AI()
             {
                 dustType = ModContent.DustType<GlitterDust57>();
             }
-            else if(dustType == 2)
+            else if (dustType == 2)
             {
                 dustType = ModContent.DustType<GlitterDust58>();
             }

diff --git a/Projectiles/Minions/MagicSlimeSlingStuff/MagicSlimeSlingMinion.cs b/Projectiles/Minions/MagicSlimeSlingStuff/MagicSlimeSlingMinion.cs
@@ -1,5 +1,4 @@
-using AssortedCrazyThings.Base;
-using AssortedCrazyThings.Dusts;
+using AssortedCrazyThings.Dusts;
 using AssortedCrazyThings.Items.Weapons;
 using AssortedCrazyThings.Projectiles.Pets;
 using Microsoft.Xna.Framework;

diff --git a/Projectiles/Pets/PetEaterOfWorlds.cs b/Projectiles/Pets/PetEaterOfWorlds.cs
@@ -21,7 +21,7 @@ public override void SetStaticDefaults()
 
         public override void SetDefaults()
         {
-            AssAI.StardustDragonSetDefaults(projectile,size: HITBOX_SIZE, minion: false);
+            AssAI.StardustDragonSetDefaults(projectile, size: HITBOX_SIZE, minion: false);
             projectile.alpha = 0;
         }
 

diff --git a/Projectiles/Pets/PetGoldfishProj.cs b/Projectiles/Pets/PetGoldfishProj.cs
@@ -333,7 +333,7 @@ public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor)
             if (Main.hasFocus) GetFrame();
 
             lightColor = Lighting.GetColor((int)(projectile.Center.X / 16), (int)(projectile.Center.Y / 16), Color.White);
-            SpriteEffects effects = projectile.direction != -1 ? SpriteEffects.FlipHorizontally: SpriteEffects.None;
+            SpriteEffects effects = projectile.direction != -1 ? SpriteEffects.FlipHorizontally : SpriteEffects.None;
             PetPlayer mPlayer = projectile.GetOwner().GetModPlayer<PetPlayer>();
             Texture2D image = mod.GetTexture("Projectiles/Pets/PetGoldfishProj_" + mPlayer.petGoldfishType);
             Rectangle bounds = new Rectangle();

diff --git a/Projectiles/Weapons/GuideVoodoorangProj.cs b/Projectiles/Weapons/GuideVoodoorangProj.cs
@@ -45,7 +45,7 @@ public override void PostAI()
                         {
                             if (Main.netMode == NetmodeID.Server)
                             {
-                                NetMessage.SendData(MessageID.StrikeNPC, -1, -1, null, i, 9999f, 10f,-Main.npc[i].direction);
+                                NetMessage.SendData(MessageID.StrikeNPC, -1, -1, null, i, 9999f, 10f, -Main.npc[i].direction);
                             }
                             Main.npc[i].StrikeNPCNoInteraction(9999, 10f, -Main.npc[i].direction);
                             NPC.SpawnWOF(projectile.position);

diff --git a/Tiles/SlimeBeaconTile.cs b/Tiles/SlimeBeaconTile.cs
@@ -1,6 +1,5 @@
 using AssortedCrazyThings.Items.Placeable;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.DataStructures;
 using Terraria.ID;

diff --git a/Tiles/VanityDresserTile.cs b/Tiles/VanityDresserTile.cs
@@ -11,7 +11,8 @@ namespace AssortedCrazyThings.Tiles
 {
     public class VanityDresserTile : ModTile
     {
-        public override void SetDefaults() {
+        public override void SetDefaults()
+        {
             Main.tileSolidTop[Type] = true;
             Main.tileFrameImportant[Type] = true;
             Main.tileNoAttach[Type] = true;

diff --git a/UI/HoverNPCUI.cs b/UI/HoverNPCUI.cs
@@ -1,14 +1,13 @@
-using AssortedCrazyThings.Base;
-using AssortedCrazyThings.NPCs;
+using AssortedCrazyThings.NPCs;
 using AssortedCrazyThings.NPCs.DungeonBird;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.GameInput;
+using Terraria.ID;
 using Terraria.ModLoader;
 using Terraria.UI;
 using Terraria.UI.Chat;
-using Terraria.ID;
 
 namespace AssortedCrazyThings.UI
 {