Removed more unessicary includes

lib/SQLiteCpp

@@ -1 +1 @@
-Subproject commit 203c2fb68bbf871eaf4ca98756a113d74d620dea
+Subproject commit 55edadd56d0d6f506954ad00c3b9a5d425814a2f

src/Bindings/WebPlugin.cpp

@@ -3,7 +3,6 @@
 
 #include "WebPlugin.h"
 #include "../WebAdmin.h"
-#include "../Server.h"
 #include "../Root.h"
 
 

src/Bindings/WebPlugin.h

@@ -1,7 +1,6 @@
 
 #pragma once
 
-struct lua_State;
 struct HTTPRequest;
 
 

src/BlockEntities/BlockEntity.h

@@ -1,8 +1,6 @@
 
 #pragma once
 
-#include "../ClientHandle.h"
-#include "../World.h"
 
 
 
@@ -13,8 +11,9 @@ namespace Json
 	class Value;
 };
 
+class cChunk;
 class cPlayer;
-class cPacket;
+class cWorld;
 
 
 

src/BlockEntities/BlockEntityWithItems.h

@@ -12,6 +12,7 @@
 #include "BlockEntity.h"
 #include "../ItemGrid.h"
 #include "../UI/WindowOwner.h"
+#include "World.h"
 
 
 

src/BlockEntities/ChestEntity.cpp

@@ -5,7 +5,6 @@
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include "json/json.h"
 
 
 

src/BlockEntities/ChestEntity.h

@@ -13,8 +13,6 @@ namespace Json
 };
 
 class cClientHandle;
-class cServer;
-class cNBTData;
 
 
 

src/BlockEntities/CommandBlockEntity.cpp

@@ -4,16 +4,14 @@
 // Implements the cCommandBlockEntity class representing a single command block in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "json/json.h"
 #include "CommandBlockEntity.h"
-#include "../Entities/Player.h"
-#include "../WorldStorage/FastNBT.h"
 
 #include "../CommandOutput.h"
 #include "../Root.h"
 #include "../Server.h"  // ExecuteConsoleCommand()
-#include "../Chunk.h"
 #include "../ChatColor.h"
+#include "../World.h"
+#include "../ClientHandle.h"
 
 
 

src/BlockEntities/DispenserEntity.cpp

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

src/BlockEntities/DropSpenserEntity.cpp

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

src/BlockEntities/DropSpenserEntity.h

@@ -22,7 +22,6 @@ namespace Json
 }
 
 class cClientHandle;
-class cServer;
 
 
 

src/BlockEntities/DropperEntity.cpp

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

src/BlockEntities/EnderChestEntity.cpp

@@ -5,7 +5,6 @@
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include "json/json.h"
 
 
 

src/BlockEntities/EnderChestEntity.h

@@ -3,7 +3,6 @@
 
 #include "BlockEntity.h"
 #include "UI/WindowOwner.h"
-#include "json/json.h"
 
 
 

src/BlockEntities/FlowerPotEntity.cpp

@@ -4,7 +4,6 @@
 // Implements the cFlowerPotEntity class representing a single flower pot in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "json/json.h"
 #include "FlowerPotEntity.h"
 #include "../Entities/Player.h"
 #include "../Item.h"

src/BlockEntities/FlowerPotEntity.h

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "BlockEntity.h"
+#include "Item.h"
 
-class cItem;
 
 
 

src/BlockEntities/FurnaceEntity.cpp

@@ -5,8 +5,6 @@
 #include "../UI/Window.h"
 #include "../Entities/Player.h"
 #include "../Root.h"
-#include "../Chunk.h"
-#include "json/json.h"
 
 
 

src/BlockEntities/FurnaceEntity.h

@@ -14,7 +14,6 @@ namespace Json
 }
 
 class cClientHandle;
-class cServer;
 
 
 

src/BlockEntities/HopperEntity.cpp

@@ -10,10 +10,7 @@
 #include "../Entities/Pickup.h"
 #include "../Bindings/PluginManager.h"
 #include "ChestEntity.h"
-#include "DropSpenserEntity.h"
 #include "FurnaceEntity.h"
-#include "../BoundingBox.h"
-#include "json/json.h"
 
 
 

src/BlockEntities/JukeboxEntity.cpp

@@ -3,8 +3,8 @@
 
 #include "JukeboxEntity.h"
 #include "../World.h"
-#include "json/json.h"
-
+#include "json/value.h"
+#include "Entities/Player.h"
 
 
 

src/BlockEntities/JukeboxEntity.h

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

src/BlockEntities/MobHeadEntity.cpp

@@ -4,7 +4,6 @@
 // Implements the cMobHeadEntity class representing a single skull/head in the world
 
 #include "Globals.h"
-#include "json/json.h"
 #include "MobHeadEntity.h"
 #include "../Entities/Player.h"
 

src/BlockEntities/MobHeadEntity.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-
+#include "Defines.h"
 
 
 

src/BlockEntities/NoteEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "NoteEntity.h"
 #include "../World.h"
-#include "json/json.h"
+#include "json/value.h"
 
 
 

src/BlockEntities/SignEntity.cpp

@@ -4,9 +4,9 @@
 // Implements the cSignEntity class representing a single sign in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "json/json.h"
+#include "json/value.h"
 #include "SignEntity.h"
-#include "../Entities/Player.h"
+#include "../ClientHandle.h"
 
 
 

src/Blocks/BlockBed.cpp

@@ -4,6 +4,15 @@
 
 
 
+#include "BroadcastInterface.h"
+#include "ChunkInterface.h"
+#include "Entities/../World.h"
+#include "Entities/Player.h"
+#include "WorldInterface.h"
+
+
+
+
 
 void cBlockBedHandler::OnPlacedByPlayer(
 	cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player,

src/Blocks/BlockBed.h

@@ -2,12 +2,14 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "ChunkInterface.h"
-#include "WorldInterface.h"
 #include "MetaRotator.h"
-#include "../Entities/Player.h"
+#include "Item.h"
 
 
+class cChunkInterface;
+class cPlayer;
+class cWorldInterface;
+
 
 
 

src/Blocks/BlockBigFlower.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-
+#include "ChunkInterface.h"
 
 
 

src/Blocks/BlockDirt.h

@@ -3,8 +3,8 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-
-
+#include "Root.h"
+#include "Bindings/PluginManager.h"
 
 
 

src/Blocks/BlockDoor.cpp

@@ -1,7 +1,6 @@
 
 #include "Globals.h"
 #include "BlockDoor.h"
-#include "../Item.h"
 #include "../Entities/Player.h"
 
 

src/Blocks/BlockDoor.h

@@ -5,6 +5,7 @@
 #include "../Entities/Player.h"
 #include "Chunk.h"
 #include "MetaRotator.h"
+#include "ChunkInterface.h"
 
 
 

src/Blocks/BlockHandler.cpp

@@ -3,8 +3,6 @@
 #include "BlockHandler.h"
 #include "../Item.h"
 #include "../World.h"
-#include "../Root.h"
-#include "../Bindings/PluginManager.h"
 #include "../Chunk.h"
 #include "BlockAnvil.h"
 #include "BlockBed.h"
@@ -84,6 +82,8 @@
 #include "BlockWorkbench.h"
 
 
+#include "BlockPluginInterface.h"
+
 
 
 

src/Blocks/BlockHandler.h

@@ -2,10 +2,6 @@
 #pragma once
 
 #include "../Defines.h"
-#include "../Item.h"
-#include "WorldInterface.h"
-#include "ChunkInterface.h"
-#include "BlockPluginInterface.h"
 
 
 
@@ -14,6 +10,10 @@
 // fwd:
 class cPlayer;
 class cChunk;
+class cBlockPluginInterface;
+class cChunkInterface;
+class cWorldInterface;
+class cItems;
 
 
 

src/Blocks/BlockPiston.cpp

@@ -5,6 +5,7 @@
 #include "../World.h"
 #include "../Entities/Player.h"
 #include "BlockInServerPluginInterface.h"
+#include "ChunkInterface.h"
 
 
 

src/Blocks/BlockRedstoneRepeater.h

@@ -4,7 +4,7 @@
 #include "BlockHandler.h"
 #include "Chunk.h"
 #include "MetaRotator.h"
-
+#include "ChunkInterface.h"
 
 
 

src/Blocks/BlockSlab.h

@@ -12,6 +12,7 @@
 #include "BlockHandler.h"
 #include "../Items/ItemHandler.h"
 #include "Root.h"
+#include "ChunkInterface.h"
 
 
 

src/Blocks/BlockVine.h

@@ -2,7 +2,7 @@
 
 #include "BlockHandler.h"
 #include "MetaRotator.h"
-
+#include "Bindings/PluginManager.h"
 
 
 

src/Blocks/ChunkInterface.cpp

@@ -4,6 +4,7 @@
 #include "ChunkInterface.h"
 #include "ChunkMap.h"
 #include "BlockHandler.h"
+#include "WorldInterface.h" 
 
 
 

src/Blocks/ChunkInterface.h

@@ -2,11 +2,12 @@
 #pragma once
 
 #include "../ForEachChunkProvider.h"
-#include "WorldInterface.h"
 
 
 
 class cChunkMap;
+class cWorldInterface;
+class cPlayer;
 
 class cChunkInterface:
 	public cForEachChunkProvider

src/Chunk.cpp

@@ -38,6 +38,7 @@
 #include "BlockInServerPluginInterface.h"
 #include "SetChunkData.h"
 #include "BoundingBox.h"
+#include "Blocks/ChunkInterface.h"
 
 #include "json/json.h"
 

src/Chunk.h

@@ -11,7 +11,7 @@
 
 #include "Blocks/GetHandlerCompileTimeTemplate.h"
 
-
+#include "ChunkMap.h"
 
 
 
@@ -31,7 +31,10 @@ class MTRand;
 class cPlayer;
 class cChunkMap;
 class cBeaconEntity;
+class cBoundingBox;
 class cChestEntity;
+class cCHunkDataCallback;
+class cCommandBlockEntity;
 class cDispenserEntity;
 class cFurnaceEntity;
 class cNoteEntity;
@@ -46,6 +49,7 @@ class cFluidSimulatorData;
 class cMobCensus;
 class cMobSpawner;
 class cRedstonePoweredEntity;
+class cSetChunkData;
 
 typedef std::list<cClientHandle *>         cClientHandleList;
 typedef cItemCallback<cEntity>             cEntityCallback;

src/ChunkMap.cpp

@@ -17,7 +17,7 @@
 #include "MobSpawner.h"
 #include "BoundingBox.h"
 #include "SetChunkData.h"
-
+#include "Blocks/ChunkInterface.h"
 #include "Entities/Pickup.h"
 
 #ifndef _WIN32

src/ChunkSender.cpp

@@ -12,6 +12,7 @@
 #include "World.h"
 #include "BlockEntities/BlockEntity.h"
 #include "Protocol/ChunkDataSerializer.h"
+#include "ClientHandle.h"
 
 
 

src/Entities/ArrowEntity.cpp

@@ -3,7 +3,6 @@
 #include "Player.h"
 #include "ArrowEntity.h"
 #include "../Chunk.h"
-#include "FastRandom.h"
 
 
 

src/Entities/EnderCrystal.cpp

@@ -3,8 +3,8 @@
 
 #include "EnderCrystal.h"
 #include "ClientHandle.h"
-#include "Player.h"
 #include "../Chunk.h"
+#include "../World.h"
 
 
 

src/Entities/Entity.cpp

@@ -3,7 +3,6 @@
 
 #include "Entity.h"
 #include "../World.h"
-#include "../Server.h"
 #include "../Root.h"
 #include "../Matrix4.h"
 #include "../ClientHandle.h"

src/Items/ItemBucket.h

@@ -7,6 +7,7 @@
 #include "../Blocks/BlockHandler.h"
 #include "../LineBlockTracer.h"
 #include "../BlockInServerPluginInterface.h"
+#include "../Blocks/ChunkInterface.h"
 
 
 

src/Mobs/Villager.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "PassiveMonster.h"
-
+#include "Blocks/ChunkInterface.h"
 
 
 

src/Simulator/FloodyFluidSimulator.cpp

@@ -12,6 +12,7 @@
 #include "../BlockArea.h"
 #include "../Blocks/BlockHandler.h"
 #include "../BlockInServerPluginInterface.h"
+#include "../Blocks/ChunkInterface.h"