Fixed the remaining derps

src/BlockEntities/ChestEntity.cpp

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

src/BlockEntities/FurnaceEntity.cpp

@@ -6,7 +6,7 @@
 #include "../Entities/Player.h"
 #include "../Root.h"
 #include "../Chunk.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"
 
 
 

src/BlockEntities/JukeboxEntity.cpp

@@ -3,7 +3,7 @@
 
 #include "JukeboxEntity.h"
 #include "../World.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"
 
 
 

src/BlockEntities/NoteEntity.cpp

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

src/BlockEntities/SignEntity.cpp

@@ -4,7 +4,7 @@
 // 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 "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"
 #include "SignEntity.h"
 #include "../Entities/Player.h"
 

src/ChunkMap.cpp

@@ -20,8 +20,8 @@
 	#include <cstdlib> // abs
 #endif
 
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"
 
 
 

src/Generating/BioGen.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "BioGen.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 

src/Generating/ChunkGenerator.cpp

@@ -3,7 +3,7 @@
 
 #include "ChunkGenerator.h"
 #include "../World.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../Root.h"
 #include "../PluginManager.h"
 #include "ChunkDesc.h"

src/Generating/CompoGen.cpp

@@ -12,7 +12,7 @@
 #include "../BlockID.h"
 #include "../Item.h"
 #include "../LinearUpscale.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 
 
 

src/Generating/ComposableGenerator.cpp

@@ -7,7 +7,7 @@
 
 #include "ComposableGenerator.h"
 #include "../World.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../Root.h"
 
 // Individual composed algorithms:

src/Generating/DistortedHeightmap.cpp

@@ -7,7 +7,7 @@
 
 #include "DistortedHeightmap.h"
 #include "../OSSupport/File.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 

src/Generating/EndGen.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "EndGen.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 

src/Generating/HeiGen.cpp

@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "HeiGen.h"
 #include "../LinearUpscale.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 
 
 

src/Generating/Noise3DGenerator.cpp

@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "Noise3DGenerator.h"
 #include "../OSSupport/File.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"
 

src/OSSupport/GZipFile.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
 
 
 

src/PluginLua.cpp

@@ -11,7 +11,7 @@
 
 extern "C"
 {
-	#include"lib/lua/src/lualib.h"
+	#include "lua/src/lualib.h"
 }
 
 #include "tolua++.h"

src/PluginManager.cpp

@@ -10,7 +10,7 @@
 #include "Server.h"
 #include "CommandOutput.h"
 
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "tolua++.h"
 #include "Entities/Player.h"
 

src/Protocol/ChunkDataSerializer.cpp

@@ -7,7 +7,7 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
 
 
 

src/Protocol/Protocol132.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "lib/cryptopp/randpool.h"
+#include "cryptopp/randpool.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"

src/Protocol/Protocol14x.cpp

@@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Root.h"
 #include "../Server.h"
 #include "../ClientHandle.h"
-#include "lib/cryptopp/randpool.h"
+#include "cryptopp/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
 #include "../Entities/Player.h"

src/Protocol/Protocol17x.h

@@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes:
 
 #include "Protocol.h"
 #include "../ByteBuffer.h"
-#include "lib/cryptopp/modes.h"
+#include "cryptopp/modes.h"
-#include "lib/cryptopp/aes.h"
+#include "cryptopp/aes.h"
 
 
 

src/Server.cpp

@@ -23,7 +23,7 @@
 
 #include "MersenneTwister.h"
 
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "Vector3f.h"
 
 #include <fstream>
@@ -31,7 +31,7 @@
 #include <iostream>
 
 extern "C" {
-	#include "lib/zlib/zlib.h"
+	#include "zlib/zlib.h"
 }
 
 

src/Simulator/Simulator.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "../Vector3i.h"
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 
 
 

src/WorldStorage/WSSAnvil.cpp

@@ -7,7 +7,7 @@
 #include "WSSAnvil.h"
 #include "NBTChunkSerializer.h"
 #include "../World.h"
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
 #include "../BlockID.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DispenserEntity.h"

src/WorldStorage/WSSCompact.cpp

@@ -6,8 +6,8 @@
 #include "Globals.h"
 #include "WSSCompact.h"
 #include "../World.h"
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"
 #include "../StringCompression.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DispenserEntity.h"

src/WorldStorage/WorldStorage.h

@@ -16,7 +16,7 @@
 
 #include "../ChunkDef.h"
 #include "../OSSupport/IsThread.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "jsoncpp/include/json/json.h"