diff options
Diffstat (limited to '')
84 files changed, 28 insertions, 148 deletions
diff --git a/Tools/GrownBiomeGenVisualiser/Globals.h b/Tools/GrownBiomeGenVisualiser/Globals.h index 3fcd2f60c..790111572 100644 --- a/Tools/GrownBiomeGenVisualiser/Globals.h +++ b/Tools/GrownBiomeGenVisualiser/Globals.h @@ -210,7 +210,10 @@ typedef unsigned char Byte; #include <map> #include <algorithm> #include <memory> - +#include <atomic> +#include <mutex> +#include <thread> +#include <condition_variable> @@ -258,5 +261,6 @@ public: } ; +#include "BiomeDef.h" diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h index ed9ef82fe..162d430bf 100644 --- a/Tools/MCADefrag/Globals.h +++ b/Tools/MCADefrag/Globals.h @@ -187,7 +187,10 @@ typedef unsigned char Byte; #include <map> #include <algorithm> #include <memory> - +#include <atomic> +#include <mutex> +#include <thread> +#include <condition_variable> @@ -239,5 +242,8 @@ public: } ; +#include "BiomeDef.h" + + diff --git a/Tools/NoiseSpeedTest/Globals.h b/Tools/NoiseSpeedTest/Globals.h index ed9ef82fe..e62d2b432 100644 --- a/Tools/NoiseSpeedTest/Globals.h +++ b/Tools/NoiseSpeedTest/Globals.h @@ -187,6 +187,10 @@ typedef unsigned char Byte; #include <map> #include <algorithm> #include <memory> +#include <atomic> +#include <mutex> +#include <thread> +#include <condition_variable> diff --git a/Tools/ProtoProxy/Globals.h b/Tools/ProtoProxy/Globals.h index b15c36cd3..3ab01a61f 100644 --- a/Tools/ProtoProxy/Globals.h +++ b/Tools/ProtoProxy/Globals.h @@ -168,6 +168,7 @@ typedef unsigned char Byte; // STL stuff: +#include <chrono> #include <vector> #include <list> #include <deque> @@ -175,6 +176,10 @@ typedef unsigned char Byte; #include <map> #include <algorithm> #include <memory> +#include <atomic> +#include <mutex> +#include <thread> +#include <condition_variable> diff --git a/src/AllocationPool.h b/src/AllocationPool.h index d1769dc03..52a1b933b 100644 --- a/src/AllocationPool.h +++ b/src/AllocationPool.h @@ -1,8 +1,6 @@ #pragma once -#include <memory> - diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp index 029d4edb7..bb59fca7c 100644 --- a/src/Bindings/DeprecatedBindings.cpp +++ b/src/Bindings/DeprecatedBindings.cpp @@ -6,7 +6,6 @@ #include "tolua++/include/tolua++.h" -#include "../BlockInfo.h" #include "../World.h" #include "../Entities/Player.h" #include "LuaState.h" diff --git a/src/Bindings/LuaFunctions.h b/src/Bindings/LuaFunctions.h index 400b08ab1..be2669012 100644 --- a/src/Bindings/LuaFunctions.h +++ b/src/Bindings/LuaFunctions.h @@ -2,7 +2,6 @@ #include "Logger.h" #include <time.h> -#include <chrono> // tolua_begin inline unsigned int GetTime() diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h index d91ab8c83..d91a72a74 100644 --- a/src/Bindings/LuaState.h +++ b/src/Bindings/LuaState.h @@ -35,8 +35,6 @@ extern "C" #include "lua/src/lauxlib.h" } -#include <atomic> -#include "../Vector3.h" #include "../Defines.h" #include "PluginManager.h" #include "LuaState_Typedefs.inc" diff --git a/src/Bindings/LuaWindow.h b/src/Bindings/LuaWindow.h index f9db525fa..fb21c1c4e 100644 --- a/src/Bindings/LuaWindow.h +++ b/src/Bindings/LuaWindow.h @@ -9,7 +9,6 @@ #pragma once -#include <atomic> #include "LuaState.h" #include "../UI/Window.h" #include "../ItemGrid.h" diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp index e81a8ef05..e4410dd14 100644 --- a/src/Bindings/ManualBindings.cpp +++ b/src/Bindings/ManualBindings.cpp @@ -5,7 +5,6 @@ #undef TOLUA_TEMPLATE_BIND #include <sstream> #include <iomanip> -#include <array> #include "tolua++/include/tolua++.h" #include "polarssl/md5.h" #include "polarssl/sha1.h" diff --git a/src/BiomeDef.cpp b/src/BiomeDef.cpp index f5c96ad4e..fac28f13f 100644 --- a/src/BiomeDef.cpp +++ b/src/BiomeDef.cpp @@ -4,7 +4,6 @@ // Implements biome helper functions #include "Globals.h" -#include "BiomeDef.h" diff --git a/src/BiomeDef.h b/src/BiomeDef.h index 1c561bb8c..9c7afd478 100644 --- a/src/BiomeDef.h +++ b/src/BiomeDef.h @@ -10,7 +10,7 @@ #pragma once -#include "StringUtils.h" + // tolua_begin diff --git a/src/BlockArea.h b/src/BlockArea.h index 42c1fa820..2e35b9436 100644 --- a/src/BlockArea.h +++ b/src/BlockArea.h @@ -15,7 +15,6 @@ #pragma once #include "ForEachChunkProvider.h" -#include "Vector3.h" #include "ChunkDataCallback.h" #include "Cuboid.h" diff --git a/src/BlockID.cpp b/src/BlockID.cpp index a558db2f7..a6f846911 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -3,7 +3,6 @@ // Implements the helper functions for converting Block ID string to int etc. #include "Globals.h" -#include "BlockID.h" #include "IniFile.h" #include "Item.h" #include "Mobs/Monster.h" diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp index 1ecbdad73..a6178ec55 100644 --- a/src/BlockInfo.cpp +++ b/src/BlockInfo.cpp @@ -1,7 +1,6 @@ #include "Globals.h" -#include "BlockInfo.h" #include "Blocks/BlockHandler.h" diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h index 3712e22f7..99149e5b1 100644 --- a/src/Blocks/BlockDirt.h +++ b/src/Blocks/BlockDirt.h @@ -3,7 +3,6 @@ #include "BlockHandler.h" #include "../FastRandom.h" -#include "../BlockInfo.h" #include "Root.h" #include "Bindings/PluginManager.h" diff --git a/src/Blocks/BlockFence.h b/src/Blocks/BlockFence.h index 92f52cbbe..736466e99 100644 --- a/src/Blocks/BlockFence.h +++ b/src/Blocks/BlockFence.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "BlockID.h" #include "../BoundingBox.h" diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 2ea278718..eda155265 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -7,9 +7,6 @@ #include "BlockInServerPluginInterface.h" #include "ChunkInterface.h" -#include <vector> -#include <array> - diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h index 34eccb9aa..e1522a2a2 100644 --- a/src/Blocks/BlockStone.h +++ b/src/Blocks/BlockStone.h @@ -2,7 +2,6 @@ #pragma once #include "BlockHandler.h" -#include "BlockID.h" diff --git a/src/BoundingBox.h b/src/BoundingBox.h index 3641f4061..48b9a3d82 100644 --- a/src/BoundingBox.h +++ b/src/BoundingBox.h @@ -8,7 +8,6 @@ #pragma once -#include "Vector3.h" #include "Defines.h" diff --git a/src/Broadcaster.h b/src/Broadcaster.h index 27d35fe4d..bdd63aa41 100644 --- a/src/Broadcaster.h +++ b/src/Broadcaster.h @@ -1,8 +1,6 @@ class cWorld; -#include <array> - class cBroadcaster { diff --git a/src/Chunk.h b/src/Chunk.h index d1cfb3196..ff626d094 100644 --- a/src/Chunk.h +++ b/src/Chunk.h @@ -2,7 +2,6 @@ #pragma once #include "Entities/Entity.h" -#include "ChunkDef.h" #include "ChunkData.h" #include "Simulator/FireSimulator.h" diff --git a/src/ChunkData.h b/src/ChunkData.h index 792e610b1..d63576f91 100644 --- a/src/ChunkData.h +++ b/src/ChunkData.h @@ -12,9 +12,6 @@ #include <cstring> - -#include "ChunkDef.h" - #include "AllocationPool.h" diff --git a/src/ChunkDef.h b/src/ChunkDef.h index bf0f20514..11a03a26e 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -9,9 +9,6 @@ #pragma once -#include "Vector3.h" -#include "BiomeDef.h" - diff --git a/src/ChunkSender.h b/src/ChunkSender.h index 0946f4318..855edbe11 100644 --- a/src/ChunkSender.h +++ b/src/ChunkSender.h @@ -26,7 +26,6 @@ Note that it may be called by world's BroadcastToChunk() if the client is still #pragma once #include "OSSupport/IsThread.h" -#include "ChunkDef.h" #include "ChunkDataCallback.h" #include <unordered_set> diff --git a/src/ClientHandle.h b/src/ClientHandle.h index e36336562..c68dd6119 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -11,8 +11,6 @@ #include "OSSupport/Network.h" #include "Defines.h" -#include "Vector3.h" -#include "ChunkDef.h" #include "ByteBuffer.h" #include "Scoreboard.h" #include "Map.h" @@ -23,8 +21,7 @@ #include "EffectID.h" -#include <array> -#include <atomic> + // fwd: diff --git a/src/Cuboid.h b/src/Cuboid.h index 0e6a37dfb..3ade5bc20 100644 --- a/src/Cuboid.h +++ b/src/Cuboid.h @@ -1,8 +1,6 @@ #pragma once -#include "Vector3.h" - diff --git a/src/Defines.h b/src/Defines.h index 35afd003c..c16b350d8 100644 --- a/src/Defines.h +++ b/src/Defines.h @@ -1,9 +1,6 @@ #pragma once -#include <limits> -#include <cmath> - diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h index fb3103abc..8991b9fad 100644 --- a/src/Entities/Entity.h +++ b/src/Entities/Entity.h @@ -2,7 +2,6 @@ #pragma once #include "../Item.h" -#include "../Vector3.h" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 52cc8f45b..b07f23958 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1,7 +1,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include <cmath> #include <unordered_map> #include "Player.h" @@ -17,7 +16,6 @@ #include "../Root.h" #include "../Chunk.h" #include "../Items/ItemHandler.h" -#include "../Vector3.h" #include "../FastRandom.h" #include "../ClientHandle.h" diff --git a/src/FastRandom.cpp b/src/FastRandom.cpp index de33a112c..0cd44ace0 100644 --- a/src/FastRandom.cpp +++ b/src/FastRandom.cpp @@ -5,9 +5,6 @@ #include "Globals.h" #include "FastRandom.h" -#include <mutex> -#include <random> - #if defined (__GNUC__) #define ATTRIBUTE_TLS static __thread #elif defined (_MSC_VER) diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index 2ae7a929c..17f778c4a 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "BioGen.h" -#include <chrono> #include <iostream> #include "IntGen.h" #include "ProtIntGen.h" diff --git a/src/Generating/ChunkDesc.h b/src/Generating/ChunkDesc.h index d1da5992d..4c97430a2 100644 --- a/src/Generating/ChunkDesc.h +++ b/src/Generating/ChunkDesc.h @@ -10,7 +10,6 @@ #pragma once #include "../BlockArea.h" -#include "../ChunkDef.h" #include "../Cuboid.h" diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h index 41390083f..cbbe1d1c7 100644 --- a/src/Generating/ChunkGenerator.h +++ b/src/Generating/ChunkGenerator.h @@ -19,7 +19,6 @@ If the generator queue is overloaded, the generator skips chunks with no clients #pragma once #include "../OSSupport/IsThread.h" -#include "../ChunkDef.h" diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp index 6352949fa..5659876c6 100644 --- a/src/Generating/CompoGen.cpp +++ b/src/Generating/CompoGen.cpp @@ -9,7 +9,6 @@ #include "Globals.h" #include "CompoGen.h" -#include "../BlockID.h" #include "../Item.h" #include "../LinearUpscale.h" #include "../IniFile.h" diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp index 405f436b0..a230f1b2b 100644 --- a/src/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "DistortedHeightmap.h" -#include "../OSSupport/File.h" #include "../IniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp index f6d6a2ff1..d1201797c 100644 --- a/src/Generating/FinishGen.cpp +++ b/src/Generating/FinishGen.cpp @@ -10,7 +10,6 @@ #include "Globals.h" #include "FinishGen.h" -#include "../BlockID.h" #include "../Simulator/FluidSimulator.h" // for cFluidSimulator::CanWashAway() #include "../Simulator/FireSimulator.h" #include "../World.h" diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h index c43ddce9f..794fbfc0e 100644 --- a/src/Generating/IntGen.h +++ b/src/Generating/IntGen.h @@ -30,7 +30,6 @@ by using templates. #pragma once #include <tuple> -#include "../BiomeDef.h" #include "../Noise/Noise.h" diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp index 114fc953e..6d07ce67e 100644 --- a/src/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "Noise3DGenerator.h" -#include "../OSSupport/File.h" #include "../IniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/src/Generating/StructGen.cpp b/src/Generating/StructGen.cpp index 3e2ab8855..a36ebc608 100644 --- a/src/Generating/StructGen.cpp +++ b/src/Generating/StructGen.cpp @@ -3,7 +3,6 @@ #include "Globals.h" #include "StructGen.h" -#include "../BlockID.h" #include "Trees.h" #include "../BlockArea.h" #include "../LinearUpscale.h" diff --git a/src/Generating/Trees.cpp b/src/Generating/Trees.cpp index f90a5c9c3..1456c1d15 100644 --- a/src/Generating/Trees.cpp +++ b/src/Generating/Trees.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "Trees.h" -#include "../BlockID.h" #include "../World.h" diff --git a/src/Generating/Trees.h b/src/Generating/Trees.h index 5b5a20b34..db9940d0a 100644 --- a/src/Generating/Trees.h +++ b/src/Generating/Trees.h @@ -17,7 +17,6 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is #pragma once -#include "../ChunkDef.h" #include "../Noise/Noise.h" class cWorld; diff --git a/src/Globals.h b/src/Globals.h index 4c0d37b81..67f3cd284 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -211,7 +211,6 @@ template class SizeChecker<UInt8, 1>; #include <dirent.h> #include <errno.h> #include <iostream> - #include <cstdio> #include <cstring> #include <pthread.h> #include <semaphore.h> @@ -256,6 +255,9 @@ template class SizeChecker<UInt8, 1>; #include <random> #include <type_traits> #include <atomic> +#include <mutex> +#include <thread> +#include <condition_variable> @@ -479,8 +481,9 @@ using cTickTimeLong = std::chrono::duration<Int64, cTickTime::period>; // Common headers (part 2, with macros): -#include "ChunkDef.h" +#include "Vector3.h" #include "BiomeDef.h" +#include "ChunkDef.h" #include "BlockID.h" #include "BlockInfo.h" diff --git a/src/Items/ItemLilypad.h b/src/Items/ItemLilypad.h index 3d07efb03..7a0f05135 100644 --- a/src/Items/ItemLilypad.h +++ b/src/Items/ItemLilypad.h @@ -2,9 +2,7 @@ #include "ItemHandler.h" #include "../Entities/Player.h" -#include "Vector3.h" #include "../LineBlockTracer.h" -#include "BlockInfo.h" diff --git a/src/LightingThread.h b/src/LightingThread.h index 4b1bf4788..0208848f6 100644 --- a/src/LightingThread.h +++ b/src/LightingThread.h @@ -32,7 +32,6 @@ Chunks from m_PostponedQueue are moved back into m_Queue when their neighbors ge #pragma once #include "OSSupport/IsThread.h" -#include "ChunkDef.h" #include "ChunkStay.h" diff --git a/src/LineBlockTracer.cpp b/src/LineBlockTracer.cpp index d23c5a09e..471d9e13b 100644 --- a/src/LineBlockTracer.cpp +++ b/src/LineBlockTracer.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "LineBlockTracer.h" -#include "Vector3.h" #include "World.h" #include "Chunk.h" #include "BoundingBox.h" diff --git a/src/LoggerListeners.cpp b/src/LoggerListeners.cpp index 91f166bda..ca82b3e0e 100644 --- a/src/LoggerListeners.cpp +++ b/src/LoggerListeners.cpp @@ -3,13 +3,9 @@ #include "LoggerListeners.h" -#include <chrono> - #if defined(_WIN32) #include <io.h> // Needed for _isatty(), not available on Linux #include <time.h> -#elif defined(__linux) - #include <unistd.h> // Needed for isatty() on Linux #endif diff --git a/src/LoggerListeners.h b/src/LoggerListeners.h index 3d5628caa..d150b9b49 100644 --- a/src/LoggerListeners.h +++ b/src/LoggerListeners.h @@ -1,6 +1,5 @@ #include "Logger.h" -#include "OSSupport/File.h" std::unique_ptr<cLogger::cListener> MakeConsoleListener(bool a_IsService); std::pair<bool, std::unique_ptr<cLogger::cListener>> MakeFileListener(); @@ -13,12 +13,6 @@ -#include "BlockID.h" - - - - - class cClientHandle; class cWorld; class cPlayer; diff --git a/src/MobFamilyCollecter.h b/src/MobFamilyCollecter.h index c8ca211e8..70e908d4b 100644 --- a/src/MobFamilyCollecter.h +++ b/src/MobFamilyCollecter.h @@ -1,9 +1,6 @@ #pragma once -#include <map> -#include <set> -#include "BlockID.h" #include "Mobs/Monster.h" // This is a side-effect of keeping Mobfamily inside Monster class. I'd prefer to keep both (Mobfamily and Monster) inside a "Monster" namespace MG TODO : do it diff --git a/src/MobProximityCounter.h b/src/MobProximityCounter.h index a3c0c125a..fc1551560 100644 --- a/src/MobProximityCounter.h +++ b/src/MobProximityCounter.h @@ -1,8 +1,6 @@ #pragma once -#include <set> - class cChunk; class cEntity; diff --git a/src/MobSpawner.h b/src/MobSpawner.h index 5802a2b1c..941a04a17 100644 --- a/src/MobSpawner.h +++ b/src/MobSpawner.h @@ -1,9 +1,6 @@ #pragma once -#include <set> -#include "BlockID.h" -#include "ChunkDef.h" #include "Chunk.h" #include "Mobs/Monster.h" // This is a side-effect of keeping Mobfamily inside Monster class. I'd prefer to keep both (Mobfamily and Monster) inside a "Monster" namespace MG TODO : do it diff --git a/src/Mobs/Bat.cpp b/src/Mobs/Bat.cpp index 5fa8ffc9b..e419ceb2d 100644 --- a/src/Mobs/Bat.cpp +++ b/src/Mobs/Bat.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Bat.h" -#include "../Vector3.h" #include "../Chunk.h" diff --git a/src/Mobs/Guardian.cpp b/src/Mobs/Guardian.cpp index 5e98094b1..3dbec9928 100644 --- a/src/Mobs/Guardian.cpp +++ b/src/Mobs/Guardian.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Guardian.h" -#include "../Vector3.h" #include "../Chunk.h" diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h index 121bf3406..1507598bb 100644 --- a/src/Mobs/Monster.h +++ b/src/Mobs/Monster.h @@ -3,7 +3,6 @@ #include "../Entities/Pawn.h" #include "../Defines.h" -#include "../BlockID.h" #include "../Item.h" #include "../Enchantments.h" #include "MonsterTypes.h" diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp index 9f34e73d9..9c423684f 100644 --- a/src/Mobs/Path.cpp +++ b/src/Mobs/Path.cpp @@ -1,8 +1,6 @@ #include "Globals.h" -#include <cmath> - #include "Path.h" #include "../Chunk.h" diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp index 4adcedae9..fef1adac6 100644 --- a/src/Mobs/Sheep.cpp +++ b/src/Mobs/Sheep.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Sheep.h" -#include "../BlockID.h" #include "../Entities/Player.h" #include "../World.h" #include "../EffectID.h" diff --git a/src/Mobs/Squid.cpp b/src/Mobs/Squid.cpp index cab409cb3..00cc07e14 100644 --- a/src/Mobs/Squid.cpp +++ b/src/Mobs/Squid.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Squid.h" -#include "../Vector3.h" #include "../Chunk.h" diff --git a/src/NetherPortalScanner.h b/src/NetherPortalScanner.h index e9e210b2f..92af06f98 100644 --- a/src/NetherPortalScanner.h +++ b/src/NetherPortalScanner.h @@ -1,7 +1,6 @@ #pragma once -#include "Vector3.h" #include "ChunkStay.h" diff --git a/src/Noise/Noise.h b/src/Noise/Noise.h index 03f61643d..6b7811c41 100644 --- a/src/Noise/Noise.h +++ b/src/Noise/Noise.h @@ -5,8 +5,6 @@ #pragma once -#include <cmath> - /** The datatype used by all the noise generators. */ typedef float NOISE_DATATYPE; diff --git a/src/OSSupport/CriticalSection.h b/src/OSSupport/CriticalSection.h index f20d30e3d..275d1a7e8 100644 --- a/src/OSSupport/CriticalSection.h +++ b/src/OSSupport/CriticalSection.h @@ -1,7 +1,5 @@ #pragma once -#include <mutex> -#include <thread> diff --git a/src/OSSupport/Event.h b/src/OSSupport/Event.h index 94f062123..ad4f07595 100644 --- a/src/OSSupport/Event.h +++ b/src/OSSupport/Event.h @@ -10,9 +10,6 @@ #pragma once -#include <mutex> -#include <condition_variable> - diff --git a/src/OSSupport/IsThread.h b/src/OSSupport/IsThread.h index 85f437267..d882dbf8a 100644 --- a/src/OSSupport/IsThread.h +++ b/src/OSSupport/IsThread.h @@ -16,8 +16,6 @@ In the descending class' constructor call the Start() method to start the thread #pragma once -#include <thread> -#include <atomic> diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h index 7da3f7569..cbcefc290 100644 --- a/src/OSSupport/NetworkSingleton.h +++ b/src/OSSupport/NetworkSingleton.h @@ -13,7 +13,6 @@ #pragma once -#include <atomic> #include <event2/event.h> #include "Network.h" #include "NetworkLookup.h" diff --git a/src/PolarSSL++/BlockingSslClientSocket.h b/src/PolarSSL++/BlockingSslClientSocket.h index d3b12037b..651d750e6 100644 --- a/src/PolarSSL++/BlockingSslClientSocket.h +++ b/src/PolarSSL++/BlockingSslClientSocket.h @@ -9,7 +9,6 @@ #pragma once -#include <atomic> #include "OSSupport/Network.h" #include "CallbackSslContext.h" diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h index a1e09dbd1..ee0be74c2 100644 --- a/src/Protocol/Protocol.h +++ b/src/Protocol/Protocol.h @@ -17,7 +17,6 @@ #include "../ByteBuffer.h" #include "../EffectID.h" -#include <array> diff --git a/src/Root.h b/src/Root.h index efae5ba58..23eeb8c80 100644 --- a/src/Root.h +++ b/src/Root.h @@ -6,8 +6,6 @@ #include "HTTP/HTTPServer.h" #include "Defines.h" #include "RankManager.h" -#include <thread> -#include <atomic> diff --git a/src/Server.cpp b/src/Server.cpp index 947852775..a8703be86 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -7,7 +7,6 @@ #include "Mobs/Monster.h" #include "Root.h" #include "World.h" -#include "ChunkDef.h" #include "Bindings/PluginManager.h" #include "ChatColor.h" #include "Entities/Player.h" @@ -20,7 +19,6 @@ #include "FastRandom.h" #include "IniFile.h" -#include "Vector3.h" #include <fstream> #include <sstream> diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 106e73324..55dd7008b 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -3,7 +3,6 @@ #include "FireSimulator.h" #include "../World.h" -#include "../BlockID.h" #include "../Defines.h" #include "../Chunk.h" #include "Root.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h index 48356ee9c..384d872f4 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h @@ -2,7 +2,6 @@ #pragma once #include "World.h" -#include "Vector3.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h index b461512f0..83374e311 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneSimulatorChunkData.h @@ -1,7 +1,6 @@ #pragma once -#include "Vector3.h" #include "RedstoneHandler.h" #include "../RedstoneSimulator.h" #include <unordered_map> diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h index 863ba2532..cee43db60 100644 --- a/src/Simulator/RedstoneSimulator.h +++ b/src/Simulator/RedstoneSimulator.h @@ -1,7 +1,6 @@ #pragma once -#include "ChunkDef.h" #include "Simulator/Simulator.h" diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp index 903dbf53d..6b1219edb 100644 --- a/src/Simulator/SandSimulator.cpp +++ b/src/Simulator/SandSimulator.cpp @@ -3,7 +3,6 @@ #include "SandSimulator.h" #include "../World.h" -#include "../BlockID.h" #include "../Defines.h" #include "../Entities/FallingBlock.h" #include "../Chunk.h" diff --git a/src/Simulator/Simulator.cpp b/src/Simulator/Simulator.cpp index 275d60161..7d3ce7851 100644 --- a/src/Simulator/Simulator.cpp +++ b/src/Simulator/Simulator.cpp @@ -2,7 +2,6 @@ #include "Globals.h" #include "../World.h" -#include "../BlockID.h" #include "../Defines.h" #include "../Chunk.h" #include "../Cuboid.h" diff --git a/src/SpawnPrepare.h b/src/SpawnPrepare.h index 1c7a42b2f..6d001b5f7 100644 --- a/src/SpawnPrepare.h +++ b/src/SpawnPrepare.h @@ -1,8 +1,6 @@ #pragma once -#include <atomic> - class cWorld; diff --git a/src/Stopwatch.h b/src/Stopwatch.h index 72fbf4f68..af0a5108f 100644 --- a/src/Stopwatch.h +++ b/src/Stopwatch.h @@ -10,8 +10,6 @@ #pragma once -#include <chrono> - diff --git a/src/StringUtils.h b/src/StringUtils.h index 620323e70..b59dde41a 100644 --- a/src/StringUtils.h +++ b/src/StringUtils.h @@ -8,9 +8,6 @@ #pragma once -#include <string> -#include <limits> - typedef std::string AString; diff --git a/src/Tracer.h b/src/Tracer.h index e4ff1b12c..151869e3a 100644 --- a/src/Tracer.h +++ b/src/Tracer.h @@ -1,10 +1,6 @@ #pragma once -#include "Vector3.h" - -#include <array> - diff --git a/src/Vector3.h b/src/Vector3.h index 8c8dc6ad4..732a65a1f 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -3,11 +3,6 @@ -#include <list> -#include <vector> - - - template <typename T> diff --git a/src/World.cpp b/src/World.cpp index 6a1ff986e..f11aee878 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -2,7 +2,6 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "World.h" -#include "ChunkDef.h" #include "ClientHandle.h" #include "Server.h" #include "Root.h" diff --git a/src/World.h b/src/World.h index e011f4ac3..a53d3471c 100644 --- a/src/World.h +++ b/src/World.h @@ -1,12 +1,6 @@ #pragma once -#ifndef _WIN32 - #include "BlockID.h" -#else - enum ENUM_ITEM_ID : short; -#endif - #define MAX_PLAYERS 65535 #include <functional> @@ -15,7 +9,6 @@ #include "ChunkMap.h" #include "WorldStorage/WorldStorage.h" #include "Generating/ChunkGenerator.h" -#include "Vector3.h" #include "ChunkSender.h" #include "Defines.h" #include "LightingThread.h" diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp index ecc7a550a..d474f59e1 100644 --- a/src/WorldStorage/NBTChunkSerializer.cpp +++ b/src/WorldStorage/NBTChunkSerializer.cpp @@ -5,7 +5,6 @@ #include "Globals.h" #include "NBTChunkSerializer.h" #include "EnchantmentSerializer.h" -#include "../BlockID.h" #include "../ItemGrid.h" #include "../StringCompression.h" #include "FastNBT.h" diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 416903f66..16688b712 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -10,7 +10,6 @@ #include "zlib/zlib.h" #include "json/json.h" #include "../World.h" -#include "../BlockID.h" #include "../Item.h" #include "../ItemGrid.h" #include "../StringCompression.h" diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index 3afa88ecd..5b8a1b8ba 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -11,10 +11,7 @@ #pragma once -#ifndef WORLDSTORAGE_H_INCLUDED -#define WORLDSTORAGE_H_INCLUDED -#include "../ChunkDef.h" #include "../OSSupport/IsThread.h" #include "../OSSupport/Queue.h" @@ -116,9 +113,3 @@ protected: - -#endif // WORLDSTORAGE_H_INCLUDED - - - - |