cuberite · peterbell10 · Aug 29, 2018 · Jul 28, 2018 · Aug 29, 2018
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
@@ -1,7 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
-include_directories (".")
 
 SET (SRCS
 	Bindings.cpp

diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
@@ -7,9 +7,9 @@
 #include "../Entities/Player.h"
 #include "../UI/SlotArea.h"
 #include "PluginLua.h"
-#include "Root.h"
 #include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
-#include "ClientHandle.h"
+#include "../Root.h"
+#include "../ClientHandle.h"
 
 
 

diff --git a/src/Bindings/ManualBindings_RankManager.cpp b/src/Bindings/ManualBindings_RankManager.cpp
@@ -5,10 +5,10 @@
 
 #include "Globals.h"
 #include "ManualBindings.h"
-#include "../Root.h"
 #include "tolua++/include/tolua++.h"
 #include "LuaState.h"
-#include "UUID.h"
+#include "../Root.h"
+#include "../UUID.h"
 
 
 

diff --git a/src/Bindings/Plugin.h b/src/Bindings/Plugin.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "Defines.h"
+#include "../Defines.h"
 #include "PluginManager.h"
 
 

diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h
@@ -2,8 +2,8 @@
 #pragma once
 
 
-#include "Defines.h"
-#include "FunctionRef.h"
+#include "../Defines.h"
+#include "../FunctionRef.h"
 
 
 

diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
@@ -12,7 +12,7 @@
 #include "BlockEntity.h"
 #include "../ItemGrid.h"
 #include "../UI/WindowOwner.h"
-#include "World.h"
+#include "../World.h"
 
 
 

diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BeaconEntity.cpp

diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
 
 
 

diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 

diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../EffectID.h"
 #include "json/value.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 
 
 

diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Defines.h"
-#include "UUID.h"
+#include "../Defines.h"
+#include "../UUID.h"
 
 
 

diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
@@ -5,7 +5,7 @@
 #include "BlockBed.h"
 
 #include "BroadcastInterface.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 #include "../World.h"
 #include "../BoundingBox.h"
 #include "../Mobs/Monster.h"

diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 
 

diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
@@ -3,8 +3,8 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-#include "Root.h"
-#include "Bindings/PluginManager.h"
+#include "../Root.h"
+#include "../Bindings/PluginManager.h"
 
 
 

diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h
@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../Entities/Player.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"

diff --git a/src/Blocks/BlockFence.h b/src/Blocks/BlockFence.h
@@ -4,8 +4,8 @@
 #include "BlockHandler.h"
 #include "../BoundingBox.h"
 #include "../EffectID.h"
-#include "Entities/LeashKnot.h"
-#include "BoundingBox.h"
+#include "../Entities/LeashKnot.h"
+#include "../BoundingBox.h"
 #include "../Mobs/PassiveMonster.h"
 
 

diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
@@ -4,7 +4,7 @@
 #include "../Item.h"
 #include "../World.h"
 #include "../Entities/Player.h"
-#include "BlockInServerPluginInterface.h"
+#include "../BlockInServerPluginInterface.h"
 #include "ChunkInterface.h"
 
 

diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
@@ -2,10 +2,10 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"
+#include "../Chunk.h"
 
 
 

diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 

diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 

diff --git a/src/Blocks/BroadcastInterface.h b/src/Blocks/BroadcastInterface.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include "Defines.h"
-#include "Scoreboard.h"
+#include "../Defines.h"
+#include "../Scoreboard.h"
 
 // fwd:
 class cClientHandle;

diff --git a/src/Blocks/ChunkInterface.cpp b/src/Blocks/ChunkInterface.cpp
@@ -2,9 +2,9 @@
 #include "Globals.h"
 
 #include "ChunkInterface.h"
-#include "ChunkMap.h"
 #include "BlockHandler.h"
 #include "WorldInterface.h"
+#include "../ChunkMap.h"
 
 
 

diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h
@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "FunctionRef.h"
+#include "../FunctionRef.h"
 #include "../Mobs/MonsterTypes.h"
 
 class cBedEntity;
@@ -13,6 +13,7 @@ class cPlayer;
 using cBedCallback         = cFunctionRef<bool(cBedEntity   &)>;
 using cBlockEntityCallback = cFunctionRef<bool(cBlockEntity &)>;
 using cPlayerListCallback  = cFunctionRef<bool(cPlayer      &)>;
+using cEntityCallback      = cFunctionRef<bool(cEntity      &)>;
 
 
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -159,7 +159,10 @@ SET (HDRS
 	XMLParser.h
 )
 
-include_directories(".")
+file(WRITE "${CMAKE_BINARY_DIR}/include/Globals.h"
+	"/* This file allows Globals.h to be included with an absolute path */\n#include \"${PROJECT_SOURCE_DIR}/Globals.h\"\n")
+
+include_directories("${CMAKE_BINARY_DIR}/include")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
 include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/TCLAP/include")
@@ -245,8 +248,6 @@ else ()
 	includefolder("Resources")
 	source_group("" FILES ${SOURCE})
 
-	include_directories("${PROJECT_SOURCE_DIR}")
-
 	# Precompiled headers (1st part)
 	SET_SOURCE_FILES_PROPERTIES(
 		Globals.cpp PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""

diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	ArrowEntity.cpp

diff --git a/src/Entities/EnderCrystal.cpp b/src/Entities/EnderCrystal.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "EnderCrystal.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 #include "../Chunk.h"
 #include "../World.h"
 

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Entity.h"
+#include "Player.h"
 #include "../World.h"
 #include "../Root.h"
 #include "../Matrix4.h"
@@ -10,8 +11,7 @@
 #include "../Simulator/FluidSimulator.h"
 #include "../Bindings/PluginManager.h"
 #include "../LineBlockTracer.h"
-#include "Player.h"
-#include "Items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
 #include "../FastRandom.h"
 #include "../NetherPortalScanner.h"
 #include "../BoundingBox.h"

diff --git a/src/Entities/HangingEntity.cpp b/src/Entities/HangingEntity.cpp
@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "HangingEntity.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 
 
 

diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp
@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ItemFrame.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 
 
 

diff --git a/src/Entities/LeashKnot.cpp b/src/Entities/LeashKnot.cpp
@@ -2,10 +2,10 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "LeashKnot.h"
-#include "ClientHandle.h"
 #include "Player.h"
-#include "Mobs/Monster.h"
-#include "BoundingBox.h"
+#include "../Mobs/Monster.h"
+#include "../BoundingBox.h"
+#include "../ClientHandle.h"
 
 // Ticks to wait in Tick function to optimize calculations
 #define TICK_STEP 10

diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "World.h"
+#include "../World.h"
 #include "../UI/WindowOwner.h"
 
 

diff --git a/src/Entities/Painting.cpp b/src/Entities/Painting.cpp
@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Painting.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 #include "../Chunk.h"
 
 

diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
@@ -5,9 +5,9 @@
 #include "Player.h"
 #include "../World.h"
 #include "../Bindings/PluginManager.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
 #include "../Blocks/BlockHandler.h"
-#include "EffectID.h"
+#include "../EffectID.h"
 #include "../Mobs/Monster.h"
 
 

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
@@ -4,8 +4,8 @@
 #include <unordered_map>
 
 #include "Player.h"
-#include "Mobs/Wolf.h"
-#include "Mobs/Horse.h"
+#include "../Mobs/Wolf.h"
+#include "../Mobs/Horse.h"
 #include "../BoundingBox.h"
 #include "../ChatColor.h"
 #include "../Server.h"

diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt
@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BioGen.cpp

diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
@@ -2,11 +2,11 @@
 #include "Globals.h"
 
 #include "ChunkGenerator.h"
-#include "../IniFile.h"
 #include "ChunkDesc.h"
 #include "ComposableGenerator.h"
 #include "Noise3DGenerator.h"
-#include "FastRandom.h"
+#include "../IniFile.h"
+#include "../FastRandom.h"
 
 
 

diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp
@@ -7,7 +7,7 @@
 #include "PieceStructuresGen.h"
 #include "PrefabStructure.h"
 #include "PieceGeneratorBFSTree.h"
-#include "IniFile.h"
+#include "../IniFile.h"
 #include "../Stopwatch.h"