Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885)

* Removed BiomeDef.h

* Removed ChunkDef.h from Globals.h

* Added to CONTRIBUTORS.

* Re-added empty last line to Globals.h

* Included stddef and StringUtils in BiomeDef.h

* Fixed build tools compiling. It compiles, but at what cost?

* Added include to src/Generating/Trees.h

* Include added in ChunkGeneratorThread.h

* Moved rearranged includes in LineBlockTracer.cpp

* Re-arrange headers in ChunkInterface.cpp

* Included ChunkDef.h in Path.h

* Included ChunkDef.h in NBTChunkSerializer.h

* Rearranged included and added required includes to headers.

* Removed unnecessary included in StringUtils.h.

Tools/GrownBiomeGenVisualiser/Globals.h

@@ -120,6 +120,7 @@ typedef unsigned char Byte;
 #include <cmath>
 #include <cstdarg>
 #include <ctime>
+#include <cstddef>
 
 
 
@@ -189,10 +190,3 @@ auto ToUnsigned(T a_Val)
 	return static_cast<std::make_unsigned_t<T>>(a_Val);
 }
 
-
-
-
-
-#include "BiomeDef.h"
-
-

Tools/MCADefrag/Globals.h

@@ -169,8 +169,6 @@ typedef unsigned char Byte;
 #define VERIFY(x) (!!(x) || (LOGERROR("Verification failed: %s, file %s, line %i", #x, __FILE__, __LINE__), exit(1), 0))
 
 
-#include "BiomeDef.h"
-
 
 
 

Tools/QtBiomeVisualiser/Globals.h

@@ -275,7 +275,5 @@ T Clamp(T a_Value, T a_Min, T a_Max)
 
 
 // Common headers (part 2, with macros):
-#include "src/ChunkDef.h"
-#include "src/BiomeDef.h"
 #include "src/BlockID.h"
 #include "src/BlockInfo.h"

src/BiomeDef.cpp

@@ -3,7 +3,9 @@
 
 // Implements biome helper functions
 
+
 #include "Globals.h"
+#include "BiomeDef.h"
 
 
 

src/BiomeDef.h

@@ -9,10 +9,6 @@
 
 #pragma once
 
-
-
-
-
 // tolua_begin
 /** Biome IDs
 The first batch corresponds to the clientside biomes, used by MineCraft.

src/BlockEntities/BlockEntity.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-
+#include "ChunkDef.h"
 
 
 

src/BlockInfo.h

@@ -1,6 +1,7 @@
 
 #pragma once
 
+#include "ChunkDef.h"
 
 
 

src/BlockTracer.h

@@ -14,7 +14,7 @@
 
 
 #include "Defines.h"
-
+#include "ChunkDef.h"
 
 
 

src/BlockType.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "ChunkDef.h"
 
 // tolua_begin
 

src/Blocks/ChunkInterface.h

@@ -3,7 +3,7 @@
 
 #include "../ForEachChunkProvider.h"
 #include "../FunctionRef.h"
-
+#include "ChunkDef.h"
 
 
 

src/ChunkData.h

@@ -13,7 +13,7 @@
 #include <cstring>
 
 #include "AllocationPool.h"
-
+#include "ChunkDef.h"
 
 
 class cChunkData

src/ChunkDef.h

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

src/ChunkGeneratorThread.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "OSSupport/IsThread.h"
-
+#include "ChunkDef.h"
 
 
 

src/ChunkStay.h

@@ -12,7 +12,7 @@ not unload
 
 #pragma once
 
-
+#include "ChunkDef.h"
 
 
 

src/Generating/ChunkGenerator.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../Defines.h"
-
+#include "ChunkDef.h"
 
 
 

src/Generating/IntGen.h

@@ -31,6 +31,7 @@ by using templates.
 
 #include <tuple>
 #include "../Noise/Noise.h"
+#include "BiomeDef.h"
 
 
 

src/Generating/Trees.h

@@ -18,7 +18,7 @@ logs can overwrite others(leaves), but others shouldn't overwrite logs. This is
 #pragma once
 
 #include "../Noise/Noise.h"
-
+#include "../ChunkDef.h"  // For sSetBlockVector
 
 
 

src/Globals.h

@@ -355,5 +355,4 @@ auto ToUnsigned(T a_Val)
 
 // Common headers (part 2, with macros):
 #include "Vector3.h"
-#include "BiomeDef.h"
-#include "ChunkDef.h"
+

src/Map.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "Defines.h"
-
+#include "ChunkDef.h"
 
 
 

src/Mobs/Path.h

@@ -1,6 +1,8 @@
 
 #pragma once
 
+#include "ChunkDef.h"
+
 /*
 // Needed Fwds: cPath
 enum class ePathFinderStatus;

src/OSSupport/File.h

@@ -28,7 +28,7 @@ For reading entire files into memory, just use the static cFile::ReadWholeFile()
 
 #pragma once
 
-
+#include "StringUtils.h"
 
 
 

src/Root.h

@@ -8,7 +8,7 @@
 #include "Protocol/Authenticator.h"
 #include "Protocol/MojangAPI.h"
 #include "RankManager.h"
-
+#include "ChunkDef.h"
 
 
 

src/Scoreboard.h

@@ -12,6 +12,7 @@
 
 
 #include "FunctionRef.h"
+#include "ChunkDef.h"
 
 
 class cObjective;

src/Simulator/Simulator.h

@@ -1,6 +1,8 @@
 
 #pragma once
 
+#include "ChunkDef.h"
+
 class cWorld;
 class cChunk;
 class cCuboid;

src/StringUtils.h

@@ -8,8 +8,6 @@
 
 #pragma once
 
-
-
 typedef std::string AString;
 typedef std::vector<AString> AStringVector;
 typedef std::list<AString>   AStringList;

src/WorldStorage/NBTChunkSerializer.h

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

src/WorldStorage/WorldStorage.h

@@ -14,7 +14,7 @@
 
 #include "../OSSupport/IsThread.h"
 #include "../OSSupport/Queue.h"
-
+#include "ChunkDef.h"