Some cleanup

BarotraumaClient/Source/Characters/Character.cs

@@ -81,7 +81,7 @@ namespace Barotrauma
             }
         }
 
-        private void UpdateControlled(float deltaTime)
+        partial void UpdateControlled(float deltaTime)
         {
             if (controlled == this)
             {
@@ -239,7 +239,7 @@ namespace Barotrauma
             selectedSound.Sound.Play(1.0f, selectedSound.Range, AnimController.WorldPosition);
         }
 
-        private void ImplodeFX()
+        partial void ImplodeFX()
         {
             Vector2 centerOfMass = AnimController.GetCenterOfMass();
 

BarotraumaClient/Source/GameSettings.cs

@@ -110,7 +110,7 @@ namespace Barotrauma
             }
         }
 
-        private void InitProjSpecific(XDocument doc)
+        partial void InitProjSpecific(XDocument doc)
         {
             if (doc == null)
             {

BarotraumaClient/Source/Items/CharacterInventory.cs

@@ -18,7 +18,7 @@ namespace Barotrauma
 
         private GUIButton[] useOnSelfButton;
 
-        void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             useOnSelfButton = new GUIButton[2];
 

BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs

@@ -19,7 +19,7 @@ namespace Barotrauma.Items.Components
         private GUIProgressBar progressBar;
         private GUIButton activateButton;
 
-        private void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             GuiFrame.Padding = new Vector4(20.0f, 20.0f, 20.0f, 20.0f);
 

BarotraumaClient/Source/Items/Components/Machines/Pump.cs

@@ -12,7 +12,7 @@ namespace Barotrauma.Items.Components
     {
         private GUITickBox isActiveTickBox;
 
-        private void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             isActiveTickBox = new GUITickBox(new Rectangle(0, 0, 20, 20), "Running", Alignment.TopLeft, GuiFrame);
             isActiveTickBox.OnSelected = (GUITickBox box) =>

BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -12,7 +12,7 @@ namespace Barotrauma.Items.Components
     {
         private GUITickBox autoTempTickBox;
         
-        private void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             var button = new GUIButton(new Rectangle(410, 70, 40, 40), "-", "", GuiFrame);
             button.OnPressed = () =>

BarotraumaClient/Source/Items/Components/Machines/Steering.cs

@@ -35,7 +35,7 @@ namespace Barotrauma.Items.Components
             set { maintainPosTickBox.Selected = value; }
         }
 
-        private void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             autopilotTickBox = new GUITickBox(new Rectangle(0, 25, 20, 20), "Autopilot", Alignment.TopLeft, GuiFrame);
             autopilotTickBox.OnSelected = (GUITickBox box) =>

BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs

@@ -9,7 +9,7 @@ namespace Barotrauma.Items.Components
 {
     partial class PowerContainer : Powered, IDrawableComponent, IServerSerializable, IClientSerializable
     {
-        private void InitProjSpecific()
+        partial void InitProjSpecific()
         {
             if (canBeSelected)
             {

BarotraumaClient/Source/Map/Explosion.cs

@@ -10,7 +10,7 @@ namespace Barotrauma
 {
     partial class Explosion
     {
-        private void ExplodeProjSpecific(Vector2 worldPosition,Hull hull)
+        partial void ExplodeProjSpecific(Vector2 worldPosition,Hull hull)
         {
 
             if (shockwave)

BarotraumaClient/Source/Map/FireSource.cs

@@ -14,7 +14,7 @@ namespace Barotrauma
 
         private LightSource lightSource;
 
-        private void UpdateProjSpecific(float growModifier)
+        partial void UpdateProjSpecific(float growModifier)
         {
             if (hull.FireSources.Any(fs => fs != this && fs.size.X > size.X))
             {

BarotraumaClient/Source/Physics/PhysicsBody.cs

@@ -95,7 +95,7 @@ namespace Barotrauma
                 1.0f, SpriteEffects.None, 0.0f);
         }
 
-        private void DisposeProjSpecific()
+        partial void DisposeProjSpecific()
         {
             if (bodyShapeTexture != null)
             {

BarotraumaClient/Source/Sprite/Sprite.cs

@@ -35,7 +35,7 @@ namespace Barotrauma
             list.Add(this);
         }
 
-        private void LoadTexture(ref Vector4 sourceVector,ref bool shouldReturn)
+        partial void LoadTexture(ref Vector4 sourceVector,ref bool shouldReturn)
         {
             texture = LoadTexture(this.file);
 
@@ -49,7 +49,7 @@ namespace Barotrauma
             if (sourceVector.W == 0.0f) sourceVector.W = texture.Height;
         }
 
-        private void CalculateSourceRect()
+        partial void CalculateSourceRect()
         {
             sourceRect = new Rectangle(0, 0, texture.Width, texture.Height);
         }
@@ -261,7 +261,7 @@ namespace Barotrauma
             }
         }
 
-        private void DisposeTexture()
+        partial void DisposeTexture()
         {
             //check if another sprite is using the same texture
             foreach (Sprite s in list)

BarotraumaServer/BarotraumaServer.csproj

@@ -67,27 +67,18 @@
     <Compile Include="Source\GameMain.cs" />
     <Compile Include="Source\GameSession\GameSession.cs" />
     <Compile Include="Source\GameSettings.cs" />
-    <Compile Include="Source\Items\CharacterInventory.cs" />
     <Compile Include="Source\Items\Components\ItemComponent.cs" />
     <Compile Include="Source\Items\Components\ItemLabel.cs" />
-    <Compile Include="Source\Items\Components\Machines\Pump.cs" />
-    <Compile Include="Source\Items\Components\Machines\Reactor.cs" />
-    <Compile Include="Source\Items\Components\Machines\Fabricator.cs" />
     <Compile Include="Source\Items\Components\Machines\Steering.cs" />
-    <Compile Include="Source\Items\Components\Power\PowerContainer.cs" />
-    <Compile Include="Source\Map\Explosion.cs" />
-    <Compile Include="Source\Map\FireSource.cs" />
     <Compile Include="Source\Map\Hull.cs" />
     <Compile Include="Source\Networking\GameClient.cs" />
     <Compile Include="Source\Networking\GameServer.cs" />
     <Compile Include="Source\Networking\NetworkMember.cs" />
     <Compile Include="Source\Networking\Voting.cs" />
-    <Compile Include="Source\Physics\PhysicsBody.cs" />
     <Compile Include="Source\PlayerInput.cs" />
     <Compile Include="Source\Program.cs" />
     <Compile Include="Source\Screens\NetLobbyScreen.cs" />
     <Compile Include="Source\Screens\UnimplementedScreen.cs" />
-    <Compile Include="Source\Sprite\Sprite.cs" />
     <Compile Include="Source\Utils\MonogameTypes\Color.cs" />
     <Compile Include="Source\Utils\MonogameTypes\Graphics\SpriteEffects.cs" />
     <Compile Include="Source\Utils\MonogameTypes\Input\KeyboardState.cs" />

BarotraumaServer/Source/Characters/Character.cs

@@ -28,15 +28,5 @@ namespace Barotrauma
         {
             keys = null;
         }
-
-        private void UpdateControlled(float deltaTime)
-        {
-            //do nothing
-        }
-
-        private void ImplodeFX()
-        {
-            //do nothing
-        }
     }
 }

BarotraumaServer/Source/GameSettings.cs

@@ -14,10 +14,6 @@ namespace Barotrauma
 
     public partial class GameSettings
     {
-        private void InitProjSpecific(XDocument doc)
-        {
-            //do nothing
-        }
         public void Save(string filePath)
         {
             XDocument doc = new XDocument();

BarotraumaServer/Source/Items/CharacterInventory.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using Lidgren.Network;
-using System.Collections.Generic;
-using Barotrauma.Items.Components;
-
-namespace Barotrauma
-{
-    partial class CharacterInventory : Inventory
-    {
-        void InitProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Items/Components/Machines/Fabricator.cs

@@ -1,20 +0,0 @@
-using Barotrauma.Networking;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-
-namespace Barotrauma.Items.Components
-{
-    partial class Fabricator : Powered, IServerSerializable, IClientSerializable
-    {
-        private void InitProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Items/Components/Machines/Pump.cs

@@ -1,18 +0,0 @@
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Xml.Linq;
-
-namespace Barotrauma.Items.Components
-{
-    partial class Pump : Powered, IServerSerializable, IClientSerializable
-    {
-        private void InitProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Items/Components/Machines/Reactor.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-
-namespace Barotrauma.Items.Components
-{
-    partial class Reactor : Powered, IDrawableComponent, IServerSerializable, IClientSerializable
-    {
-        private void InitProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Items/Components/Machines/Steering.cs

@@ -17,10 +17,5 @@ namespace Barotrauma.Items.Components
         public bool MaintainPos;
         public bool LevelStartSelected;
         public bool LevelEndSelected;
-        
-        private void InitProjSpecific()
-        {
-            //do nothing
-        }
     }
 }

BarotraumaServer/Source/Items/Components/Power/PowerContainer.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using Lidgren.Network;
-
-namespace Barotrauma.Items.Components
-{
-    partial class PowerContainer : Powered, IDrawableComponent, IServerSerializable, IClientSerializable
-    {
-        private void InitProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Map/Explosion.cs

@@ -1,17 +0,0 @@
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Barotrauma.Networking;
-using FarseerPhysics;
-
-namespace Barotrauma
-{
-    partial class Explosion
-    {
-        private void ExplodeProjSpecific(Vector2 worldPosition,Hull hull)
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Map/FireSource.cs

@@ -1,17 +0,0 @@
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Barotrauma.Networking;
-
-namespace Barotrauma
-{
-    partial class FireSource
-    {
-        private void UpdateProjSpecific(float growModifier)
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Physics/PhysicsBody.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Barotrauma
-{
-    partial class PhysicsBody
-    {
-        private void DisposeProjSpecific()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaServer/Source/Sprite/Sprite.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma
-{
-    public partial class Sprite
-    {
-        private void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn)
-        {
-            //do nothing
-        }
-
-        private void CalculateSourceRect()
-        {
-            //do nothing
-        }
-
-        private void DisposeTexture()
-        {
-            //do nothing
-        }
-    }
-}

BarotraumaShared/Source/Characters/Character.cs

@@ -1442,6 +1442,8 @@ namespace Barotrauma
             if (!IsDead) LockHands = false;
         }
 
+        partial void UpdateControlled(float deltaTime);
+
         private void UpdateOxygen(float deltaTime)
         {
             float prevOxygen = oxygen;
@@ -1618,6 +1620,8 @@ namespace Barotrauma
             }
         }
 
+        partial void ImplodeFX();
+        
         public void Kill(CauseOfDeath causeOfDeath, bool isNetworkMessage = false)
         {
             if (isDead) return;

BarotraumaShared/Source/GameSettings.cs

@@ -66,5 +66,6 @@ namespace Barotrauma
             }
         }
 
+        partial void InitProjSpecific(XDocument doc);
     }
 }

BarotraumaShared/Source/Items/CharacterInventory.cs

@@ -32,6 +32,8 @@ namespace Barotrauma
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         private bool UseItemOnSelf(int slotIndex)
         {
             if (Items[slotIndex] == null) return false;

BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs

@@ -106,6 +106,8 @@ namespace Barotrauma.Items.Components
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         public override bool Select(Character character)
         {
             CheckFabricableItems(character);

BarotraumaShared/Source/Items/Components/Machines/Pump.cs

@@ -70,6 +70,8 @@ namespace Barotrauma.Items.Components
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         public override void Move(Vector2 amount)
         {
             base.Move(amount);

BarotraumaShared/Source/Items/Components/Machines/Reactor.cs

@@ -166,6 +166,8 @@ namespace Barotrauma.Items.Components
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         public override void Update(float deltaTime, Camera cam) 
         {
             if (GameMain.Server != null && nextServerLogWriteTime != null)

BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -105,6 +105,8 @@ namespace Barotrauma.Items.Components
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         public override void Update(float deltaTime, Camera cam)
         {
             if (unsentChanges)

BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs

@@ -95,6 +95,8 @@ namespace Barotrauma.Items.Components
             InitProjSpecific();
         }
 
+        partial void InitProjSpecific();
+
         public override bool Pick(Character picker)
         {
             if (picker == null) return false;

BarotraumaShared/Source/Map/Explosion.cs

@@ -80,6 +80,8 @@ namespace Barotrauma
 
         }
 
+        partial void ExplodeProjSpecific(Vector2 worldPosition, Hull hull);
+
         private Vector2 ClampParticlePos(Vector2 particlePos, Hull hull)
         {
             if (hull == null) return particlePos;

BarotraumaShared/Source/Map/FireSource.cs

@@ -169,6 +169,8 @@ namespace Barotrauma
             if (size.X < 1.0f) Remove();
         }
 
+        partial void UpdateProjSpecific(float growModifier);
+
         private void OnChangeHull(Vector2 pos, Hull particleHull)
         {
             if (particleHull == hull || particleHull==null) return;

BarotraumaShared/Source/Physics/PhysicsBody.cs

@@ -535,5 +535,6 @@ namespace Barotrauma
             DisposeProjSpecific();
         }
 
+        partial void DisposeProjSpecific();
     }
 }

BarotraumaShared/Source/Sprite/Sprite.cs

@@ -60,6 +60,9 @@ namespace Barotrauma
             return FilePath + ": " + sourceRect;
         }
 
+        partial void LoadTexture(ref Vector4 sourceVector, ref bool shouldReturn);
+        partial void CalculateSourceRect();
+
         public Sprite(XElement element, string path = "", string file = "")
         {
             if (file == "")
@@ -157,6 +160,8 @@ namespace Barotrauma
 
             DisposeTexture();
         }
+
+        partial void DisposeTexture();
     }
 }