From a78fd671b229b32b04a7abf9018edb7a6c08ccbe Mon Sep 17 00:00:00 2001
From: KingCol13 <48412633+KingCol13@users.noreply.github.com>
Date: Fri, 25 Sep 2020 10:13:59 +0100
Subject: 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 | 8 +-------
 Tools/MCADefrag/Globals.h               | 2 --
 Tools/QtBiomeVisualiser/Globals.h       | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'Tools')

diff --git a/Tools/GrownBiomeGenVisualiser/Globals.h b/Tools/GrownBiomeGenVisualiser/Globals.h
index da4b5203c..2c5d090f5 100644
--- a/Tools/GrownBiomeGenVisualiser/Globals.h
+++ b/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"
-
-
diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h
index 309d28cbd..def1fbdb9 100644
--- a/Tools/MCADefrag/Globals.h
+++ b/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"
-
 
 
 
diff --git a/Tools/QtBiomeVisualiser/Globals.h b/Tools/QtBiomeVisualiser/Globals.h
index 0b119fcb1..fe037c2ad 100644
--- a/Tools/QtBiomeVisualiser/Globals.h
+++ b/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"
-- 
cgit v1.2.3