65 files changed, 177 insertions, 163 deletions

diff --git a/src/Blocks/BlockAnvil.h b/src/Blocks/BlockAnvil.h
index da242fdb7..f113f7905 100644
--- a/src/Blocks/BlockAnvil.h
+++ b/src/Blocks/BlockAnvil.h
@@ -10,14 +10,15 @@
 
 
 
-class cBlockAnvilHandler :
+class cBlockAnvilHandler:
 	public cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>
 {
+	using Super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
+
 public:
-	using super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
 
-	cBlockAnvilHandler(BLOCKTYPE a_BlockType)
-		: super(a_BlockType)
+	cBlockAnvilHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 	}
 
@@ -48,7 +49,7 @@ public:
 		BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
 	) override
 	{
-		if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
+		if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
 		{
 			return false;
 		}
diff --git a/src/Blocks/BlockBed.h b/src/Blocks/BlockBed.h
index ecf1f0d88..6793585b8 100644
--- a/src/Blocks/BlockBed.h
+++ b/src/Blocks/BlockBed.h
@@ -18,12 +18,12 @@ class cWorldInterface;
 class cBlockBedHandler :
 	public cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>
 {
-	using super = cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>;
+	using Super = cYawRotator<cBlockEntityHandler, 0x03, 0x02, 0x03, 0x00, 0x01>;
 
 public:
 
 	cBlockBedHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockBigFlower.h b/src/Blocks/BlockBigFlower.h
index 720c8f40a..e7bd9b957 100644
--- a/src/Blocks/BlockBigFlower.h
+++ b/src/Blocks/BlockBigFlower.h
@@ -12,12 +12,12 @@
 class cBlockBigFlowerHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockBigFlowerHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockBrewingStand.h b/src/Blocks/BlockBrewingStand.h
index 6f8966e47..b8a8b2dc0 100644
--- a/src/Blocks/BlockBrewingStand.h
+++ b/src/Blocks/BlockBrewingStand.h
@@ -11,12 +11,12 @@
 class cBlockBrewingStandHandler :
 	public cBlockEntityHandler
 {
-	using super = cBlockEntityHandler;
+	using Super = cBlockEntityHandler;
 
 public:
 
 	cBlockBrewingStandHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h
index 10d3569d0..c09dec56c 100644
--- a/src/Blocks/BlockButton.h
+++ b/src/Blocks/BlockButton.h
@@ -11,12 +11,12 @@
 class cBlockButtonHandler :
 	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>
 {
-	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>;
+	using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, true>>;
 
 public:
 
 	cBlockButtonHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h
index a00f5b6d4..db65ea15f 100644
--- a/src/Blocks/BlockCactus.h
+++ b/src/Blocks/BlockCactus.h
@@ -10,12 +10,12 @@
 class cBlockCactusHandler :
 	public cClearMetaOnDrop<cBlockPlant<false>>
 {
-	using super = cClearMetaOnDrop<cBlockPlant<false>>;
+	using Super = cClearMetaOnDrop<cBlockPlant<false>>;
 
 public:
 
 	cBlockCactusHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -159,7 +159,7 @@ protected:
 		// Only allow growing if there's an air block above:
 		if (((a_RelPos.y + 1) < cChunkDef::Height) && (a_Chunk.GetBlock(a_RelPos.addedY(1)) == E_BLOCK_AIR))
 		{
-			return super::CanGrow(a_Chunk, a_RelPos);
+			return Super::CanGrow(a_Chunk, a_RelPos);
 		}
 		return paStay;
 	}
diff --git a/src/Blocks/BlockCake.h b/src/Blocks/BlockCake.h
index 6a80e939c..e30a79db1 100644
--- a/src/Blocks/BlockCake.h
+++ b/src/Blocks/BlockCake.h
@@ -9,10 +9,10 @@
 class cBlockCakeHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 public:
 	cBlockCakeHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockCarpet.h b/src/Blocks/BlockCarpet.h
index 2b2ae2434..9f315caa8 100644
--- a/src/Blocks/BlockCarpet.h
+++ b/src/Blocks/BlockCarpet.h
@@ -17,12 +17,12 @@
 class cBlockCarpetHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockCarpetHandler(BLOCKTYPE a_BlockType) :
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockCauldron.h b/src/Blocks/BlockCauldron.h
index d6ef721ad..37f274f18 100644
--- a/src/Blocks/BlockCauldron.h
+++ b/src/Blocks/BlockCauldron.h
@@ -10,12 +10,12 @@
 class cBlockCauldronHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockCauldronHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockChest.h b/src/Blocks/BlockChest.h
index cd70c95b6..aeb687abb 100644
--- a/src/Blocks/BlockChest.h
+++ b/src/Blocks/BlockChest.h
@@ -13,12 +13,12 @@
 class cBlockChestHandler :
 	public cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>
 {
-	using super = cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>;
+	using Super = cYawRotator<cContainerEntityHandler<cBlockEntityHandler>, 0x07, 0x03, 0x04, 0x02, 0x05>;
 
 public:
 
 	cBlockChestHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -48,7 +48,7 @@ public:
 		}
 
 		// Get meta as if this was a single-chest:
-		if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
+		if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta))
 		{
 			return false;
 		}
diff --git a/src/Blocks/BlockCocoaPod.h b/src/Blocks/BlockCocoaPod.h
index 415ea4cf1..11190e0ba 100644
--- a/src/Blocks/BlockCocoaPod.h
+++ b/src/Blocks/BlockCocoaPod.h
@@ -10,11 +10,11 @@
 class cBlockCocoaPodHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 	cBlockCocoaPodHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockCommandBlock.h b/src/Blocks/BlockCommandBlock.h
index 70b98baf0..4bd47963c 100644
--- a/src/Blocks/BlockCommandBlock.h
+++ b/src/Blocks/BlockCommandBlock.h
@@ -10,12 +10,12 @@
 class cBlockCommandBlockHandler :
 	public cBlockEntityHandler
 {
-	using super = cBlockEntityHandler;
+	using Super = cBlockEntityHandler;
 
 public:
 
 	cBlockCommandBlockHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockComparator.h b/src/Blocks/BlockComparator.h
index 0826e3133..5e6b3eaa6 100644
--- a/src/Blocks/BlockComparator.h
+++ b/src/Blocks/BlockComparator.h
@@ -12,12 +12,12 @@
 class cBlockComparatorHandler :
 	public cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>
 {
-	using super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
+	using Super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
 
 public:
 
 	cBlockComparatorHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockConcretePowder.h b/src/Blocks/BlockConcretePowder.h
index 58dfade99..d3133a571 100644
--- a/src/Blocks/BlockConcretePowder.h
+++ b/src/Blocks/BlockConcretePowder.h
@@ -10,12 +10,12 @@
 class cBlockConcretePowderHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockConcretePowderHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -33,7 +33,7 @@ public:
 		{
 			return;
 		}
-		super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
+		Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
 	}
 
 
diff --git a/src/Blocks/BlockCrops.h b/src/Blocks/BlockCrops.h
index 0dc0ebbb8..4622d1ad5 100644
--- a/src/Blocks/BlockCrops.h
+++ b/src/Blocks/BlockCrops.h
@@ -13,12 +13,12 @@ template <NIBBLETYPE RipeMeta>
 class cBlockCropsHandler:
 	public cBlockPlant<true>
 {
-	using super = cBlockPlant<true>;
+	using Super = cBlockPlant<true>;
 
 public:
 
 	cBlockCropsHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockDeadBush.h b/src/Blocks/BlockDeadBush.h
index 0b7d27e8b..52c9ac594 100644
--- a/src/Blocks/BlockDeadBush.h
+++ b/src/Blocks/BlockDeadBush.h
@@ -7,21 +7,30 @@
 
 
 
-class cBlockDeadBushHandler :
+class cBlockDeadBushHandler:
 	public cBlockHandler
 {
-	typedef cBlockHandler super;
+	using Super = cBlockHandler;
+
 public:
-	cBlockDeadBushHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+	cBlockDeadBushHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 	}
 
+
+
+
+
 	virtual bool DoesIgnoreBuildCollision(cChunkInterface & a_ChunkInterface, Vector3i a_Pos, cPlayer & a_Player, NIBBLETYPE a_Meta) override
 	{
 		return true;
 	}
 
+
+
+
+
 	virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
 	{
 		if (a_RelY <= 0)
diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h
index 9a6c6104b..24c726149 100644
--- a/src/Blocks/BlockDirt.h
+++ b/src/Blocks/BlockDirt.h
@@ -10,12 +10,12 @@
 class cBlockDirtHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockDirtHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp
index d9a4f12ec..bb694e5b2 100644
--- a/src/Blocks/BlockDoor.cpp
+++ b/src/Blocks/BlockDoor.cpp
@@ -8,7 +8,7 @@
 
 
 cBlockDoorHandler::cBlockDoorHandler(BLOCKTYPE a_BlockType):
-	super(a_BlockType)
+	Super(a_BlockType)
 {
 }
 
@@ -123,7 +123,7 @@ NIBBLETYPE cBlockDoorHandler::MetaRotateCCW(NIBBLETYPE a_Meta)
 	else
 	{
 		// Rotate the bottom block
-		return super::MetaRotateCCW(a_Meta);
+		return Super::MetaRotateCCW(a_Meta);
 	}
 }
 
@@ -141,7 +141,7 @@ NIBBLETYPE cBlockDoorHandler::MetaRotateCW(NIBBLETYPE a_Meta)
 	else
 	{
 		// Rotate the bottom block
-		return super::MetaRotateCW(a_Meta);
+		return Super::MetaRotateCW(a_Meta);
 	}
 }
 
diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h
index be589ed29..48c761d05 100644
--- a/src/Blocks/BlockDoor.h
+++ b/src/Blocks/BlockDoor.h
@@ -14,7 +14,7 @@
 class cBlockDoorHandler :
 	public cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>
 {
-	using super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
+	using Super = cYawRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x01, 0x02>;
 
 public:
 
@@ -50,7 +50,7 @@ public:
 			return false;
 		}
 
-		return super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta);
+		return Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, a_BlockMeta);
 	}
 
 	virtual cBoundingBox GetPlacementCollisionBox(BLOCKTYPE a_XM, BLOCKTYPE a_XP, BLOCKTYPE a_YM, BLOCKTYPE a_YP, BLOCKTYPE a_ZM, BLOCKTYPE a_ZP) override;
diff --git a/src/Blocks/BlockDropSpenser.h b/src/Blocks/BlockDropSpenser.h
index 2cade1210..90ed1b7d7 100644
--- a/src/Blocks/BlockDropSpenser.h
+++ b/src/Blocks/BlockDropSpenser.h
@@ -16,12 +16,12 @@
 class cBlockDropSpenserHandler :
 	public cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>
 {
-	using super = cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
+	using Super = cPitchYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>;
 
 public:
 
 	cBlockDropSpenserHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h
index f3df6da28..8e96bec95 100644
--- a/src/Blocks/BlockEnderchest.h
+++ b/src/Blocks/BlockEnderchest.h
@@ -10,12 +10,12 @@
 class cBlockEnderchestHandler :
 	public cYawRotator<cBlockEntityHandler>
 {
-	using super = cYawRotator<cBlockEntityHandler>;
+	using Super = cYawRotator<cBlockEntityHandler>;
 
 public:
 
 	cBlockEnderchestHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockEntity.h b/src/Blocks/BlockEntity.h
index f592dbd83..8e7f92913 100644
--- a/src/Blocks/BlockEntity.h
+++ b/src/Blocks/BlockEntity.h
@@ -15,12 +15,12 @@ Forwards the "use" event to the block entity. */
 class cBlockEntityHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockEntityHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h
index 261103a50..20898b5e3 100644
--- a/src/Blocks/BlockFarmland.h
+++ b/src/Blocks/BlockFarmland.h
@@ -19,12 +19,12 @@
 class cBlockFarmlandHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockFarmlandHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockFenceGate.h b/src/Blocks/BlockFenceGate.h
index 5646c51b2..5d89ae021 100644
--- a/src/Blocks/BlockFenceGate.h
+++ b/src/Blocks/BlockFenceGate.h
@@ -11,12 +11,12 @@
 class cBlockFenceGateHandler :
 	public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>
 {
-	using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>;
+	using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x02, 0x03, 0x00, 0x01>>;
 
 public:
 
 	cBlockFenceGateHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockFlowerPot.h b/src/Blocks/BlockFlowerPot.h
index b552e2c81..6d64eb5f8 100644
--- a/src/Blocks/BlockFlowerPot.h
+++ b/src/Blocks/BlockFlowerPot.h
@@ -10,12 +10,12 @@
 class cBlockFlowerPotHandler :
 	public cBlockEntityHandler
 {
-	using super = cBlockEntityHandler;
+	using Super = cBlockEntityHandler;
 
 public:
 
 	cBlockFlowerPotHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockFluid.h b/src/Blocks/BlockFluid.h
index 430940df0..36f363a92 100644
--- a/src/Blocks/BlockFluid.h
+++ b/src/Blocks/BlockFluid.h
@@ -7,14 +7,15 @@
 
 
 
-class cBlockFluidHandler :
+class cBlockFluidHandler:
 	public cBlockHandler
 {
-	typedef cBlockHandler super;
+	using Super = cBlockHandler;
 
 public:
-	cBlockFluidHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+
+	cBlockFluidHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 
 	}
@@ -61,7 +62,7 @@ public:
 				break;
 			}
 		}
-		super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
+		Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
 	}
 
 
@@ -96,14 +97,15 @@ public:
 
 
 
-class cBlockLavaHandler :
+class cBlockLavaHandler:
 	public cBlockFluidHandler
 {
-	typedef cBlockFluidHandler super;
+	using Super = cBlockFluidHandler;
+
 public:
 
-	cBlockLavaHandler(BLOCKTYPE a_BlockType) :
-		super(a_BlockType)
+	cBlockLavaHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockFurnace.h b/src/Blocks/BlockFurnace.h
index c4044a0b2..b4efb6638 100644
--- a/src/Blocks/BlockFurnace.h
+++ b/src/Blocks/BlockFurnace.h
@@ -11,12 +11,12 @@
 class cBlockFurnaceHandler :
 	public cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>
 {
-	using super = cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>;
+	using Super = cYawRotator<cBlockEntityHandler, 0x07, 0x03, 0x04, 0x02, 0x05>;
 
 public:
 
 	cBlockFurnaceHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockHopper.h b/src/Blocks/BlockHopper.h
index 0c6724d76..a8d59440d 100644
--- a/src/Blocks/BlockHopper.h
+++ b/src/Blocks/BlockHopper.h
@@ -10,12 +10,12 @@
 class cBlockHopperHandler :
 	public cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>
 {
-	using super = cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>;
+	using Super = cPitchYawRotator<cContainerEntityHandler<cBlockEntityHandler>>;
 
 public:
 
 	cBlockHopperHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockIce.h b/src/Blocks/BlockIce.h
index a39162d79..5e2fd9dbb 100644
--- a/src/Blocks/BlockIce.h
+++ b/src/Blocks/BlockIce.h
@@ -10,12 +10,12 @@
 class cBlockIceHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockIceHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockLadder.h b/src/Blocks/BlockLadder.h
index 90e2d8304..c141faeb4 100644
--- a/src/Blocks/BlockLadder.h
+++ b/src/Blocks/BlockLadder.h
@@ -11,12 +11,12 @@
 class cBlockLadderHandler :
 	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04> >
 {
-	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>;
+	using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x07, 0x02, 0x05, 0x03, 0x04>>;
 
 public:
 
 	cBlockLadderHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockLever.h b/src/Blocks/BlockLever.h
index e4b181a24..8425b6620 100644
--- a/src/Blocks/BlockLever.h
+++ b/src/Blocks/BlockLever.h
@@ -9,12 +9,12 @@
 class cBlockLeverHandler :
 	public cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>
 {
-	using super = cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>;
+	using Super = cMetaRotator<cBlockHandler, 0x07, 0x04, 0x01, 0x03, 0x02, false>;
 
 public:
 
 	cBlockLeverHandler(BLOCKTYPE a_BlockType) :
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -164,7 +164,7 @@ public:
 			case 0x05: return 0x06;  // Ground rotation
 			case 0x06: return 0x05;
 
-			default:  return super::MetaRotateCCW(a_Meta);  // Wall Rotation
+			default:  return Super::MetaRotateCCW(a_Meta);  // Wall Rotation
 		}
 	}
 
@@ -182,7 +182,7 @@ public:
 			case 0x05: return 0x06;  // Ground rotation
 			case 0x06: return 0x05;
 
-			default:  return super::MetaRotateCW(a_Meta);  // Wall Rotation
+			default:  return Super::MetaRotateCW(a_Meta);  // Wall Rotation
 		}
 	}
 
diff --git a/src/Blocks/BlockLilypad.h b/src/Blocks/BlockLilypad.h
index 9c4edaecc..c51eb0a3d 100644
--- a/src/Blocks/BlockLilypad.h
+++ b/src/Blocks/BlockLilypad.h
@@ -7,14 +7,15 @@
 
 
 
-class cBlockLilypadHandler :
+class cBlockLilypadHandler:
 	public cClearMetaOnDrop<cBlockHandler>
 {
-	typedef cClearMetaOnDrop<cBlockHandler> super;
+	using Super = cClearMetaOnDrop<cBlockHandler>;
+
 public:
 
-	cBlockLilypadHandler(BLOCKTYPE a_BlockType) :
-		super(a_BlockType)
+	cBlockLilypadHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockMelon.h b/src/Blocks/BlockMelon.h
index 3a25a0e2d..d6b9e6a46 100644
--- a/src/Blocks/BlockMelon.h
+++ b/src/Blocks/BlockMelon.h
@@ -10,12 +10,12 @@
 class cBlockMelonHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockMelonHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h
index cdee5c297..2fc8b177d 100644
--- a/src/Blocks/BlockMobHead.h
+++ b/src/Blocks/BlockMobHead.h
@@ -11,11 +11,11 @@
 class cBlockMobHeadHandler :
 	public cBlockEntityHandler
 {
-	using super = cBlockEntityHandler;
+	using Super = cBlockEntityHandler;
 
 public:
 	cBlockMobHeadHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockMushroom.h b/src/Blocks/BlockMushroom.h
index 7fb397420..f44fbdc07 100644
--- a/src/Blocks/BlockMushroom.h
+++ b/src/Blocks/BlockMushroom.h
@@ -10,12 +10,12 @@
 class cBlockMushroomHandler:
 	public cClearMetaOnDrop<cBlockHandler>
 {
-	using super = cClearMetaOnDrop<cBlockHandler>;
+	using Super = cClearMetaOnDrop<cBlockHandler>;
 
 public:
 
 	cBlockMushroomHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h
index 5664093e9..40ab1d886 100644
--- a/src/Blocks/BlockNetherWart.h
+++ b/src/Blocks/BlockNetherWart.h
@@ -11,12 +11,12 @@
 class cBlockNetherWartHandler :
 	public cBlockPlant<false>
 {
-	using super = cBlockPlant<false>;
+	using Super = cBlockPlant<false>;
 
 public:
 
 	cBlockNetherWartHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockObserver.h b/src/Blocks/BlockObserver.h
index ebac0ee31..30c19ba2e 100644
--- a/src/Blocks/BlockObserver.h
+++ b/src/Blocks/BlockObserver.h
@@ -8,11 +8,11 @@
 class cBlockObserverHandler:
 	public cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>
 {
-	using super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>;
+	using Super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler>>;
 
 public:
 
-	cBlockObserverHandler(BLOCKTYPE a_BlockType) : super(a_BlockType)
+	cBlockObserverHandler(BLOCKTYPE a_BlockType) : Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h
index 70bb0515d..6200b09f4 100644
--- a/src/Blocks/BlockOre.h
+++ b/src/Blocks/BlockOre.h
@@ -7,13 +7,14 @@
 
 
 
-class cBlockOreHandler :
+class cBlockOreHandler:
 	public cBlockHandler
 {
-	typedef cBlockHandler super;
+	using Super = cBlockHandler;
+
 public:
-	cBlockOreHandler(BLOCKTYPE a_BlockType)
-		: cBlockHandler(a_BlockType)
+	cBlockOreHandler(BLOCKTYPE a_BlockType):
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp
index 26c078e5c..e68e05809 100644
--- a/src/Blocks/BlockPiston.cpp
+++ b/src/Blocks/BlockPiston.cpp
@@ -18,7 +18,7 @@
 
 
 cBlockPistonHandler::cBlockPistonHandler(BLOCKTYPE a_BlockType):
-	super(a_BlockType)
+	Super(a_BlockType)
 {
 }
 
@@ -320,7 +320,7 @@ void cBlockPistonHandler::RetractPiston(Vector3i a_BlockPos, cWorld & a_World)
 // cBlockPistonHeadHandler:
 
 cBlockPistonHeadHandler::cBlockPistonHeadHandler(void) :
-	super(E_BLOCK_PISTON_EXTENSION)
+	Super(E_BLOCK_PISTON_EXTENSION)
 {
 }
 
diff --git a/src/Blocks/BlockPiston.h b/src/Blocks/BlockPiston.h
index 53a3537a2..2cc872097 100644
--- a/src/Blocks/BlockPiston.h
+++ b/src/Blocks/BlockPiston.h
@@ -19,7 +19,7 @@ class cWorld;
 class cBlockPistonHandler:
 	public cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>
 {
-	using super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>;
+	using Super = cClearMetaOnDrop<cPitchYawRotator<cBlockHandler, 0x07, 0x03, 0x04, 0x02, 0x05, 0x01, 0x00>>;
 
 public:
 
@@ -145,7 +145,7 @@ private:
 class cBlockPistonHeadHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 	cBlockPistonHeadHandler(void);
diff --git a/src/Blocks/BlockPlant.h b/src/Blocks/BlockPlant.h
index 0e249bbde..589619b26 100644
--- a/src/Blocks/BlockPlant.h
+++ b/src/Blocks/BlockPlant.h
@@ -12,13 +12,13 @@ template <bool NeedsLightToGrow>
 class cBlockPlant:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 
 public:
 
 	cBlockPlant(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockPressurePlate.h b/src/Blocks/BlockPressurePlate.h
index 7067bd2e5..bac93675e 100644
--- a/src/Blocks/BlockPressurePlate.h
+++ b/src/Blocks/BlockPressurePlate.h
@@ -9,12 +9,12 @@
 class cBlockPressurePlateHandler :
 	public cClearMetaOnDrop<cBlockHandler>
 {
-	using super = cClearMetaOnDrop<cBlockHandler>;
+	using Super = cClearMetaOnDrop<cBlockHandler>;
 
 public:
 
 	cBlockPressurePlateHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockPumpkin.h b/src/Blocks/BlockPumpkin.h
index 150d305e1..81ba080be 100644
--- a/src/Blocks/BlockPumpkin.h
+++ b/src/Blocks/BlockPumpkin.h
@@ -8,11 +8,11 @@
 class cBlockPumpkinHandler :
 	public cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>
 {
-	using super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>;
+	using Super = cClearMetaOnDrop<cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>>;
 public:
 
 	cBlockPumpkinHandler(BLOCKTYPE a_BlockType) :
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockRail.h b/src/Blocks/BlockRail.h
index 6b9ddcdd5..7ee98d576 100644
--- a/src/Blocks/BlockRail.h
+++ b/src/Blocks/BlockRail.h
@@ -19,12 +19,12 @@ enum ENUM_PURE
 class cBlockRailHandler :
 	public cClearMetaOnDrop<cBlockHandler>
 {
-	using super = cClearMetaOnDrop<cBlockHandler>;
+	using Super = cClearMetaOnDrop<cBlockHandler>;
 
 public:
 
 	cBlockRailHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -57,7 +57,7 @@ public:
 		BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta
 	) override
 	{
-		super::OnPlaced(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_BlockType, a_BlockMeta);
+		Super::OnPlaced(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_BlockType, a_BlockMeta);
 
 		// Alert diagonal rails:
 		NeighborChanged(a_ChunkInterface, a_BlockPos + Vector3i( 1,  1,  0), BLOCK_FACE_NONE);
@@ -80,7 +80,7 @@ public:
 		BLOCKTYPE a_OldBlockType, NIBBLETYPE a_OldBlockMeta
 	) override
 	{
-		super::OnBroken(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_OldBlockType, a_OldBlockMeta);
+		Super::OnBroken(a_ChunkInterface, a_WorldInterface, a_BlockPos, a_OldBlockType, a_OldBlockMeta);
 
 		// Alert diagonal rails:
 		NeighborChanged(a_ChunkInterface, a_BlockPos + Vector3i( 1,  1,  0), BLOCK_FACE_NONE);
diff --git a/src/Blocks/BlockRedstone.h b/src/Blocks/BlockRedstone.h
index c93537d08..14621948e 100644
--- a/src/Blocks/BlockRedstone.h
+++ b/src/Blocks/BlockRedstone.h
@@ -11,12 +11,12 @@
 class cBlockRedstoneHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockRedstoneHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h
index 1fea6e38b..89cba2d35 100644
--- a/src/Blocks/BlockRedstoneRepeater.h
+++ b/src/Blocks/BlockRedstoneRepeater.h
@@ -14,12 +14,12 @@
 class cBlockRedstoneRepeaterHandler:
 	public cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>
 {
-	using super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
+	using Super = cYawRotator<cBlockHandler, 0x03, 0x00, 0x01, 0x02, 0x03>;
 
 public:
 
 	cBlockRedstoneRepeaterHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockRedstoneTorch.h b/src/Blocks/BlockRedstoneTorch.h
index 3f065b1cb..22a3cf52d 100644
--- a/src/Blocks/BlockRedstoneTorch.h
+++ b/src/Blocks/BlockRedstoneTorch.h
@@ -10,12 +10,12 @@
 class cBlockRedstoneTorchHandler :
 	public cBlockTorchHandler
 {
-	using super = cBlockTorchHandler;
+	using Super = cBlockTorchHandler;
 
 public:
 
 	cBlockRedstoneTorchHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSapling.h b/src/Blocks/BlockSapling.h
index 15bd57f6a..b66587288 100644
--- a/src/Blocks/BlockSapling.h
+++ b/src/Blocks/BlockSapling.h
@@ -11,12 +11,12 @@
 class cBlockSaplingHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSaplingHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSeaLantern.h b/src/Blocks/BlockSeaLantern.h
index 0d7c62b94..5ec671f07 100644
--- a/src/Blocks/BlockSeaLantern.h
+++ b/src/Blocks/BlockSeaLantern.h
@@ -10,12 +10,12 @@
 class cBlockSeaLanternHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSeaLanternHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h
index 017dc30e0..5854f334c 100644
--- a/src/Blocks/BlockSideways.h
+++ b/src/Blocks/BlockSideways.h
@@ -13,12 +13,12 @@ Additionally supports the metadata specifying block sub-type in its lower 2 bits
 class cBlockSidewaysHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSidewaysHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h
index b5ccfe5d7..45fa7cad4 100644
--- a/src/Blocks/BlockSignPost.h
+++ b/src/Blocks/BlockSignPost.h
@@ -11,12 +11,12 @@
 class cBlockSignPostHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSignPostHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h
index ef58c243c..bd9c0299a 100644
--- a/src/Blocks/BlockSlab.h
+++ b/src/Blocks/BlockSlab.h
@@ -20,12 +20,12 @@
 class cBlockSlabHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSlabHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -239,12 +239,12 @@ public:
 class cBlockDoubleSlabHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockDoubleSlabHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSponge.h b/src/Blocks/BlockSponge.h
index 41102f148..88981567a 100644
--- a/src/Blocks/BlockSponge.h
+++ b/src/Blocks/BlockSponge.h
@@ -10,12 +10,12 @@
 class cBlockSpongeHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockSpongeHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -33,7 +33,7 @@ public:
 		{
 			return;
 		}
-		super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
+		Super::Check(a_ChunkInterface, a_PluginInterface, a_RelPos, a_Chunk);
 	}
 
 
diff --git a/src/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h
index 4263a5b13..c9e36d535 100644
--- a/src/Blocks/BlockStairs.h
+++ b/src/Blocks/BlockStairs.h
@@ -10,12 +10,12 @@
 class cBlockStairsHandler :
 	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>
 {
-	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>;
+	using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x03, 0x00, 0x02, 0x01, true>>;
 
 public:
 
 	cBlockStairsHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 
 	}
diff --git a/src/Blocks/BlockStems.h b/src/Blocks/BlockStems.h
index 202d71b19..bf0d7ce41 100644
--- a/src/Blocks/BlockStems.h
+++ b/src/Blocks/BlockStems.h
@@ -14,12 +14,12 @@ template <BLOCKTYPE ProduceBlockType, ENUM_ITEM_TYPE StemPickupType>
 class cBlockStemsHandler:
 	public cBlockPlant<true>
 {
-	using super = cBlockPlant<true>;
+	using Super = cBlockPlant<true>;
 
 public:
 
 	cBlockStemsHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockStone.h b/src/Blocks/BlockStone.h
index f691d4452..9da61c263 100644
--- a/src/Blocks/BlockStone.h
+++ b/src/Blocks/BlockStone.h
@@ -9,12 +9,12 @@
 class cBlockStoneHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockStoneHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockSugarcane.h b/src/Blocks/BlockSugarcane.h
index 3c929e37d..f45b312a8 100644
--- a/src/Blocks/BlockSugarcane.h
+++ b/src/Blocks/BlockSugarcane.h
@@ -10,12 +10,12 @@
 class cBlockSugarcaneHandler :
 	public cBlockPlant<false>
 {
-	using super = cBlockPlant<false>;
+	using Super = cBlockPlant<false>;
 
 public:
 
 	cBlockSugarcaneHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
@@ -144,7 +144,7 @@ protected:
 		// Only allow growing if there's an air block above:
 		if (((a_RelPos.y + 1) < cChunkDef::Height) && (a_Chunk.GetBlock(a_RelPos.addedY(1)) == E_BLOCK_AIR))
 		{
-			return super::CanGrow(a_Chunk, a_RelPos);
+			return Super::CanGrow(a_Chunk, a_RelPos);
 		}
 		return paStay;
 	}
diff --git a/src/Blocks/BlockTallGrass.h b/src/Blocks/BlockTallGrass.h
index f02c20523..d09e9d496 100644
--- a/src/Blocks/BlockTallGrass.h
+++ b/src/Blocks/BlockTallGrass.h
@@ -12,12 +12,12 @@
 class cBlockTallGrassHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockTallGrassHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockTorch.h b/src/Blocks/BlockTorch.h
index c5b06b18a..93ca5e40d 100644
--- a/src/Blocks/BlockTorch.h
+++ b/src/Blocks/BlockTorch.h
@@ -11,12 +11,12 @@
 class cBlockTorchHandler :
 	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>
 {
-	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>;
+	using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x7, 0x4, 0x1, 0x3, 0x2>>;
 
 public:
 
 	cBlockTorchHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
index 3a768376a..0ad2c64f5 100644
--- a/src/Blocks/BlockTrapdoor.h
+++ b/src/Blocks/BlockTrapdoor.h
@@ -11,12 +11,12 @@
 class cBlockTrapdoorHandler :
 	public cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>
 {
-	using super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>;
+	using Super = cClearMetaOnDrop<cMetaRotator<cBlockHandler, 0x03, 0x01, 0x02, 0x00, 0x03, false>>;
 
 public:
 
 	cBlockTrapdoorHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockTripwire.h b/src/Blocks/BlockTripwire.h
index dbf21e318..f2fe31a96 100644
--- a/src/Blocks/BlockTripwire.h
+++ b/src/Blocks/BlockTripwire.h
@@ -10,12 +10,12 @@
 class cBlockTripwireHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockTripwireHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockTripwireHook.h b/src/Blocks/BlockTripwireHook.h
index 8537f99ce..797034ea0 100644
--- a/src/Blocks/BlockTripwireHook.h
+++ b/src/Blocks/BlockTripwireHook.h
@@ -10,12 +10,12 @@
 class cBlockTripwireHookHandler :
 	public cMetaRotator<cClearMetaOnDrop<cBlockHandler>, 0x03, 0x02, 0x03, 0x00, 0x01>
 {
-	using super = cMetaRotator<cClearMetaOnDrop<cBlockHandler>, 0x03, 0x02, 0x03, 0x00, 0x01>;
+	using Super = cMetaRotator<cClearMetaOnDrop<cBlockHandler>, 0x03, 0x02, 0x03, 0x00, 0x01>;
 
 public:
 
 	cBlockTripwireHookHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h
index 53224a5db..9c3c1c53e 100644
--- a/src/Blocks/BlockVine.h
+++ b/src/Blocks/BlockVine.h
@@ -9,12 +9,12 @@
 class cBlockVineHandler :
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockVineHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h
index 3759b4db6..551107d88 100644
--- a/src/Blocks/BlockWallSign.h
+++ b/src/Blocks/BlockWallSign.h
@@ -11,12 +11,12 @@
 class cBlockWallSignHandler:
 	public cBlockHandler
 {
-	using super = cBlockHandler;
+	using Super = cBlockHandler;
 
 public:
 
 	cBlockWallSignHandler(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{
 	}
 
diff --git a/src/Blocks/Mixins.h b/src/Blocks/Mixins.h
index 1ee2876d3..cddbb4850 100644
--- a/src/Blocks/Mixins.h
+++ b/src/Blocks/Mixins.h
@@ -184,11 +184,11 @@ template <
 class cYawRotator:
 	public cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>
 {
-	using super = cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>;
+	using Super = cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>;
 public:
 
 	cYawRotator(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{}
 
 
@@ -203,7 +203,7 @@ public:
 	) override
 	{
 		NIBBLETYPE BaseMeta;
-		if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta))
+		if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta))
 		{
 			return false;
 		}
@@ -258,11 +258,11 @@ template <
 class cPitchYawRotator:
 	public cYawRotator<Base, BitMask, North, East, South, West>
 {
-	using super = cYawRotator<Base, BitMask, North, East, South, West>;
+	using Super = cYawRotator<Base, BitMask, North, East, South, West>;
 public:
 
 	cPitchYawRotator(BLOCKTYPE a_BlockType):
-		super(a_BlockType)
+		Super(a_BlockType)
 	{}
 
 
@@ -277,7 +277,7 @@ public:
 	) override
 	{
 		NIBBLETYPE BaseMeta;
-		if (!super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta))
+		if (!Super::GetPlacementBlockTypeMeta(a_ChunkInterface, a_Player, a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, a_CursorX, a_CursorY, a_CursorZ, a_BlockType, BaseMeta))
 		{
 			return false;
 		}
@@ -319,6 +319,6 @@ public:
 			return Down;
 		}
 
-		return super::YawToMetaData(a_Rotation);
+		return Super::YawToMetaData(a_Rotation);
 	}
 };