45 files changed, 85 insertions, 85 deletions

diff --git a/source/blocks/BlockCactus.h b/source/blocks/BlockCactus.h
index 9da9d796b..964646299 100644
--- a/source/blocks/BlockCactus.h
+++ b/source/blocks/BlockCactus.h
@@ -1,6 +1,6 @@
 

 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 

diff --git a/source/blocks/BlockChest.h b/source/blocks/BlockChest.h
index 65c0ffa5c..db67fe1c8 100644
--- a/source/blocks/BlockChest.h
+++ b/source/blocks/BlockChest.h
@@ -1,8 +1,8 @@
 #pragma once

 #include "BlockEntity.h"

-#include "../cWorld.h"

-#include "../cPiston.h"

-#include "../cPlayer.h"

+#include "../World.h"

+#include "../Piston.h"

+#include "../Player.h"

 

 class cBlockChestHandler : public cBlockEntityHandler

 {

diff --git a/source/blocks/BlockCloth.h b/source/blocks/BlockCloth.h
index d83b18ebb..452ad2237 100644
--- a/source/blocks/BlockCloth.h
+++ b/source/blocks/BlockCloth.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockClothHandler : public cBlockHandler

diff --git a/source/blocks/BlockCrops.h b/source/blocks/BlockCrops.h
index ebf911131..b30139e79 100644
--- a/source/blocks/BlockCrops.h
+++ b/source/blocks/BlockCrops.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockCropsHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockDirt.h b/source/blocks/BlockDirt.h
index 28993d29c..5a2487f1b 100644
--- a/source/blocks/BlockDirt.h
+++ b/source/blocks/BlockDirt.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockDirtHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockDispenser.h b/source/blocks/BlockDispenser.h
index f3ad20d5c..eee75a39a 100644
--- a/source/blocks/BlockDispenser.h
+++ b/source/blocks/BlockDispenser.h
@@ -1,8 +1,8 @@
 #pragma once

 #include "BlockEntity.h"

-#include "../cWorld.h"

-#include "../cPiston.h"

-#include "../cPlayer.h"

+#include "../World.h"

+#include "../Piston.h"

+#include "../Player.h"

 

 class cBlockDispenserHandler : public cBlockEntityHandler

 {

diff --git a/source/blocks/BlockDoor.cpp b/source/blocks/BlockDoor.cpp
index 283f546b6..deed8a256 100644
--- a/source/blocks/BlockDoor.cpp
+++ b/source/blocks/BlockDoor.cpp
@@ -1,9 +1,9 @@
 #include "Globals.h"

 #include "BlockDoor.h"

-#include "../cItem.h"

-#include "../cWorld.h"

-#include "../cDoors.h"

-#include "../cPlayer.h"

+#include "../Item.h"

+#include "../World.h"

+#include "../Doors.h"

+#include "../Player.h"

 

 

 cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockID)

diff --git a/source/blocks/BlockDoor.h b/source/blocks/BlockDoor.h
index 6af8bd955..3316f50a4 100644
--- a/source/blocks/BlockDoor.h
+++ b/source/blocks/BlockDoor.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockDoorHandler : public cBlockHandler

diff --git a/source/blocks/BlockEntity.h b/source/blocks/BlockEntity.h
index bfc3241d3..caf6ee342 100644
--- a/source/blocks/BlockEntity.h
+++ b/source/blocks/BlockEntity.h
@@ -1,7 +1,7 @@
 

 #pragma once

 

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 

diff --git a/source/blocks/BlockFire.h b/source/blocks/BlockFire.h
index 1b9f68060..1fecf9a14 100644
--- a/source/blocks/BlockFire.h
+++ b/source/blocks/BlockFire.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockFireHandler : public cBlockHandler

diff --git a/source/blocks/BlockFlower.h b/source/blocks/BlockFlower.h
index 920cf1c8f..35a55fcac 100644
--- a/source/blocks/BlockFlower.h
+++ b/source/blocks/BlockFlower.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockFlowerHandler : public cBlockHandler

diff --git a/source/blocks/BlockFluid.h b/source/blocks/BlockFluid.h
index 6883ce715..c5ac660b0 100644
--- a/source/blocks/BlockFluid.h
+++ b/source/blocks/BlockFluid.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockFluidHandler : public cBlockHandler

diff --git a/source/blocks/BlockFurnace.h b/source/blocks/BlockFurnace.h
index d0455e805..4157b5049 100644
--- a/source/blocks/BlockFurnace.h
+++ b/source/blocks/BlockFurnace.h
@@ -1,8 +1,8 @@
 #pragma once

 #include "BlockEntity.h"

-#include "../cWorld.h"

-#include "../cPiston.h"

-#include "../cPlayer.h"

+#include "../World.h"

+#include "../Piston.h"

+#include "../Player.h"

 

 class cBlockFurnaceHandler : public cBlockEntityHandler

 {

diff --git a/source/blocks/BlockGlowstone.h b/source/blocks/BlockGlowstone.h
index ecd34a1d9..0b906e2fe 100644
--- a/source/blocks/BlockGlowstone.h
+++ b/source/blocks/BlockGlowstone.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockGlowstoneHandler : public cBlockHandler

diff --git a/source/blocks/BlockGravel.h b/source/blocks/BlockGravel.h
index d4f36a894..da47db9bb 100644
--- a/source/blocks/BlockGravel.h
+++ b/source/blocks/BlockGravel.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockGravelHandler : public cBlockHandler

diff --git a/source/blocks/Block.cpp b/source/blocks/BlockHandler.cpp
index 98868de7d..f45f40f9e 100644
--- a/source/blocks/Block.cpp
+++ b/source/blocks/BlockHandler.cpp
@@ -1,7 +1,7 @@
 #include "Globals.h"

-#include "Block.h"

-#include "../cItem.h"

-#include "../cWorld.h"

+#include "BlockHandler.h"

+#include "../Item.h"

+#include "../World.h"

 #include "BlockSand.h"

 #include "BlockGravel.h"

 #include "BlockDoor.h"

diff --git a/source/blocks/Block.h b/source/blocks/BlockHandler.h
index 859870c4a..859870c4a 100644
--- a/source/blocks/Block.h
+++ b/source/blocks/BlockHandler.h
diff --git a/source/blocks/BlockIce.h b/source/blocks/BlockIce.h
index d6bb63b0a..cc5cc8920 100644
--- a/source/blocks/BlockIce.h
+++ b/source/blocks/BlockIce.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockIceHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockLadder.h b/source/blocks/BlockLadder.h
index e30fc884d..ee48df848 100644
--- a/source/blocks/BlockLadder.h
+++ b/source/blocks/BlockLadder.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

-#include "../cWorld.h"

-#include "../cLadder.h"

+#include "BlockHandler.h"

+#include "../World.h"

+#include "../Ladder.h"

 

 class cBlockLadderHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockLeaves.h b/source/blocks/BlockLeaves.h
index c2ec697ae..65c47f8de 100644
--- a/source/blocks/BlockLeaves.h
+++ b/source/blocks/BlockLeaves.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 #include "../BlockArea.h"

 

 

diff --git a/source/blocks/BlockMelon.h b/source/blocks/BlockMelon.h
index 3abcc6efb..87fb7e1e8 100644
--- a/source/blocks/BlockMelon.h
+++ b/source/blocks/BlockMelon.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockMelonHandler : public cBlockHandler

diff --git a/source/blocks/BlockMushroom.h b/source/blocks/BlockMushroom.h
index ca787dce6..c4119bad0 100644
--- a/source/blocks/BlockMushroom.h
+++ b/source/blocks/BlockMushroom.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockMushroomHandler : public cBlockHandler

diff --git a/source/blocks/BlockNote.h b/source/blocks/BlockNote.h
index 2c439f623..896a5d03b 100644
--- a/source/blocks/BlockNote.h
+++ b/source/blocks/BlockNote.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "BlockEntity.h"

 

 class cBlockNoteHandler :  public cBlockEntityHandler

diff --git a/source/blocks/BlockOre.h b/source/blocks/BlockOre.h
index 4788c9b89..556a215ce 100644
--- a/source/blocks/BlockOre.h
+++ b/source/blocks/BlockOre.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockOreHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockPiston.cpp b/source/blocks/BlockPiston.cpp
index c2fcdd1f2..a4ed13d88 100644
--- a/source/blocks/BlockPiston.cpp
+++ b/source/blocks/BlockPiston.cpp
@@ -1,10 +1,10 @@
 #include "Globals.h"

 #include "BlockPiston.h"

-#include "../cItem.h"

-#include "../cWorld.h"

-#include "../cRedstone.h"

-#include "../cPlayer.h"

-#include "../cPiston.h"

+#include "../Item.h"

+#include "../World.h"

+#include "../Redstone.h"

+#include "../Player.h"

+#include "../Piston.h"

 

 

 

diff --git a/source/blocks/BlockPiston.h b/source/blocks/BlockPiston.h
index 1493ff27e..dbce9bae5 100644
--- a/source/blocks/BlockPiston.h
+++ b/source/blocks/BlockPiston.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockPistonHandler : public cBlockHandler

diff --git a/source/blocks/BlockRedstone.cpp b/source/blocks/BlockRedstone.cpp
index 58edaa1cd..7653436f4 100644
--- a/source/blocks/BlockRedstone.cpp
+++ b/source/blocks/BlockRedstone.cpp
@@ -1,9 +1,9 @@
 #include "Globals.h"

 #include "BlockRedstone.h"

-#include "../cItem.h"

-#include "../cWorld.h"

-#include "../cRedstone.h"

-#include "../cTorch.h"

+#include "../Item.h"

+#include "../World.h"

+#include "../Redstone.h"

+#include "../Torch.h"

 

 cBlockRedstoneHandler::cBlockRedstoneHandler(BLOCKTYPE a_BlockID)

 	: cBlockHandler(a_BlockID)

diff --git a/source/blocks/BlockRedstone.h b/source/blocks/BlockRedstone.h
index dd2c75fc4..9b83b1b29 100644
--- a/source/blocks/BlockRedstone.h
+++ b/source/blocks/BlockRedstone.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "Block.h"

-#include "../cWorld.h"

+#include "BlockHandler.h"

+#include "../World.h"

 

 class cBlockRedstoneHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockRedstoneRepeater.cpp b/source/blocks/BlockRedstoneRepeater.cpp
index 4921cd6f7..861f6e221 100644
--- a/source/blocks/BlockRedstoneRepeater.cpp
+++ b/source/blocks/BlockRedstoneRepeater.cpp
@@ -1,9 +1,9 @@
 #include "Globals.h"

 #include "BlockRedstoneRepeater.h"

-#include "../cItem.h"

-#include "../cWorld.h"

-#include "../cRedstone.h"

-#include "../cPlayer.h"

+#include "../Item.h"

+#include "../World.h"

+#include "../Redstone.h"

+#include "../Player.h"

 

 cBlockRedstoneRepeaterHandler::cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockID)

 	: cBlockHandler(a_BlockID)

diff --git a/source/blocks/BlockRedstoneRepeater.h b/source/blocks/BlockRedstoneRepeater.h
index c2ed30e2c..a928f554f 100644
--- a/source/blocks/BlockRedstoneRepeater.h
+++ b/source/blocks/BlockRedstoneRepeater.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "Block.h"

-#include "../cWorld.h"

+#include "BlockHandler.h"

+#include "../World.h"

 

 class cBlockRedstoneRepeaterHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockRedstoneTorch.h b/source/blocks/BlockRedstoneTorch.h
index 42d3a0366..eeb2afc5c 100644
--- a/source/blocks/BlockRedstoneTorch.h
+++ b/source/blocks/BlockRedstoneTorch.h
@@ -2,7 +2,7 @@
 #pragma once

 #include "BlockRedstone.h"

 #include "BlockTorch.h"

-#include "../cTorch.h"

+#include "../Torch.h"

 

 

 

diff --git a/source/blocks/BlockSand.h b/source/blocks/BlockSand.h
index 71096c5a7..69fda5ec6 100644
--- a/source/blocks/BlockSand.h
+++ b/source/blocks/BlockSand.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockSandHandler : public cBlockHandler

diff --git a/source/blocks/BlockSapling.h b/source/blocks/BlockSapling.h
index e4ca998cb..c9862349a 100644
--- a/source/blocks/BlockSapling.h
+++ b/source/blocks/BlockSapling.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "Block.h"

-#include "../cWorld.h"

+#include "BlockHandler.h"

+#include "../World.h"

 

 class cBlockSaplingHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockSign.h b/source/blocks/BlockSign.h
index b0f9d7f7f..dd82605b3 100644
--- a/source/blocks/BlockSign.h
+++ b/source/blocks/BlockSign.h
@@ -1,8 +1,8 @@
 #pragma once

-#include "Block.h"

-#include "../cWorld.h"

-#include "../cSign.h"

-#include "../cPlayer.h"

+#include "BlockHandler.h"

+#include "../World.h"

+#include "../Sign.h"

+#include "../Player.h"

 

 class cBlockSignHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockSlab.h b/source/blocks/BlockSlab.h
index 11d1933c3..ad9970d67 100644
--- a/source/blocks/BlockSlab.h
+++ b/source/blocks/BlockSlab.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockSlabHandler : public cBlockHandler

diff --git a/source/blocks/BlockSnow.h b/source/blocks/BlockSnow.h
index ba9d35183..c8e6b4c1c 100644
--- a/source/blocks/BlockSnow.h
+++ b/source/blocks/BlockSnow.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockSnowHandler : public cBlockHandler

diff --git a/source/blocks/BlockStairs.h b/source/blocks/BlockStairs.h
index 4e06a6e3f..4d0007bc5 100644
--- a/source/blocks/BlockStairs.h
+++ b/source/blocks/BlockStairs.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "Block.h"

-#include "../cStairs.h"

+#include "BlockHandler.h"

+#include "../Stairs.h"

 

 class cBlockStairsHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockStems.h b/source/blocks/BlockStems.h
index aa6229536..be4519a52 100644
--- a/source/blocks/BlockStems.h
+++ b/source/blocks/BlockStems.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockStemsHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockStone.h b/source/blocks/BlockStone.h
index bd644a3a4..8b645bf1e 100644
--- a/source/blocks/BlockStone.h
+++ b/source/blocks/BlockStone.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../MersenneTwister.h"

-#include "../cWorld.h"

+#include "../World.h"

 

 class cBlockStoneHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockSugarcane.h b/source/blocks/BlockSugarcane.h
index 4b0cb5408..1d477b42b 100644
--- a/source/blocks/BlockSugarcane.h
+++ b/source/blocks/BlockSugarcane.h
@@ -1,6 +1,6 @@
 

 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 

diff --git a/source/blocks/BlockTallGrass.h b/source/blocks/BlockTallGrass.h
index 6e7854db8..f5bb1b373 100644
--- a/source/blocks/BlockTallGrass.h
+++ b/source/blocks/BlockTallGrass.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockTallGrassHandler : public cBlockHandler

diff --git a/source/blocks/BlockTorch.h b/source/blocks/BlockTorch.h
index f3b172bf9..450b5ecab 100644
--- a/source/blocks/BlockTorch.h
+++ b/source/blocks/BlockTorch.h
@@ -1,8 +1,8 @@
 

 #pragma once

-#include "Block.h"

-#include "../cTorch.h"

-#include "../cWorld.h"

+#include "BlockHandler.h"

+#include "../Torch.h"

+#include "../World.h"

 

 

 

diff --git a/source/blocks/BlockVine.h b/source/blocks/BlockVine.h
index 6b8d85339..56317219a 100644
--- a/source/blocks/BlockVine.h
+++ b/source/blocks/BlockVine.h
@@ -1,6 +1,6 @@
 #pragma once

-#include "Block.h"

-#include "../cVine.h"

+#include "BlockHandler.h"

+#include "../Vine.h"

 

 class cBlockVineHandler : public cBlockHandler

 {

diff --git a/source/blocks/BlockWood.h b/source/blocks/BlockWood.h
index 5e6615c1b..d71d5d71c 100644
--- a/source/blocks/BlockWood.h
+++ b/source/blocks/BlockWood.h
@@ -1,5 +1,5 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 

 

 class cBlockWoodHandler : public cBlockHandler

diff --git a/source/blocks/BlockWorkbench.h b/source/blocks/BlockWorkbench.h
index 776628382..c1c004dc5 100644
--- a/source/blocks/BlockWorkbench.h
+++ b/source/blocks/BlockWorkbench.h
@@ -1,7 +1,7 @@
 #pragma once

-#include "Block.h"

+#include "BlockHandler.h"

 #include "../UI/Window.h"

-#include "../cPlayer.h"

+#include "../Player.h"