6 files changed, 29 insertions, 33 deletions

diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderChest.h
index aae16ccec..2e0da0f17 100644
--- a/src/Blocks/BlockEnderchest.h
+++ b/src/Blocks/BlockEnderChest.h
@@ -6,7 +6,7 @@
 
 
 
-class cBlockEnderchestHandler final :
+class cBlockEnderChestHandler final :
 	public cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>
 {
 	using Super = cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>;
@@ -38,7 +38,3 @@ private:
 	}
 
 };
-
-
-
-
diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index 2ce7904ab..937f800fd 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -33,7 +33,7 @@
 #include "BlockDropSpenser.h"
 #include "BlockEnchantingTable.h"
 #include "BlockEndPortalFrame.h"
-#include "BlockEnderchest.h"
+#include "BlockEnderChest.h"
 #include "BlockEntity.h"
 #include "BlockFarmland.h"
 #include "BlockFence.h"
@@ -75,7 +75,7 @@
 #include "BlockPumpkin.h"
 #include "BlockQuartz.h"
 #include "BlockRail.h"
-#include "BlockRedstone.h"
+#include "BlockRedstoneWire.h"
 #include "BlockRedstoneLamp.h"
 #include "BlockRedstoneOre.h"
 #include "BlockRedstoneRepeater.h"
@@ -91,14 +91,14 @@
 #include "BlockStairs.h"
 #include "BlockStems.h"
 #include "BlockStone.h"
-#include "BlockSugarcane.h"
+#include "BlockSugarCane.h"
 #include "BlockTNT.h"
 #include "BlockTallGrass.h"
 #include "BlockTorch.h"
 #include "BlockTrapdoor.h"
 #include "BlockTripwire.h"
 #include "BlockTripwireHook.h"
-#include "BlockVine.h"
+#include "BlockVines.h"
 #include "BlockWallSign.h"
 #include "BlockWorkbench.h"
 
@@ -215,14 +215,14 @@ namespace
 	constexpr cBlockStairsHandler             BlockBirchWoodStairsHandler       (E_BLOCK_BIRCH_WOOD_STAIRS);
 	constexpr cBlockGlazedTerracottaHandler   BlockBlackGlazedTerracottaHandler (E_BLOCK_BLACK_GLAZED_TERRACOTTA);
 	constexpr cDefaultBlockHandler            BlockBlackShulkerBoxHandler       (E_BLOCK_BLACK_SHULKER_BOX);
-	constexpr cDefaultBlockHandler            BlockBlockOfCoalHandler           (E_BLOCK_BLOCK_OF_COAL);
-	constexpr cDefaultBlockHandler            BlockBlockOfRedstoneHandler       (E_BLOCK_BLOCK_OF_REDSTONE);
+	constexpr cDefaultBlockHandler            BlockCoalBlockHandler             (E_BLOCK_BLOCK_OF_COAL);
+	constexpr cDefaultBlockHandler            BlockRedstoneBlockHandler         (E_BLOCK_BLOCK_OF_REDSTONE);
 	constexpr cBlockGlazedTerracottaHandler   BlockBlueGlazedTerracottaHandler  (E_BLOCK_BLUE_GLAZED_TERRACOTTA);
 	constexpr cDefaultBlockHandler            BlockBlueShulkerBoxHandler        (E_BLOCK_BLUE_SHULKER_BOX);
 	constexpr cDefaultBlockHandler            BlockBoneBlockHandler             (E_BLOCK_BONE_BLOCK);
 	constexpr cBlockBookShelfHandler          BlockBookcaseHandler              (E_BLOCK_BOOKCASE);
 	constexpr cBlockBrewingStandHandler       BlockBrewingStandHandler          (E_BLOCK_BREWING_STAND);
-	constexpr cDefaultBlockHandler            BlockBrickHandler                 (E_BLOCK_BRICK);
+	constexpr cDefaultBlockHandler            BlockBricksHandler                (E_BLOCK_BRICK);
 	constexpr cBlockStairsHandler             BlockBrickStairsHandler           (E_BLOCK_BRICK_STAIRS);
 	constexpr cBlockGlazedTerracottaHandler   BlockBrownGlazedTerracottaHandler (E_BLOCK_BROWN_GLAZED_TERRACOTTA);
 	constexpr cBlockMushroomHandler           BlockBrownMushroomHandler         (E_BLOCK_BROWN_MUSHROOM);
@@ -274,7 +274,7 @@ namespace
 	constexpr cDefaultBlockHandler            BlockEndPortalHandler             (E_BLOCK_END_PORTAL);
 	constexpr cDefaultBlockHandler            BlockEndRodHandler                (E_BLOCK_END_ROD);
 	constexpr cDefaultBlockHandler            BlockEndStoneHandler              (E_BLOCK_END_STONE);
-	constexpr cBlockEnderchestHandler         BlockEnderChestHandler            (E_BLOCK_ENDER_CHEST);
+	constexpr cBlockEnderChestHandler         BlockEnderChestHandler            (E_BLOCK_ENDER_CHEST);
 	constexpr cBlockFarmlandHandler           BlockFarmlandHandler              (E_BLOCK_FARMLAND);
 	constexpr cBlockFenceHandler              BlockFenceHandler                 (E_BLOCK_FENCE);
 	constexpr cBlockFireHandler               BlockFireHandler                  (E_BLOCK_FIRE);
@@ -339,7 +339,7 @@ namespace
 	constexpr cDefaultBlockHandler            BlockMossyCobblestoneHandler      (E_BLOCK_MOSSY_COBBLESTONE);
 	constexpr cBlockMyceliumHandler           BlockMyceliumHandler              (E_BLOCK_MYCELIUM);
 	constexpr cBlockFenceHandler              BlockNetherBrickFenceHandler      (E_BLOCK_NETHER_BRICK_FENCE);
-	constexpr cDefaultBlockHandler            BlockNetherBrickHandler           (E_BLOCK_NETHER_BRICK);
+	constexpr cDefaultBlockHandler            BlockNetherBricksHandler          (E_BLOCK_NETHER_BRICK);
 	constexpr cBlockStairsHandler             BlockNetherBrickStairsHandler     (E_BLOCK_NETHER_BRICK_STAIRS);
 	constexpr cBlockPortalHandler             BlockNetherPortalHandler          (E_BLOCK_NETHER_PORTAL);
 	constexpr cDefaultOreHandler              BlockNetherQuartzOreHandler       (E_BLOCK_NETHER_QUARTZ_ORE);
@@ -380,7 +380,7 @@ namespace
 	constexpr cBlockRailHandler               BlockRailHandler                  (E_BLOCK_RAIL);
 	constexpr cBlockGlazedTerracottaHandler   BlockRedGlazedTerracottaHandler   (E_BLOCK_RED_GLAZED_TERRACOTTA);
 	constexpr cBlockMushroomHandler           BlockRedMushroomHandler           (E_BLOCK_RED_MUSHROOM);
-	constexpr cDefaultBlockHandler            BlockRedNetherBrickHandler        (E_BLOCK_RED_NETHER_BRICK);
+	constexpr cDefaultBlockHandler            BlockRedNetherBricksHandler       (E_BLOCK_RED_NETHER_BRICK);
 	constexpr cBlockFlowerHandler             BlockRedRoseHandler               (E_BLOCK_RED_ROSE);
 	constexpr cDefaultBlockHandler            BlockRedSandstoneHandler          (E_BLOCK_RED_SANDSTONE);
 	constexpr cBlockSlabHandler               BlockRedSandstoneSlabHandler      (E_BLOCK_RED_SANDSTONE_SLAB);
@@ -393,7 +393,7 @@ namespace
 	constexpr cBlockRedstoneRepeaterHandler   BlockRedstoneRepeaterOnHandler    (E_BLOCK_REDSTONE_REPEATER_ON);
 	constexpr cBlockRedstoneTorchHandler      BlockRedstoneTorchOffHandler      (E_BLOCK_REDSTONE_TORCH_OFF);
 	constexpr cBlockRedstoneTorchHandler      BlockRedstoneTorchOnHandler       (E_BLOCK_REDSTONE_TORCH_ON);
-	constexpr cBlockRedstoneHandler           BlockRedstoneWireHandler          (E_BLOCK_REDSTONE_WIRE);
+	constexpr cBlockRedstoneWireHandler       BlockRedstoneWireHandler          (E_BLOCK_REDSTONE_WIRE);
 	constexpr cBlockCommandBlockHandler       BlockRepeatingCommandBlockHandler (E_BLOCK_REPEATING_COMMAND_BLOCK);
 	constexpr cBlockSandHandler               BlockSandHandler                  (E_BLOCK_SAND);
 	constexpr cDefaultBlockHandler            BlockSandstoneHandler             (E_BLOCK_SANDSTONE);
@@ -425,15 +425,15 @@ namespace
 	constexpr cBlockSlabHandler               BlockStoneSlabHandler             (E_BLOCK_STONE_SLAB);
 	constexpr cDefaultBlockHandler            BlockStructureBlockHandler        (E_BLOCK_STRUCTURE_BLOCK);
 	constexpr cDefaultBlockHandler            BlockStructureVoidHandler         (E_BLOCK_STRUCTURE_VOID);
-	constexpr cBlockSugarcaneHandler          BlockSugarcaneHandler             (E_BLOCK_SUGARCANE);
+	constexpr cBlockSugarCaneHandler          BlockSugarCaneHandler             (E_BLOCK_SUGARCANE);
 	constexpr cBlockTallGrassHandler          BlockTallGrassHandler             (E_BLOCK_TALL_GRASS);
-	constexpr cBlockTNTHandler                BlockTntHandler                   (E_BLOCK_TNT);
+	constexpr cBlockTNTHandler                BlockTNTHandler                   (E_BLOCK_TNT);
 	constexpr cBlockTorchHandler              BlockTorchHandler                 (E_BLOCK_TORCH);
 	constexpr cBlockTrapdoorHandler           BlockTrapdoorHandler              (E_BLOCK_TRAPDOOR);
 	constexpr cBlockChestHandler              BlockTrappedChestHandler          (E_BLOCK_TRAPPED_CHEST);
 	constexpr cBlockTripwireHandler           BlockTripwireHandler              (E_BLOCK_TRIPWIRE);
 	constexpr cBlockTripwireHookHandler       BlockTripwireHookHandler          (E_BLOCK_TRIPWIRE_HOOK);
-	constexpr cBlockVineHandler               BlockVinesHandler                 (E_BLOCK_VINES);
+	constexpr cBlockVinesHandler              BlockVinesHandler                 (E_BLOCK_VINES);
 	constexpr cBlockBannerHandler             BlockWallBannerHandler            (E_BLOCK_WALL_BANNER);
 	constexpr cBlockWallSignHandler           BlockWallsignHandler              (E_BLOCK_WALLSIGN);
 	constexpr cBlockWaterHandler              BlockWaterHandler                 (E_BLOCK_WATER);
@@ -655,14 +655,14 @@ const cBlockHandler & cBlockHandler::For(BLOCKTYPE a_BlockType)
 		case E_BLOCK_BIRCH_WOOD_STAIRS:             return BlockBirchWoodStairsHandler;
 		case E_BLOCK_BLACK_GLAZED_TERRACOTTA:       return BlockBlackGlazedTerracottaHandler;
 		case E_BLOCK_BLACK_SHULKER_BOX:             return BlockBlackShulkerBoxHandler;
-		case E_BLOCK_BLOCK_OF_COAL:                 return BlockBlockOfCoalHandler;
-		case E_BLOCK_BLOCK_OF_REDSTONE:             return BlockBlockOfRedstoneHandler;
+		case E_BLOCK_BLOCK_OF_COAL:                 return BlockCoalBlockHandler;
+		case E_BLOCK_BLOCK_OF_REDSTONE:             return BlockRedstoneBlockHandler;
 		case E_BLOCK_BLUE_GLAZED_TERRACOTTA:        return BlockBlueGlazedTerracottaHandler;
 		case E_BLOCK_BLUE_SHULKER_BOX:              return BlockBlueShulkerBoxHandler;
 		case E_BLOCK_BONE_BLOCK:                    return BlockBoneBlockHandler;
 		case E_BLOCK_BOOKCASE:                      return BlockBookcaseHandler;
 		case E_BLOCK_BREWING_STAND:                 return BlockBrewingStandHandler;
-		case E_BLOCK_BRICK:                         return BlockBrickHandler;
+		case E_BLOCK_BRICK:                         return BlockBricksHandler;
 		case E_BLOCK_BRICK_STAIRS:                  return BlockBrickStairsHandler;
 		case E_BLOCK_BROWN_GLAZED_TERRACOTTA:       return BlockBrownGlazedTerracottaHandler;
 		case E_BLOCK_BROWN_MUSHROOM:                return BlockBrownMushroomHandler;
@@ -779,7 +779,7 @@ const cBlockHandler & cBlockHandler::For(BLOCKTYPE a_BlockType)
 		case E_BLOCK_MOSSY_COBBLESTONE:             return BlockMossyCobblestoneHandler;
 		case E_BLOCK_MYCELIUM:                      return BlockMyceliumHandler;
 		case E_BLOCK_NETHERRACK:                    return BlockNetherrackHandler;
-		case E_BLOCK_NETHER_BRICK:                  return BlockNetherBrickHandler;
+		case E_BLOCK_NETHER_BRICK:                  return BlockNetherBricksHandler;
 		case E_BLOCK_NETHER_BRICK_FENCE:            return BlockNetherBrickFenceHandler;
 		case E_BLOCK_NETHER_BRICK_STAIRS:           return BlockNetherBrickStairsHandler;
 		case E_BLOCK_NETHER_PORTAL:                 return BlockNetherPortalHandler;
@@ -829,7 +829,7 @@ const cBlockHandler & cBlockHandler::For(BLOCKTYPE a_BlockType)
 		case E_BLOCK_REDSTONE_WIRE:                 return BlockRedstoneWireHandler;
 		case E_BLOCK_RED_GLAZED_TERRACOTTA:         return BlockRedGlazedTerracottaHandler;
 		case E_BLOCK_RED_MUSHROOM:                  return BlockRedMushroomHandler;
-		case E_BLOCK_RED_NETHER_BRICK:              return BlockRedNetherBrickHandler;
+		case E_BLOCK_RED_NETHER_BRICK:              return BlockRedNetherBricksHandler;
 		case E_BLOCK_RED_ROSE:                      return BlockRedRoseHandler;
 		case E_BLOCK_RED_SANDSTONE:                 return BlockRedSandstoneHandler;
 		case E_BLOCK_RED_SANDSTONE_SLAB:            return BlockRedSandstoneSlabHandler;
@@ -867,9 +867,9 @@ const cBlockHandler & cBlockHandler::For(BLOCKTYPE a_BlockType)
 		case E_BLOCK_STONE_SLAB:                    return BlockStoneSlabHandler;
 		case E_BLOCK_STRUCTURE_BLOCK:               return BlockStructureBlockHandler;
 		case E_BLOCK_STRUCTURE_VOID:                return BlockStructureVoidHandler;
-		case E_BLOCK_SUGARCANE:                     return BlockSugarcaneHandler;
+		case E_BLOCK_SUGARCANE:                     return BlockSugarCaneHandler;
 		case E_BLOCK_TALL_GRASS:                    return BlockTallGrassHandler;
-		case E_BLOCK_TNT:                           return BlockTntHandler;
+		case E_BLOCK_TNT:                           return BlockTNTHandler;
 		case E_BLOCK_TORCH:                         return BlockTorchHandler;
 		case E_BLOCK_TRAPDOOR:                      return BlockTrapdoorHandler;
 		case E_BLOCK_TRAPPED_CHEST:                 return BlockTrappedChestHandler;
diff --git a/src/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstoneWire.h
index d77ff151a..3976afa90 100644
--- a/src/Blocks/BlockRedstone.h
+++ b/src/Blocks/BlockRedstoneWire.h
@@ -8,7 +8,7 @@
 
 
 
-class cBlockRedstoneHandler final :
+class cBlockRedstoneWireHandler final :
 	public cBlockHandler
 {
 	using Super = cBlockHandler;
diff --git a/src/Blocks/BlockSugarcane.h b/src/Blocks/BlockSugarCane.h
index bf5ae5e73..cffe667e5 100644
--- a/src/Blocks/BlockSugarcane.h
+++ b/src/Blocks/BlockSugarCane.h
@@ -7,7 +7,7 @@
 
 
 
-class cBlockSugarcaneHandler final :
+class cBlockSugarCaneHandler final :
 	public cBlockPlant<false>
 {
 	using Super = cBlockPlant<false>;
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVines.h
index da4d6dfc3..d6eccd552 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVines.h
@@ -6,7 +6,7 @@
 
 
 
-class cBlockVineHandler final :
+class cBlockVinesHandler final :
 	public cBlockHandler
 {
 	using Super = cBlockHandler;
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index f69350c30..a7dd7b675 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -34,7 +34,7 @@ target_sources(
 	BlockDoor.h
 	BlockDropSpenser.h
 	BlockEnchantingTable.h
-	BlockEnderchest.h
+	BlockEnderChest.h
 	BlockEndPortalFrame.h
 	BlockEntity.h
 	BlockFarmland.h
@@ -80,7 +80,7 @@ target_sources(
 	BlockPumpkin.h
 	BlockQuartz.h
 	BlockRail.h
-	BlockRedstone.h
+	BlockRedstoneWire.h
 	BlockRedstoneLamp.h
 	BlockRedstoneOre.h
 	BlockRedstoneRepeater.h
@@ -96,14 +96,14 @@ target_sources(
 	BlockStairs.h
 	BlockStems.h
 	BlockStone.h
-	BlockSugarcane.h
+	BlockSugarCane.h
 	BlockTNT.h
 	BlockTallGrass.h
 	BlockTorch.h
 	BlockTrapdoor.h
 	BlockTripwire.h
 	BlockTripwireHook.h
-	BlockVine.h
+	BlockVines.h
 	BlockWallSign.h
 	BlockWorkbench.h
 	BroadcastInterface.h