Moved entities into the Entities subfolder.

VC2008/MCServer.vcproj

@@ -402,6 +402,10 @@
 				RelativePath="..\source\Defines.h"
 				>
 			</File>
+			<File
+				RelativePath="..\source\Doors.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\Enchantments.cpp"
 				>
@@ -502,6 +506,10 @@
 				RelativePath="..\source\ItemGrid.h"
 				>
 			</File>
+			<File
+				RelativePath="..\source\Ladder.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\LeakFinder.cpp"
 				>
@@ -678,6 +686,10 @@
 				RelativePath="..\source\Server.h"
 				>
 			</File>
+			<File
+				RelativePath="..\source\Sign.h"
+				>
+			</File>
 			<File
 				RelativePath="..\source\StackWalker.cpp"
 				>
@@ -985,71 +997,59 @@
 				Name="Entities"
 				>
 				<File
-					RelativePath="..\source\Doors.h"
+					RelativePath="..\source\Entities\Entity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entity.cpp"
+					RelativePath="..\source\Entities\Entity.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Entity.h"
+					RelativePath="..\source\Entities\FallingBlock.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\FallingBlock.cpp"
+					RelativePath="..\source\Entities\FallingBlock.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\FallingBlock.h"
+					RelativePath="..\source\Entities\Minecart.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Ladder.h"
+					RelativePath="..\source\Entities\Minecart.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Minecart.cpp"
+					RelativePath="..\source\Entities\Pawn.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Minecart.h"
+					RelativePath="..\source\Entities\Pawn.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pawn.cpp"
+					RelativePath="..\source\Entities\Pickup.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pawn.h"
+					RelativePath="..\source\Entities\Pickup.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pickup.cpp"
+					RelativePath="..\source\Entities\Player.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Pickup.h"
+					RelativePath="..\source\Entities\Player.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Player.cpp"
+					RelativePath="..\source\Entities\TNTEntity.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\Player.h"
+					RelativePath="..\source\Entities\TNTEntity.h"
-					>
-				</File>
-				<File
-					RelativePath="..\source\Sign.h"
-					>
-				</File>
-				<File
-					RelativePath="..\source\TNTEntity.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\TNTEntity.h"
 					>
 				</File>
 			</Filter>

source/AllToLua.pkg

@@ -24,9 +24,9 @@ $cfile "LuaFunctions.h"
 $cfile "StringMap.h"
 $cfile "ChatColor.h"
 $cfile "ClientHandle.h"
-$cfile "Entity.h"
+$cfile "Entities/Entity.h"
-$cfile "Pawn.h"
+$cfile "Entities/Pawn.h"
-$cfile "Player.h"
+$cfile "Entities/Player.h"
 $cfile "PluginManager.h"
 $cfile "Plugin.h"
 $cfile "PluginLua.h"
@@ -45,7 +45,7 @@ $cfile "BlockEntities/DropperEntity.h"
 $cfile "BlockEntities/FurnaceEntity.h"
 $cfile "WebAdmin.h"
 $cfile "WebPlugin.h"
-$cfile "Pickup.h"
+$cfile "Entities/Pickup.h"
 $cfile "Root.h"
 $cfile "Vector3f.h"
 $cfile "Vector3d.h"

source/Bindings.cpp

@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 10:28:26.
 */
 
 #ifndef __cplusplus
@@ -24,9 +24,9 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "StringMap.h"
 #include "ChatColor.h"
 #include "ClientHandle.h"
-#include "Entity.h"
+#include "Entities/Entity.h"
-#include "Pawn.h"
+#include "Entities/Pawn.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "PluginManager.h"
 #include "Plugin.h"
 #include "PluginLua.h"
@@ -45,7 +45,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "BlockEntities/FurnaceEntity.h"
 #include "WebAdmin.h"
 #include "WebPlugin.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Root.h"
 #include "Vector3f.h"
 #include "Vector3d.h"

source/Bindings.h

@@ -1,6 +1,6 @@
 /*
 ** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/19/13 09:36:55.
+** Generated automatically by tolua++-1.0.92 on 08/19/13 10:28:26.
 */
 
 /* Exported function */

source/BlockEntities/ChestEntity.cpp

@@ -3,9 +3,8 @@
 
 #include "ChestEntity.h"
 #include "../Item.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include "../Noise.h"
 #include <json/json.h>
 
 

source/BlockEntities/DispenserEntity.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "DispenserEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/FluidSimulator.h"
 #include "../Chunk.h"
 

source/BlockEntities/DropSpenserEntity.cpp

@@ -6,7 +6,7 @@
 
 #include "Globals.h"
 #include "DropSpenserEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Chunk.h"
 
 

source/BlockEntities/DropperEntity.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "DropperEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/FluidSimulator.h"
 
 

source/BlockEntities/FurnaceEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "FurnaceEntity.h"
 #include "../UI/Window.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Root.h"
 #include "../Chunk.h"
 #include <json/json.h>

source/BlockEntities/HopperEntity.cpp

@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "HopperEntity.h"
 #include "../Chunk.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../PluginManager.h"
 #include "ChestEntity.h"
 #include "DropSpenserEntity.h"

source/BlockEntities/JukeboxEntity.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/BlockEntities/SignEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "SignEntity.h"
 
-#include "../Player.h"
+#include "../Entities/Player.h"
 // #include "ClientHandle.h"
 // #include "World.h"
 // #include "Root.h"

source/Blocks/BlockBed.h

@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockChest.h

@@ -4,7 +4,7 @@
 #include "BlockEntity.h"
 #include "../World.h"
 #include "../BlockArea.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockDoor.cpp

@@ -4,7 +4,7 @@
 #include "../Item.h"
 #include "../World.h"
 #include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockDoor.h

@@ -4,7 +4,7 @@
 #include "BlockHandler.h"
 #include "../World.h"
 #include "../Doors.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockFurnace.h

@@ -4,7 +4,7 @@
 #include "BlockEntity.h"
 #include "../World.h"
 #include "../Piston.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockLever.cpp

@@ -3,7 +3,7 @@
 #include "BlockLever.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Simulator/RedstoneSimulator.h"
 
 

source/Blocks/BlockPiston.cpp

@@ -3,7 +3,7 @@
 #include "BlockPiston.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Piston.h"
 
 

source/Blocks/BlockRedstoneRepeater.cpp

@@ -3,7 +3,6 @@
 #include "BlockRedstoneRepeater.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
 #include "../Simulator/RedstoneSimulator.h"
 
 

source/Blocks/BlockSign.h

@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Blocks/BlockWorkbench.h

@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../UI/Window.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Chunk.cpp

@@ -20,12 +20,12 @@
 #include "BlockEntities/JukeboxEntity.h"
 #include "BlockEntities/NoteEntity.h"
 #include "BlockEntities/SignEntity.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Item.h"
 #include "Noise.h"
 #include "Root.h"
 #include "MersenneTwister.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "BlockArea.h"
 #include "PluginManager.h"
 #include "Blocks/BlockHandler.h"

source/Chunk.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "Entity.h"
+#include "Entities/Entity.h"
 #include "ChunkDef.h"
 
 #include "Simulator/FireSimulator.h"

source/ChunkMap.cpp

@@ -4,15 +4,14 @@
 #include "ChunkMap.h"
 #include "World.h"
 #include "Root.h"
-#include "Player.h"
+#include "Entities/Player.h"
-#include "BlockID.h"
 #include "Item.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Chunk.h"
 #include "Generating/Trees.h"  // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
 #include "BlockArea.h"
 #include "PluginManager.h"
-#include "TNTEntity.h"
+#include "Entities/TNTEntity.h"
 
 #ifndef _WIN32
 	#include <cstdlib> // abs

source/ClientHandle.cpp

@@ -3,9 +3,9 @@
 #include "ClientHandle.h"
 #include "Server.h"
 #include "World.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "PluginManager.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Inventory.h"
 #include "BlockEntities/ChestEntity.h"
 #include "BlockEntities/SignEntity.h"
@@ -20,7 +20,6 @@
 #include "Items/ItemHandler.h"
 #include "Blocks/BlockHandler.h"
 
-#include "Tracer.h"
 #include "Vector3f.h"
 #include "Vector3d.h"
 

source/Entities/Entity.cpp

@@ -2,17 +2,17 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Entity.h"
-#include "World.h"
+#include "../World.h"
-#include "Server.h"
+#include "../Server.h"
-#include "Root.h"
+#include "../Root.h"
-#include "Vector3d.h"
+#include "../Vector3d.h"
-#include "Matrix4f.h"
+#include "../Matrix4f.h"
-#include "ReferenceManager.h"
+#include "../ReferenceManager.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
-#include "Tracer.h"
+#include "../Chunk.h"
-#include "Chunk.h"
+#include "../Simulator/FluidSimulator.h"
-#include "Simulator/FluidSimulator.h"
+#include "../PluginManager.h"
-#include "PluginManager.h"
+#include "../Tracer.h"
 
 
 

source/Entities/Entity.h

@@ -1,9 +1,9 @@
 
 #pragma once
 
-#include "Item.h"
+#include "../Item.h"
-#include "Vector3d.h"
+#include "../Vector3d.h"
-#include "Vector3f.h"
+#include "../Vector3f.h"
 
 
 

source/Entities/FallingBlock.cpp

@@ -1,10 +1,10 @@
 #include "Globals.h"
 
 #include "FallingBlock.h"
-#include "World.h"
+#include "../World.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
-#include "Simulator/SandSimulator.h"
+#include "../Simulator/SandSimulator.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 

source/Entities/FallingBlock.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Defines.h"
 
 
 

source/Entities/Minecart.cpp

@@ -5,8 +5,8 @@
 
 #include "Globals.h"
 #include "Minecart.h"
-#include "World.h"
+#include "../World.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 #include "Player.h"
 
 

source/Entities/Minecart.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 

source/Entities/Pawn.cpp

@@ -2,14 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Pawn.h"
-#include "Root.h"
-#include "Server.h"
-#include "World.h"
-#include "Player.h"
-#include "PluginManager.h"
-#include "Vector3d.h"
-#include "BlockID.h"
-#include "Defines.h"
 
 
 

source/Entities/Pawn.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
 
 
 

source/Entities/Pickup.cpp

@@ -6,20 +6,19 @@
 #endif
 
 #include "Pickup.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
-#include "Inventory.h"
+#include "../Inventory.h"
-#include "World.h"
+#include "../World.h"
-#include "Simulator/FluidSimulator.h"
+#include "../Simulator/FluidSimulator.h"
-#include "Server.h"
+#include "../Server.h"
 #include "Player.h"
-#include "PluginManager.h"
+#include "../PluginManager.h"
-#include "Item.h"
+#include "../Item.h"
-#include "Root.h"
+#include "../Root.h"
-#include "Tracer.h"
+#include "../Chunk.h"
-#include "Chunk.h"
 
-#include "Vector3d.h"
+#include "../Vector3d.h"
-#include "Vector3f.h"
+#include "../Vector3f.h"
 
 
 

source/Entities/Pickup.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 

source/Entities/Player.cpp

@@ -2,30 +2,30 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Player.h"
-#include "Server.h"
+#include "../Server.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
-#include "UI/Window.h"
+#include "../UI/Window.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
-#include "World.h"
+#include "../World.h"
 #include "Pickup.h"
-#include "PluginManager.h"
+#include "../PluginManager.h"
-#include "BlockEntities/BlockEntity.h"
+#include "../BlockEntities/BlockEntity.h"
-#include "GroupManager.h"
+#include "../GroupManager.h"
-#include "Group.h"
+#include "../Group.h"
-#include "ChatColor.h"
+#include "../ChatColor.h"
-#include "Item.h"
+#include "../Item.h"
-#include "Tracer.h"
+#include "../Tracer.h"
-#include "Root.h"
+#include "../Root.h"
-#include "OSSupport/MakeDir.h"
+#include "../OSSupport/MakeDir.h"
-#include "OSSupport/Timer.h"
+#include "../OSSupport/Timer.h"
-#include "MersenneTwister.h"
+#include "../MersenneTwister.h"
-#include "Chunk.h"
+#include "../Chunk.h"
-#include "Items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
 
-#include "Vector3d.h"
+#include "../Vector3d.h"
-#include "Vector3f.h"
+#include "../Vector3f.h"
 
-#include "../iniFile/iniFile.h"
+#include "../../iniFile/iniFile.h"
 #include <json/json.h>
 
 #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))

source/Entities/Player.h

@@ -2,8 +2,8 @@
 #pragma once
 
 #include "Pawn.h"
-#include "Inventory.h"
+#include "../Inventory.h"
-#include "Defines.h"
+#include "../Defines.h"
 
 
 

source/Entities/TNTEntity.cpp

@@ -1,8 +1,8 @@
 #include "Globals.h"
 
 #include "TNTEntity.h"
-#include "World.h"
+#include "../World.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 
 
 

source/Entities/TNTEntity.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "Entity.h"
-#include "Defines.h"
 
 
 

source/Inventory.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Inventory.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "ClientHandle.h"
 #include "UI/Window.h"
 #include "Item.h"

source/Items/ItemDye.h

@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Items/ItemHandler.cpp

@@ -3,7 +3,7 @@
 #include "ItemHandler.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../FastRandom.h"
 
 // Handlers:

source/Items/ItemHoe.h

@@ -3,9 +3,14 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemHoeHandler : public cItemHandler
+
+
+
+
+class cItemHoeHandler :
+	public cItemHandler
 {
 public:
 	cItemHoeHandler(int a_ItemType)
@@ -29,3 +34,7 @@ public:
 		return false;
 	}
 } ;
+
+
+
+

source/Items/ItemLighter.h

@@ -3,8 +3,8 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
-#include "../TNTEntity.h"
+#include "../Entities/TNTEntity.h"
 
 
 

source/Items/ItemMinecart.h

@@ -9,8 +9,7 @@
 
 #pragma once
 
-// Not needed, we're being included only from ItemHandler.cpp which already has this file: #include "ItemHandler.h"
+#include "../Entities/Minecart.h"
-#include "../Minecart.h"
 
 
 

source/Items/ItemPickaxe.h

@@ -3,9 +3,10 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemPickaxeHandler : public cItemHandler
+class cItemPickaxeHandler :
+	public cItemHandler
 {
 public:
 	cItemPickaxeHandler(int a_ItemType)
@@ -37,7 +38,10 @@ public:
 		switch(a_BlockType)
 		{
 			case E_BLOCK_OBSIDIAN:
+			{
 				return PickaxeLevel() >= 4;
+			}
+			
 			case E_BLOCK_DIAMOND_BLOCK:
 			case E_BLOCK_DIAMOND_ORE:
 			case E_BLOCK_GOLD_BLOCK:
@@ -45,12 +49,18 @@ public:
 			case E_BLOCK_REDSTONE_ORE:
 			case E_BLOCK_REDSTONE_ORE_GLOWING:
 			case E_BLOCK_EMERALD_ORE:
+			{
 				return PickaxeLevel() >= 3;
+			}
+			
 			case E_BLOCK_IRON_BLOCK:
 			case E_BLOCK_IRON_ORE:
 			case E_BLOCK_LAPIS_ORE:
 			case E_BLOCK_LAPIS_BLOCK:
+			{
 				return PickaxeLevel() >= 2;
+			}
+			
 			case E_BLOCK_COAL_ORE:
 			case E_BLOCK_STONE:
 			case E_BLOCK_COBBLESTONE:
@@ -69,8 +79,14 @@ public:
 			case E_BLOCK_STONE_BRICK_STAIRS:
 			case E_BLOCK_NETHER_BRICK_STAIRS:
 			case E_BLOCK_CAULDRON:
+			{
 				return PickaxeLevel() >= 1;
 			}
+		}
 		return false;
 	}
 } ;
+
+
+
+

source/Items/ItemShears.h

@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Items/ItemShovel.h

@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 #include "../Blocks/BlockHandler.h"
 

source/Items/ItemSpawnEgg.h

@@ -3,7 +3,7 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Items/ItemSword.h

@@ -3,9 +3,14 @@
 
 #include "ItemHandler.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
-class cItemSwordHandler : public cItemHandler
+
+
+
+
+class cItemSwordHandler :
+	public cItemHandler
 {
 public:
 	cItemSwordHandler(int a_ItemType)
@@ -19,3 +24,7 @@ public:
 		return (a_BlockType == E_BLOCK_COBWEB);
 	}
 } ;
+
+
+
+

source/LuaWindow.cpp

@@ -7,7 +7,7 @@
 #include "LuaWindow.h"
 #include "UI/SlotArea.h"
 #include "PluginLua.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "lauxlib.h"  // Needed for LUA_REFNIL
 
 

source/ManualBindings.cpp

@@ -9,7 +9,7 @@
 #include "Plugin.h"
 #include "PluginLua.h"
 #include "PluginManager.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "WebAdmin.h"
 #include "StringMap.h"
 #include "ClientHandle.h"

source/Mobs/AggressiveMonster.cpp

@@ -5,7 +5,7 @@
 
 #include "../World.h"
 #include "../Vector3f.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../MersenneTwister.h"
 
 

source/Mobs/Monster.cpp

@@ -6,7 +6,7 @@
 #include "../Server.h"
 #include "../ClientHandle.h"
 #include "../World.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Defines.h"
 #include "../MonsterConfig.h"
 #include "../MersenneTwister.h"

source/Mobs/Monster.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "../Pawn.h"
+#include "../Entities/Pawn.h"
 #include "../Defines.h"
 #include "../BlockID.h"
 #include "../Item.h"

source/Mobs/PassiveAggressiveMonster.cpp

@@ -3,7 +3,7 @@
 
 #include "PassiveAggressiveMonster.h"
 
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/Piston.cpp

@@ -2,12 +2,11 @@
 
 #include "Piston.h"
 #include "ChunkDef.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
 #include "Item.h"
 #include "Root.h"
 #include "ClientHandle.h"
 #include "World.h"
-#include "BlockID.h"
 #include "Server.h"
 #include "Blocks/BlockHandler.h"
 

source/Plugin.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Plugin.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "World.h"
 #include "CommandOutput.h"
 #include "Mobs/Monster.h"

source/PluginManager.cpp

@@ -12,7 +12,7 @@
 
 #include "../iniFile/iniFile.h"
 #include "tolua++.h"
-#include "Player.h"
+#include "Entities/Player.h"
 
 
 

source/Protocol/Protocol125.cpp

@@ -16,15 +16,15 @@ Documentation:
 #include "../ClientHandle.h"
 #include "../World.h"
 #include "ChunkDataSerializer.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../ChatColor.h"
 #include "../UI/Window.h"
 #include "../Root.h"
 #include "../Server.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
 
 
 

source/Protocol/Protocol132.cpp

@@ -12,10 +12,10 @@
 #include "../../CryptoPP/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
 #include "../UI/Window.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 #include "../WorldStorage/FastNBT.h"
 #include "../StringCompression.h"
 

source/Protocol/Protocol14x.cpp

@@ -19,11 +19,11 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../../CryptoPP/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
 #include "../UI/Window.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
 
 
 

source/Protocol/Protocol16x.cpp

@@ -13,8 +13,8 @@ Implements the 1.6.x protocol classes:
 #include "Globals.h"
 #include "Protocol16x.h"
 #include "../ClientHandle.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 
 
 

source/ReferenceManager.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ReferenceManager.h"
-#include "Entity.h"
+#include "Entities/Entity.h"
 
 
 

source/Root.cpp

@@ -10,7 +10,7 @@
 #include "CraftingRecipes.h"
 #include "PluginManager.h"
 #include "MonsterConfig.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Blocks/BlockHandler.h"
 #include "Items/ItemHandler.h"
 #include "Chunk.h"

source/Server.cpp

@@ -13,11 +13,10 @@
 #include "PluginManager.h"
 #include "GroupManager.h"
 #include "ChatColor.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Inventory.h"
 #include "Item.h"
 #include "FurnaceRecipe.h"
-#include "Tracer.h"
 #include "WebAdmin.h"
 #include "Protocol/ProtocolRecognizer.h"
 #include "CommandOutput.h"

source/Simulator/RedstoneSimulator.cpp

@@ -8,7 +8,7 @@
 #include "../World.h"
 #include "../BlockID.h"
 #include "../Chunk.h"
-#include "../TNTEntity.h"
+#include "../Entities/TNTEntity.h"
 
 
 

source/Simulator/SandSimulator.cpp

@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../BlockID.h"
 #include "../Defines.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
 #include "../Chunk.h"
 
 

source/Tracer.cpp

@@ -8,10 +8,7 @@
 #include "Vector3i.h"
 #include "Vector3d.h"
 
-#include "BlockID.h"
+#include "Entities/Entity.h"
-#include "Entity.h"
-
-#include "Defines.h"
 
 #ifndef _WIN32
 	#include <stdlib.h> // abs()

source/UI/SlotArea.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "SlotArea.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DropSpenserEntity.h"
 #include "../BlockEntities/FurnaceEntity.h"

source/UI/Window.cpp

@@ -5,8 +5,8 @@
 #include "SlotArea.h"
 #include "../Item.h"
 #include "../ClientHandle.h"
-#include "../Player.h"
+#include "../Entities/Player.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 #include "../Inventory.h"
 #include "../Items/ItemHandler.h"
 #include "../BlockEntities/ChestEntity.h"

source/UI/WindowOwner.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "../BlockEntities/BlockEntity.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "Window.h"
 
 /*

source/WebAdmin.cpp

@@ -10,7 +10,7 @@
 #include "Plugin.h"
 
 #include "World.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Server.h"
 #include "Root.h"
 

source/World.cpp

@@ -5,8 +5,8 @@
 #include "World.h"
 #include "ChunkDef.h"
 #include "ClientHandle.h"
-#include "Pickup.h"
+#include "Entities/Pickup.h"
-#include "Player.h"
+#include "Entities/Player.h"
 #include "Server.h"
 #include "Item.h"
 #include "Root.h"
@@ -50,13 +50,13 @@
 
 #include "OSSupport/MakeDir.h"
 #include "MersenneTwister.h"
-#include "Tracer.h"
 #include "Generating/Trees.h"
 #include "PluginManager.h"
 #include "Blocks/BlockHandler.h"
 #include "Vector3d.h"
-#include "TNTEntity.h"
+#include "Entities/TNTEntity.h"
 
+#include "Tracer.h"
 #include "tolua++.h"
 
 // DEBUG: Test out the cLineBlockTracer class by tracing a few lines:

source/WorldStorage/NBTChunkSerializer.cpp

@@ -15,13 +15,13 @@
 #include "../BlockEntities/SignEntity.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
-#include "../Minecart.h"
+#include "../Entities/Minecart.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 
 
 

source/WorldStorage/WSSAnvil.cpp

@@ -20,13 +20,13 @@
 #include "../Item.h"
 #include "../ItemGrid.h"
 #include "../StringCompression.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../OSSupport/MakeDir.h"
 #include "FastNBT.h"
-#include "../FallingBlock.h"
+#include "../Entities/FallingBlock.h"
-#include "../Minecart.h"
+#include "../Entities/Minecart.h"
 #include "../Mobs/Monster.h"
-#include "../Pickup.h"
+#include "../Entities/Pickup.h"
 
 
 

source/WorldStorage/WorldStorage.cpp

@@ -11,7 +11,7 @@
 #include "WSSAnvil.h"
 #include "../World.h"
 #include "../Generating/ChunkGenerator.h"
-#include "../Entity.h"
+#include "../Entities/Entity.h"
 #include "../BlockEntities/BlockEntity.h"