18 files changed, 33 insertions, 50 deletions

diff --git a/source/BlockEntity.h b/source/BlockEntities/BlockEntity.h
index a1dba82a6..ab7d7f5dc 100644
--- a/source/BlockEntity.h
+++ b/source/BlockEntities/BlockEntity.h
@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include "ClientHandle.h"
-#include "World.h"
+#include "../ClientHandle.h"
+#include "../World.h"
 
 
 
diff --git a/source/BlockEntityWithItems.h b/source/BlockEntities/BlockEntityWithItems.h
index b160b8ed4..77f4ebe2e 100644
--- a/source/BlockEntityWithItems.h
+++ b/source/BlockEntities/BlockEntityWithItems.h
@@ -10,7 +10,7 @@
 #pragma once

 

 #include "BlockEntity.h"

-#include "ItemGrid.h"

+#include "../ItemGrid.h"

 

 

 

diff --git a/source/ChestEntity.cpp b/source/BlockEntities/ChestEntity.cpp
index 45c543538..769fadc22 100644
--- a/source/ChestEntity.cpp
+++ b/source/BlockEntities/ChestEntity.cpp
@@ -2,27 +2,16 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ChestEntity.h"
-#include "Item.h"
-#include "ClientHandle.h"
-#include "Player.h"
-#include "UI/Window.h"
-#include "World.h"
-#include "Root.h"
-#include "Pickup.h"
-#include "Noise.h"
+#include "../Item.h"
+#include "../Player.h"
+#include "../UI/Window.h"
+#include "../Noise.h"
 #include <json/json.h>
 
 
 
 
 
-class cWorld;
-class cRoot;
-
-
-
-
-
 cChestEntity::cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
 	super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL)
 {
diff --git a/source/ChestEntity.h b/source/BlockEntities/ChestEntity.h
index 60fd7589a..03cd5a943 100644
--- a/source/ChestEntity.h
+++ b/source/BlockEntities/ChestEntity.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntityWithItems.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
 
 
 
diff --git a/source/DispenserEntity.cpp b/source/BlockEntities/DispenserEntity.cpp
index 6ccd66727..08f26efff 100644
--- a/source/DispenserEntity.cpp
+++ b/source/BlockEntities/DispenserEntity.cpp
@@ -2,9 +2,9 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

 

 #include "DispenserEntity.h"

-#include "Player.h"

-#include "Simulator/FluidSimulator.h"

-#include "Chunk.h"

+#include "../Player.h"

+#include "../Simulator/FluidSimulator.h"

+#include "../Chunk.h"

 

 

 

diff --git a/source/DispenserEntity.h b/source/BlockEntities/DispenserEntity.h
index 09270e7f8..09270e7f8 100644
--- a/source/DispenserEntity.h
+++ b/source/BlockEntities/DispenserEntity.h
diff --git a/source/DropSpenserEntity.cpp b/source/BlockEntities/DropSpenserEntity.cpp
index 0d07ec27b..c0993d676 100644
--- a/source/DropSpenserEntity.cpp
+++ b/source/BlockEntities/DropSpenserEntity.cpp
@@ -6,8 +6,8 @@
 

 #include "Globals.h"

 #include "DropSpenserEntity.h"

-#include "Player.h"

-#include "Chunk.h"

+#include "../Player.h"

+#include "../Chunk.h"

 

 

 

diff --git a/source/DropSpenserEntity.h b/source/BlockEntities/DropSpenserEntity.h
index 4918f8dfe..ca9f7dfa3 100644
--- a/source/DropSpenserEntity.h
+++ b/source/BlockEntities/DropSpenserEntity.h
@@ -11,7 +11,7 @@
 #pragma once

 

 #include "BlockEntityWithItems.h"

-#include "UI/WindowOwner.h"

+#include "../UI/WindowOwner.h"

 

 

 

diff --git a/source/DropperEntity.cpp b/source/BlockEntities/DropperEntity.cpp
index be2726cfa..ebb52c8a1 100644
--- a/source/DropperEntity.cpp
+++ b/source/BlockEntities/DropperEntity.cpp
@@ -5,8 +5,8 @@
 

 #include "Globals.h"

 #include "DropperEntity.h"

-#include "Player.h"

-#include "Simulator/FluidSimulator.h"

+#include "../Player.h"

+#include "../Simulator/FluidSimulator.h"

 

 

 

diff --git a/source/DropperEntity.h b/source/BlockEntities/DropperEntity.h
index ed29bfe95..ed29bfe95 100644
--- a/source/DropperEntity.h
+++ b/source/BlockEntities/DropperEntity.h
diff --git a/source/FurnaceEntity.cpp b/source/BlockEntities/FurnaceEntity.cpp
index f4cefc56a..b199f480b 100644
--- a/source/FurnaceEntity.cpp
+++ b/source/BlockEntities/FurnaceEntity.cpp
@@ -2,16 +2,10 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "FurnaceEntity.h"
-#include "BlockID.h"
-#include "Item.h"
-#include "UI/Window.h"
-#include "Player.h"
-#include "World.h"
-#include "ClientHandle.h"
-#include "FurnaceRecipe.h"
-#include "Server.h"
-#include "Pickup.h"
-#include "Root.h"
+#include "../UI/Window.h"
+#include "../Player.h"
+#include "../FurnaceRecipe.h"
+#include "../Root.h"
 #include <json/json.h>
 
 
diff --git a/source/FurnaceEntity.h b/source/BlockEntities/FurnaceEntity.h
index 5bbbef32b..0606497b2 100644
--- a/source/FurnaceEntity.h
+++ b/source/BlockEntities/FurnaceEntity.h
@@ -2,8 +2,8 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "UI/WindowOwner.h"
-#include "Item.h"
+#include "../UI/WindowOwner.h"
+#include "../Item.h"
 
 
 
diff --git a/source/JukeboxEntity.cpp b/source/BlockEntities/JukeboxEntity.cpp
index 249e86df2..617b7bd00 100644
--- a/source/JukeboxEntity.cpp
+++ b/source/BlockEntities/JukeboxEntity.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

 

 #include "JukeboxEntity.h"

-#include "World.h"

+#include "../World.h"

 #include <json/json.h>

 

 

diff --git a/source/JukeboxEntity.h b/source/BlockEntities/JukeboxEntity.h
index 94ecd2894..063453607 100644
--- a/source/JukeboxEntity.h
+++ b/source/BlockEntities/JukeboxEntity.h
@@ -2,7 +2,7 @@
 #pragma once

 

 #include "BlockEntity.h"

-#include "Player.h"

+#include "../Player.h"

 

 

 

diff --git a/source/NoteEntity.cpp b/source/BlockEntities/NoteEntity.cpp
index 6dc32ddd5..36da13692 100644
--- a/source/NoteEntity.cpp
+++ b/source/BlockEntities/NoteEntity.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

 

 #include "NoteEntity.h"

-#include "World.h"

+#include "../World.h"

 #include <json/json.h>

 

 

diff --git a/source/NoteEntity.h b/source/BlockEntities/NoteEntity.h
index b78437f6f..29ce4ef8f 100644
--- a/source/NoteEntity.h
+++ b/source/BlockEntities/NoteEntity.h
@@ -15,11 +15,11 @@ namespace Json
 

 enum ENUM_NOTE_INSTRUMENTS

 {

-	E_INST_HARP_PIANO = 0,

+	E_INST_HARP_PIANO  = 0,

 	E_INST_DOUBLE_BASS = 1,

-	E_INST_SNARE_DRUM = 2,

-	E_INST_CLICKS = 3,

-	E_INST_BASS_DRUM = 4

+	E_INST_SNARE_DRUM  = 2,

+	E_INST_CLICKS      = 3,

+	E_INST_BASS_DRUM   = 4

 };

 

 

diff --git a/source/SignEntity.cpp b/source/BlockEntities/SignEntity.cpp
index 0f952426a..91cbb5a5e 100644
--- a/source/SignEntity.cpp
+++ b/source/BlockEntities/SignEntity.cpp
@@ -3,10 +3,10 @@
 
 #include "SignEntity.h"
 
-#include "Player.h"
-#include "ClientHandle.h"
-#include "World.h"
-#include "Root.h"
+#include "../Player.h"
+// #include "ClientHandle.h"
+// #include "World.h"
+// #include "Root.h"
 
 #include <json/json.h>
 
diff --git a/source/SignEntity.h b/source/BlockEntities/SignEntity.h
index b4e7a141f..b4e7a141f 100644
--- a/source/SignEntity.h
+++ b/source/BlockEntities/SignEntity.h