flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

BlockHandler: no dynamic allocation (#4862) 

* BlockHandler: no dynamic allocation
This commit is contained in:
Tiger Wang 2020-09-17 14:51:42 +01:00 committed by GitHub
parent 53549a1a4c
commit c3d2956ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 557 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -92,6 +92,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# File failed to follow NHS guidelines on handwashing and has not maintained good hygiene # File failed to follow NHS guidelines on handwashing and has not maintained good hygiene
set_source_files_properties("${CMAKE_SOURCE_DIR}/src/IniFile.cpp" PROPERTIES COMPILE_OPTIONS -Wno-header-hygiene) set_source_files_properties("${CMAKE_SOURCE_DIR}/src/IniFile.cpp" PROPERTIES COMPILE_OPTIONS -Wno-header-hygiene)
# Enforce BlockHandler handling all blocks in switch statements
set_source_files_properties("${CMAKE_SOURCE_DIR}/src/Blocks/BlockHandler.cpp" PROPERTIES COMPILE_OPTIONS -Werror=switch)
endif() endif()
if(${BUILD_TOOLS}) if(${BUILD_TOOLS})

20
src/BlockInfo.cpp
View File

@ -414,8 +414,7 @@ cBlockInfo::cBlockInfo():
m_FullyOccupiesVoxel(false), m_FullyOccupiesVoxel(false),
m_CanBeTerraformed(false), m_CanBeTerraformed(false),
m_BlockHeight(1.0), m_BlockHeight(1.0),
m_Hardness(0.0f), m_Hardness(0.0f)
m_Handler()
{ {
} }
@ -423,13 +422,9 @@ cBlockInfo::cBlockInfo():
bool cBlockInfo::IsSnowable(BLOCKTYPE a_BlockType) cBlockHandler * cBlockInfo::GetHandler(BLOCKTYPE a_Type)
{ {
return ( return &cBlockHandler::GetBlockHandler(a_Type);
(a_BlockType == E_BLOCK_ICE) ||
(a_BlockType == E_BLOCK_LEAVES) ||
(!IsTransparent(a_BlockType) && (a_BlockType != E_BLOCK_PACKED_ICE))
);
} }
@ -557,9 +552,13 @@ float cBlockInfo::GetExplosionAbsorption(const BLOCKTYPE Block)
void cBlockInfo::sHandlerDeleter::operator () (cBlockHandler * a_Handler) bool cBlockInfo::IsSnowable(BLOCKTYPE a_BlockType)
{ {
delete a_Handler; return (
(a_BlockType == E_BLOCK_ICE) ||
(a_BlockType == E_BLOCK_LEAVES) ||
(!IsTransparent(a_BlockType) && (a_BlockType != E_BLOCK_PACKED_ICE))
);
} }
@ -573,7 +572,6 @@ cBlockInfo::cBlockInfoArray::cBlockInfoArray()
for (size_t i = 0; i < Info.size(); ++i) for (size_t i = 0; i < Info.size(); ++i)
{ {
Info[i].m_BlockType = static_cast<BLOCKTYPE>(i); Info[i].m_BlockType = static_cast<BLOCKTYPE>(i);
Info[i].m_Handler.reset(cBlockHandler::CreateBlockHandler(Info[i].m_BlockType));
} }
// Emissive blocks // Emissive blocks

14
src/BlockInfo.h
View File

@ -51,13 +51,14 @@ public:
See Physics\Explodinator.cpp for details of explosion block destruction. */ See Physics\Explodinator.cpp for details of explosion block destruction. */
static float GetExplosionAbsorption(BLOCKTYPE Block); static float GetExplosionAbsorption(BLOCKTYPE Block);
inline static cBlockHandler * GetHandler (BLOCKTYPE a_Type) { return Get(a_Type).m_Handler.get(); }
/** Creates a default BlockInfo structure, initializes all values to their defaults */ /** Creates a default BlockInfo structure, initializes all values to their defaults */
cBlockInfo(); cBlockInfo();
/** Gets the blockhandler for the given block type. */
static cBlockHandler * GetHandler(BLOCKTYPE a_Type);
private: private:
/** Storage for all the BlockInfo structures. */ /** Storage for all the BlockInfo structures. */
class cBlockInfoArray; class cBlockInfoArray;
@ -99,15 +100,6 @@ private:
/** Block's hardness. The greater the value the longer the player needs to break the block. */ /** Block's hardness. The greater the value the longer the player needs to break the block. */
float m_Hardness; float m_Hardness;
/** Custom deleter allows cBlockHandler to be an incomplete type. */
struct sHandlerDeleter
{
void operator () (cBlockHandler * a_Handler);
};
/** Associated block handler. */
std::unique_ptr<cBlockHandler, sHandlerDeleter> m_Handler;
}; // tolua_export }; // tolua_export

724
src/Blocks/BlockHandler.cpp
View File

@ -1,5 +1,5 @@
#include "Globals.h" #include "Globals.h"
#include "BlockHandler.h" #include "BlockHandler.h"
#include "../Item.h" #include "../Item.h"
#include "../World.h" #include "../World.h"
@ -189,203 +189,260 @@ public:
/** Creates a block handler instance based on the specified block type. */ namespace
static cBlockHandler * CreateBlockHandler(BLOCKTYPE a_BlockType)
{ {
switch (a_BlockType) cBlockDoorHandler BlockAcaciaDoorHandler (E_BLOCK_ACACIA_DOOR);
{ cBlockFenceGateHandler BlockAcaciaFenceGateHandler (E_BLOCK_ACACIA_FENCE_GATE);
// Block handlers, alphabetically sorted: cBlockFenceHandler BlockAcaciaFenceHandler (E_BLOCK_ACACIA_FENCE);
case E_BLOCK_ACACIA_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockStairsHandler BlockAcaciaWoodStairsHandler (E_BLOCK_ACACIA_WOOD_STAIRS);
case E_BLOCK_ACACIA_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockRailHandler BlockActivatorRailHandler (E_BLOCK_ACTIVATOR_RAIL);
case E_BLOCK_ACACIA_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockComparatorHandler BlockActiveComparatorHandler (E_BLOCK_ACTIVE_COMPARATOR);
case E_BLOCK_ACACIA_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockWithNoDrops<> BlockAirHandler (E_BLOCK_AIR);
case E_BLOCK_ACTIVATOR_RAIL: return new cBlockRailHandler (a_BlockType); cBlockAnvilHandler BlockAnvilHandler (E_BLOCK_ANVIL);
case E_BLOCK_ACTIVE_COMPARATOR: return new cBlockComparatorHandler (a_BlockType); cBlockHandler BlockBarrierHandler (E_BLOCK_BARRIER);
case E_BLOCK_AIR: return new cBlockWithNoDrops<> (a_BlockType); cBlockEntityHandler BlockBeaconHandler (E_BLOCK_BEACON);
case E_BLOCK_ANVIL: return new cBlockAnvilHandler (a_BlockType); cBlockBedHandler BlockBedHandler (E_BLOCK_BED);
case E_BLOCK_BEACON: return new cBlockEntityHandler (a_BlockType); cBlockHandler BlockBedrockHandler (E_BLOCK_BEDROCK);
case E_BLOCK_BED: return new cBlockBedHandler (a_BlockType); cBlockCropsHandler<3> BlockBeetrootsHandler (E_BLOCK_BEETROOTS); // 4 stages of growth
case E_BLOCK_BEETROOTS: return new cBlockCropsHandler<3> (a_BlockType); // 4 stages of growth cBlockBigFlowerHandler BlockBigFlowerHandler (E_BLOCK_BIG_FLOWER);
case E_BLOCK_BIG_FLOWER: return new cBlockBigFlowerHandler (a_BlockType); cBlockDoorHandler BlockBirchDoorHandler (E_BLOCK_BIRCH_DOOR);
case E_BLOCK_BIRCH_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockFenceGateHandler BlockBirchFenceGateHandler (E_BLOCK_BIRCH_FENCE_GATE);
case E_BLOCK_BIRCH_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockFenceHandler BlockBirchFenceHandler (E_BLOCK_BIRCH_FENCE);
case E_BLOCK_BIRCH_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockStairsHandler BlockBirchWoodStairsHandler (E_BLOCK_BIRCH_WOOD_STAIRS);
case E_BLOCK_BIRCH_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockBlackGlazedTerracottaHandler (E_BLOCK_BLACK_GLAZED_TERRACOTTA);
case E_BLOCK_BLACK_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockBlackShulkerBoxHandler (E_BLOCK_BLACK_SHULKER_BOX);
case E_BLOCK_BLUE_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockBlockOfCoalHandler (E_BLOCK_BLOCK_OF_COAL);
case E_BLOCK_BOOKCASE: return new cBlockBookShelfHandler (a_BlockType); cBlockHandler BlockBlockOfRedstoneHandler (E_BLOCK_BLOCK_OF_REDSTONE);
case E_BLOCK_BREWING_STAND: return new cBlockBrewingStandHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockBlueGlazedTerracottaHandler (E_BLOCK_BLUE_GLAZED_TERRACOTTA);
case E_BLOCK_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockHandler BlockBlueShulkerBoxHandler (E_BLOCK_BLUE_SHULKER_BOX);
case E_BLOCK_BROWN_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockBoneBlockHandler (E_BLOCK_BONE_BLOCK);
case E_BLOCK_BROWN_MUSHROOM: return new cBlockMushroomHandler (a_BlockType); cBlockBookShelfHandler BlockBookcaseHandler (E_BLOCK_BOOKCASE);
case E_BLOCK_CACTUS: return new cBlockCactusHandler (a_BlockType); cBlockBrewingStandHandler BlockBrewingStandHandler (E_BLOCK_BREWING_STAND);
case E_BLOCK_CAKE: return new cBlockCakeHandler (a_BlockType); cBlockHandler BlockBrickHandler (E_BLOCK_BRICK);
case E_BLOCK_CARPET: return new cBlockCarpetHandler (a_BlockType); cBlockStairsHandler BlockBrickStairsHandler (E_BLOCK_BRICK_STAIRS);
case E_BLOCK_CARROTS: return new cBlockCropsHandler<7> (a_BlockType); // 8 stages of growth cBlockGlazedTerracottaHandler BlockBrownGlazedTerracottaHandler (E_BLOCK_BROWN_GLAZED_TERRACOTTA);
case E_BLOCK_CAULDRON: return new cBlockCauldronHandler (a_BlockType); cBlockMushroomHandler BlockBrownMushroomHandler (E_BLOCK_BROWN_MUSHROOM);
case E_BLOCK_CHAIN_COMMAND_BLOCK: return new cBlockCommandBlockHandler (a_BlockType); cBlockHandler BlockBrownShulkerBoxHandler (E_BLOCK_BROWN_SHULKER_BOX);
case E_BLOCK_CHEST: return new cBlockChestHandler (a_BlockType); cBlockCactusHandler BlockCactusHandler (E_BLOCK_CACTUS);
case E_BLOCK_CLAY: return new cBlockOreHandler (a_BlockType); cBlockCakeHandler BlockCakeHandler (E_BLOCK_CAKE);
case E_BLOCK_COAL_ORE: return new cBlockOreHandler (a_BlockType); cBlockCarpetHandler BlockCarpetHandler (E_BLOCK_CARPET);
case E_BLOCK_COBBLESTONE: return new cBlockStoneHandler (a_BlockType); cBlockCropsHandler<7> BlockCarrotsHandler (E_BLOCK_CARROTS); // 8 stages of growth
case E_BLOCK_COBBLESTONE_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockCauldronHandler BlockCauldronHandler (E_BLOCK_CAULDRON);
case E_BLOCK_COBWEB: return new cBlockCobWebHandler (a_BlockType); cBlockCommandBlockHandler BlockChainCommandBlockHandler (E_BLOCK_CHAIN_COMMAND_BLOCK);
case E_BLOCK_COCOA_POD: return new cBlockCocoaPodHandler (a_BlockType); cBlockChestHandler BlockChestHandler (E_BLOCK_CHEST);
case E_BLOCK_COMMAND_BLOCK: return new cBlockCommandBlockHandler (a_BlockType); cBlockHandler BlockChorusFlowerHandler (E_BLOCK_CHORUS_FLOWER);
case E_BLOCK_CONCRETE_POWDER: return new cBlockConcretePowderHandler (a_BlockType); cBlockHandler BlockChorusPlantHandler (E_BLOCK_CHORUS_PLANT);
case E_BLOCK_CROPS: return new cBlockCropsHandler<7> (a_BlockType); // 8 stages of growth cBlockOreHandler BlockClayHandler (E_BLOCK_CLAY);
case E_BLOCK_CYAN_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockOreHandler BlockCoalOreHandler (E_BLOCK_COAL_ORE);
case E_BLOCK_DARK_OAK_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockStoneHandler BlockCobblestoneHandler (E_BLOCK_COBBLESTONE);
case E_BLOCK_DARK_OAK_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockStairsHandler BlockCobblestoneStairsHandler (E_BLOCK_COBBLESTONE_STAIRS);
case E_BLOCK_DARK_OAK_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockHandler BlockCobblestoneWallHandler (E_BLOCK_COBBLESTONE_WALL);
case E_BLOCK_DARK_OAK_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockCobWebHandler BlockCobwebHandler (E_BLOCK_COBWEB);
case E_BLOCK_DEAD_BUSH: return new cBlockDeadBushHandler (a_BlockType); cBlockCocoaPodHandler BlockCocoaPodHandler (E_BLOCK_COCOA_POD);
case E_BLOCK_DETECTOR_RAIL: return new cBlockRailHandler (a_BlockType); cBlockCommandBlockHandler BlockCommandBlockHandler (E_BLOCK_COMMAND_BLOCK);
case E_BLOCK_DIAMOND_ORE: return new cBlockOreHandler (a_BlockType); cBlockHandler BlockConcreteHandler (E_BLOCK_CONCRETE);
case E_BLOCK_DIRT: return new cBlockDirtHandler (a_BlockType); cBlockConcretePowderHandler BlockConcretePowderHandler (E_BLOCK_CONCRETE_POWDER);
case E_BLOCK_DISPENSER: return new cBlockDropSpenserHandler (a_BlockType); cBlockCropsHandler<7> BlockCropsHandler (E_BLOCK_CROPS); // 8 stages of growth
case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB: return new cBlockDoubleSlabHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockCyanGlazedTerracottaHandler (E_BLOCK_CYAN_GLAZED_TERRACOTTA);
case E_BLOCK_DOUBLE_STONE_SLAB: return new cBlockDoubleSlabHandler (a_BlockType); cBlockHandler BlockCyanShulkerBoxHandler (E_BLOCK_CYAN_SHULKER_BOX);
case E_BLOCK_DOUBLE_WOODEN_SLAB: return new cBlockDoubleSlabHandler (a_BlockType); cBlockDoorHandler BlockDarkOakDoorHandler (E_BLOCK_DARK_OAK_DOOR);
case E_BLOCK_DROPPER: return new cBlockDropSpenserHandler (a_BlockType); cBlockFenceGateHandler BlockDarkOakFenceGateHandler (E_BLOCK_DARK_OAK_FENCE_GATE);
case E_BLOCK_EMERALD_ORE: return new cBlockOreHandler (a_BlockType); cBlockFenceHandler BlockDarkOakFenceHandler (E_BLOCK_DARK_OAK_FENCE);
case E_BLOCK_ENCHANTMENT_TABLE: return new cBlockEnchantmentTableHandler (a_BlockType); cBlockStairsHandler BlockDarkOakWoodStairsHandler (E_BLOCK_DARK_OAK_WOOD_STAIRS);
case E_BLOCK_ENDER_CHEST: return new cBlockEnderchestHandler (a_BlockType); cBlockHandler BlockDaylightSensorHandler (E_BLOCK_DAYLIGHT_SENSOR);
case E_BLOCK_END_PORTAL_FRAME: return new cBlockEndPortalFrameHandler (a_BlockType); cBlockDeadBushHandler BlockDeadBushHandler (E_BLOCK_DEAD_BUSH);
case E_BLOCK_FARMLAND: return new cBlockFarmlandHandler (a_BlockType); cBlockRailHandler BlockDetectorRailHandler (E_BLOCK_DETECTOR_RAIL);
case E_BLOCK_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockHandler BlockDiamondBlockHandler (E_BLOCK_DIAMOND_BLOCK);
case E_BLOCK_FIRE: return new cBlockFireHandler (a_BlockType); cBlockOreHandler BlockDiamondOreHandler (E_BLOCK_DIAMOND_ORE);
case E_BLOCK_FLOWER_POT: return new cBlockFlowerPotHandler (a_BlockType); cBlockDirtHandler BlockDirtHandler (E_BLOCK_DIRT);
case E_BLOCK_FROSTED_ICE: return new cBlockIceHandler (a_BlockType); cBlockDropSpenserHandler BlockDispenserHandler (E_BLOCK_DISPENSER);
case E_BLOCK_FURNACE: return new cBlockFurnaceHandler (a_BlockType); cBlockDoubleSlabHandler BlockDoubleRedSandstoneSlabHandler(E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB);
case E_BLOCK_GLASS: return new cBlockGlassHandler (a_BlockType); cBlockDoubleSlabHandler BlockDoubleStoneSlabHandler (E_BLOCK_DOUBLE_STONE_SLAB);
case E_BLOCK_GLASS_PANE: return new cBlockGlassHandler (a_BlockType); cBlockDoubleSlabHandler BlockDoubleWoodenSlabHandler (E_BLOCK_DOUBLE_WOODEN_SLAB);
case E_BLOCK_GLOWSTONE: return new cBlockGlowstoneHandler (a_BlockType); cBlockHandler BlockDragonEggHandler (E_BLOCK_DRAGON_EGG);
case E_BLOCK_GOLD_ORE: return new cBlockOreHandler (a_BlockType); cBlockDropSpenserHandler BlockDropperHandler (E_BLOCK_DROPPER);
case E_BLOCK_GRASS: return new cBlockGrassHandler (a_BlockType); cBlockHandler BlockEmeraldBlockHandler (E_BLOCK_EMERALD_BLOCK);
case E_BLOCK_GRAVEL: return new cBlockGravelHandler (a_BlockType); cBlockOreHandler BlockEmeraldOreHandler (E_BLOCK_EMERALD_ORE);
case E_BLOCK_GRAY_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockEnchantmentTableHandler BlockEnchantmentTableHandler (E_BLOCK_ENCHANTMENT_TABLE);
case E_BLOCK_GREEN_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockEndBricksHandler (E_BLOCK_END_BRICKS);
case E_BLOCK_HAY_BALE: return new cBlockSidewaysHandler (a_BlockType); cBlockHandler BlockEndGatewayHandler (E_BLOCK_END_GATEWAY);
case E_BLOCK_HEAD: return new cBlockMobHeadHandler (a_BlockType); cBlockEndPortalFrameHandler BlockEndPortalFrameHandler (E_BLOCK_END_PORTAL_FRAME);
case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE: return new cBlockPressurePlateHandler (a_BlockType); cBlockHandler BlockEndPortalHandler (E_BLOCK_END_PORTAL);
case E_BLOCK_HOPPER: return new cBlockHopperHandler (a_BlockType); cBlockHandler BlockEndRodHandler (E_BLOCK_END_ROD);
case E_BLOCK_ICE: return new cBlockIceHandler (a_BlockType); cBlockHandler BlockEndStoneHandler (E_BLOCK_END_STONE);
case E_BLOCK_INACTIVE_COMPARATOR: return new cBlockComparatorHandler (a_BlockType); cBlockEnderchestHandler BlockEnderChestHandler (E_BLOCK_ENDER_CHEST);
case E_BLOCK_IRON_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockFarmlandHandler BlockFarmlandHandler (E_BLOCK_FARMLAND);
case E_BLOCK_IRON_ORE: return new cBlockOreHandler (a_BlockType); cBlockFenceHandler BlockFenceHandler (E_BLOCK_FENCE);
case E_BLOCK_IRON_TRAPDOOR: return new cBlockTrapdoorHandler (a_BlockType); cBlockFireHandler BlockFireHandler (E_BLOCK_FIRE);
case E_BLOCK_JACK_O_LANTERN: return new cBlockPumpkinHandler (a_BlockType); cBlockFlowerPotHandler BlockFlowerPotHandler (E_BLOCK_FLOWER_POT);
case E_BLOCK_JUKEBOX: return new cBlockJukeboxHandler (a_BlockType); cBlockIceHandler BlockFrostedIceHandler (E_BLOCK_FROSTED_ICE);
case E_BLOCK_JUNGLE_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockFurnaceHandler BlockFurnaceHandler (E_BLOCK_FURNACE);
case E_BLOCK_JUNGLE_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockGlassHandler BlockGlassHandler (E_BLOCK_GLASS);
case E_BLOCK_JUNGLE_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockGlassHandler BlockGlassPaneHandler (E_BLOCK_GLASS_PANE);
case E_BLOCK_JUNGLE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockGlowstoneHandler BlockGlowstoneHandler (E_BLOCK_GLOWSTONE);
case E_BLOCK_LADDER: return new cBlockLadderHandler (a_BlockType); cBlockHandler BlockGoldBlockHandler (E_BLOCK_GOLD_BLOCK);
case E_BLOCK_LAPIS_ORE: return new cBlockOreHandler (a_BlockType); cBlockOreHandler BlockGoldOreHandler (E_BLOCK_GOLD_ORE);
case E_BLOCK_LAVA: return new cBlockLavaHandler (a_BlockType); cBlockGrassHandler BlockGrassHandler (E_BLOCK_GRASS);
case E_BLOCK_LEAVES: return new cBlockLeavesHandler (a_BlockType); cBlockHandler BlockGrassPathHandler (E_BLOCK_GRASS_PATH);
case E_BLOCK_LEVER: return new cBlockLeverHandler (a_BlockType); cBlockGravelHandler BlockGravelHandler (E_BLOCK_GRAVEL);
case E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockGrayGlazedTerracottaHandler (E_BLOCK_GRAY_GLAZED_TERRACOTTA);
case E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockGrayShulkerBoxHandler (E_BLOCK_GRAY_SHULKER_BOX);
case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: return new cBlockPressurePlateHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockGreenGlazedTerracottaHandler (E_BLOCK_GREEN_GLAZED_TERRACOTTA);
case E_BLOCK_LILY_PAD: return new cBlockLilypadHandler (a_BlockType); cBlockHandler BlockGreenShulkerBoxHandler (E_BLOCK_GREEN_SHULKER_BOX);
case E_BLOCK_LIME_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockHardenedClayHandler (E_BLOCK_HARDENED_CLAY);
case E_BLOCK_LIT_FURNACE: return new cBlockFurnaceHandler (a_BlockType); cBlockSidewaysHandler BlockHayBaleHandler (E_BLOCK_HAY_BALE);
case E_BLOCK_LOG: return new cBlockSidewaysHandler (a_BlockType); cBlockMobHeadHandler BlockHeadHandler (E_BLOCK_HEAD);
case E_BLOCK_MAGENTA_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockPressurePlateHandler BlockHeavyWeightedPressurePHandler(E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE);
case E_BLOCK_MELON: return new cBlockMelonHandler (a_BlockType); cBlockHopperHandler BlockHopperHandler (E_BLOCK_HOPPER);
case E_BLOCK_MELON_STEM: return new cBlockMelonStemHandler (a_BlockType); cBlockHandler BlockHugeBrownMushroomHandler (E_BLOCK_HUGE_BROWN_MUSHROOM);
case E_BLOCK_MOB_SPAWNER: return new cBlockMobSpawnerHandler (a_BlockType); cBlockHandler BlockHugeRedMushroomHandler (E_BLOCK_HUGE_RED_MUSHROOM);
case E_BLOCK_MYCELIUM: return new cBlockMyceliumHandler (a_BlockType); cBlockIceHandler BlockIceHandler (E_BLOCK_ICE);
case E_BLOCK_NETHERRACK: return new cBlockNetherrack (a_BlockType); cBlockComparatorHandler BlockInactiveComparatorHandler (E_BLOCK_INACTIVE_COMPARATOR);
case E_BLOCK_NETHER_BRICK_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockHandler BlockInfestedBlockHandler (E_BLOCK_SILVERFISH_EGG);
case E_BLOCK_NETHER_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockHandler BlockIronBarsHandler (E_BLOCK_IRON_BARS);
case E_BLOCK_NETHER_PORTAL: return new cBlockPortalHandler (a_BlockType); cBlockHandler BlockIronBlockHandler (E_BLOCK_IRON_BLOCK);
case E_BLOCK_NETHER_QUARTZ_ORE: return new cBlockOreHandler (a_BlockType); cBlockDoorHandler BlockIronDoorHandler (E_BLOCK_IRON_DOOR);
case E_BLOCK_NETHER_WART: return new cBlockNetherWartHandler (a_BlockType); cBlockOreHandler BlockIronOreHandler (E_BLOCK_IRON_ORE);
case E_BLOCK_NEW_LEAVES: return new cBlockLeavesHandler (a_BlockType); cBlockTrapdoorHandler BlockIronTrapdoorHandler (E_BLOCK_IRON_TRAPDOOR);
case E_BLOCK_NEW_LOG: return new cBlockSidewaysHandler (a_BlockType); cBlockPumpkinHandler BlockJackOLanternHandler (E_BLOCK_JACK_O_LANTERN);
case E_BLOCK_NOTE_BLOCK: return new cBlockEntityHandler (a_BlockType); cBlockJukeboxHandler BlockJukeboxHandler (E_BLOCK_JUKEBOX);
case E_BLOCK_OAK_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockDoorHandler BlockJungleDoorHandler (E_BLOCK_JUNGLE_DOOR);
case E_BLOCK_OAK_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockFenceGateHandler BlockJungleFenceGateHandler (E_BLOCK_JUNGLE_FENCE_GATE);
case E_BLOCK_OAK_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockFenceHandler BlockJungleFenceHandler (E_BLOCK_JUNGLE_FENCE);
case E_BLOCK_OBSERVER: return new cBlockObserverHandler (a_BlockType); cBlockStairsHandler BlockJungleWoodStairsHandler (E_BLOCK_JUNGLE_WOOD_STAIRS);
case E_BLOCK_ORANGE_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockLadderHandler BlockLadderHandler (E_BLOCK_LADDER);
case E_BLOCK_PACKED_ICE: return new cBlockIceHandler (a_BlockType); cBlockHandler BlockLapisBlockHandler (E_BLOCK_LAPIS_BLOCK);
case E_BLOCK_PINK_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockOreHandler BlockLapisOreHandler (E_BLOCK_LAPIS_ORE);
case E_BLOCK_PISTON: return new cBlockPistonHandler (a_BlockType); cBlockLavaHandler BlockLavaHandler (E_BLOCK_LAVA);
case E_BLOCK_PISTON_EXTENSION: return new cBlockPistonHeadHandler; cBlockLeavesHandler BlockLeavesHandler (E_BLOCK_LEAVES);
case E_BLOCK_PLANKS: return new cBlockPlanksHandler (a_BlockType); cBlockLeverHandler BlockLeverHandler (E_BLOCK_LEVER);
case E_BLOCK_POTATOES: return new cBlockCropsHandler<7> (a_BlockType); // 8 stages of growth cBlockGlazedTerracottaHandler BlockLightBlueGlazedTerracoHandler(E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA);
case E_BLOCK_POWERED_RAIL: return new cBlockRailHandler (a_BlockType); cBlockHandler BlockLightBlueShulkerBoxHandler (E_BLOCK_LIGHT_BLUE_SHULKER_BOX);
case E_BLOCK_PUMPKIN: return new cBlockPumpkinHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockLightGrayGlazedTerracoHandler(E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA);
case E_BLOCK_PUMPKIN_STEM: return new cBlockPumpkinStemHandler (a_BlockType); cBlockHandler BlockLightGrayShulkerBoxHandler (E_BLOCK_LIGHT_GRAY_SHULKER_BOX);
case E_BLOCK_PURPLE_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockPressurePlateHandler BlockLightWeightedPressurePHandler(E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE);
case E_BLOCK_PURPUR_DOUBLE_SLAB: return new cBlockDoubleSlabHandler (a_BlockType); cBlockLilypadHandler BlockLilyPadHandler (E_BLOCK_LILY_PAD);
case E_BLOCK_PURPUR_SLAB: return new cBlockSlabHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockLimeGlazedTerracottaHandler (E_BLOCK_LIME_GLAZED_TERRACOTTA);
case E_BLOCK_PURPUR_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockHandler BlockLimeShulkerBoxHandler (E_BLOCK_LIME_SHULKER_BOX);
case E_BLOCK_QUARTZ_BLOCK: return new cBlockQuartzHandler (a_BlockType); cBlockFurnaceHandler BlockLitFurnaceHandler (E_BLOCK_LIT_FURNACE);
case E_BLOCK_QUARTZ_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockSidewaysHandler BlockLogHandler (E_BLOCK_LOG);
case E_BLOCK_RAIL: return new cBlockRailHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockMagentaGlazedTerracottHandler(E_BLOCK_MAGENTA_GLAZED_TERRACOTTA);
case E_BLOCK_REDSTONE_LAMP_ON: return new cBlockRedstoneLampHandler (a_BlockType); cBlockHandler BlockMagentaShulkerBoxHandler (E_BLOCK_MAGENTA_SHULKER_BOX);
case E_BLOCK_REDSTONE_ORE: return new cBlockRedstoneOreHandler (a_BlockType); cBlockHandler BlockMagmaHandler (E_BLOCK_MAGMA);
case E_BLOCK_REDSTONE_ORE_GLOWING: return new cBlockGlowingRedstoneOreHandler(a_BlockType); cBlockMelonHandler BlockMelonHandler (E_BLOCK_MELON);
case E_BLOCK_REDSTONE_REPEATER_OFF: return new cBlockRedstoneRepeaterHandler (a_BlockType); cBlockMelonStemHandler BlockMelonStemHandler (E_BLOCK_MELON_STEM);
case E_BLOCK_REDSTONE_REPEATER_ON: return new cBlockRedstoneRepeaterHandler (a_BlockType); cBlockMobSpawnerHandler BlockMobSpawnerHandler (E_BLOCK_MOB_SPAWNER);
case E_BLOCK_REDSTONE_TORCH_OFF: return new cBlockRedstoneTorchHandler (a_BlockType); cBlockHandler BlockMossyCobblestoneHandler (E_BLOCK_MOSSY_COBBLESTONE);
case E_BLOCK_REDSTONE_TORCH_ON: return new cBlockRedstoneTorchHandler (a_BlockType); cBlockMyceliumHandler BlockMyceliumHandler (E_BLOCK_MYCELIUM);
case E_BLOCK_REDSTONE_WIRE: return new cBlockRedstoneHandler (a_BlockType); cBlockFenceHandler BlockNetherBrickFenceHandler (E_BLOCK_NETHER_BRICK_FENCE);
case E_BLOCK_RED_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockNetherBrickHandler (E_BLOCK_NETHER_BRICK);
case E_BLOCK_RED_MUSHROOM: return new cBlockMushroomHandler (a_BlockType); cBlockStairsHandler BlockNetherBrickStairsHandler (E_BLOCK_NETHER_BRICK_STAIRS);
case E_BLOCK_RED_ROSE: return new cBlockFlowerHandler (a_BlockType); cBlockPortalHandler BlockNetherPortalHandler (E_BLOCK_NETHER_PORTAL);
case E_BLOCK_RED_SANDSTONE_SLAB: return new cBlockSlabHandler (a_BlockType); cBlockOreHandler BlockNetherQuartzOreHandler (E_BLOCK_NETHER_QUARTZ_ORE);
case E_BLOCK_RED_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockHandler BlockNetherWartBlockHandler (E_BLOCK_NETHER_WART_BLOCK);
case E_BLOCK_REPEATING_COMMAND_BLOCK: return new cBlockCommandBlockHandler (a_BlockType); cBlockNetherWartHandler BlockNetherWartHandler (E_BLOCK_NETHER_WART);
case E_BLOCK_SAND: return new cBlockSandHandler (a_BlockType); cBlockNetherrack BlockNetherrackHandler (E_BLOCK_NETHERRACK);
case E_BLOCK_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockLeavesHandler BlockNewLeavesHandler (E_BLOCK_NEW_LEAVES);
case E_BLOCK_SAPLING: return new cBlockSaplingHandler (a_BlockType); cBlockSidewaysHandler BlockNewLogHandler (E_BLOCK_NEW_LOG);
case E_BLOCK_SEA_LANTERN: return new cBlockSeaLanternHandler (a_BlockType); cBlockEntityHandler BlockNoteBlockHandler (E_BLOCK_NOTE_BLOCK);
case E_BLOCK_SIGN_POST: return new cBlockSignPostHandler (a_BlockType); cBlockDoorHandler BlockOakDoorHandler (E_BLOCK_OAK_DOOR);
case E_BLOCK_SLIME_BLOCK: return new cBlockSlimeHandler (a_BlockType); cBlockFenceGateHandler BlockOakFenceGateHandler (E_BLOCK_OAK_FENCE_GATE);
case E_BLOCK_SNOW: return new cBlockSnowHandler (a_BlockType); cBlockStairsHandler BlockOakWoodStairsHandler (E_BLOCK_OAK_WOOD_STAIRS);
case E_BLOCK_SPONGE: return new cBlockSpongeHandler (a_BlockType); cBlockObserverHandler BlockObserverHandler (E_BLOCK_OBSERVER);
case E_BLOCK_SPRUCE_DOOR: return new cBlockDoorHandler (a_BlockType); cBlockHandler BlockObsidianHandler (E_BLOCK_OBSIDIAN);
case E_BLOCK_SPRUCE_FENCE: return new cBlockFenceHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockOrangeGlazedTerracottaHandler(E_BLOCK_ORANGE_GLAZED_TERRACOTTA);
case E_BLOCK_SPRUCE_FENCE_GATE: return new cBlockFenceGateHandler (a_BlockType); cBlockHandler BlockOrangeShulkerBoxHandler (E_BLOCK_ORANGE_SHULKER_BOX);
case E_BLOCK_SPRUCE_WOOD_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockIceHandler BlockPackedIceHandler (E_BLOCK_PACKED_ICE);
case E_BLOCK_STAINED_GLASS: return new cBlockGlassHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockPinkGlazedTerracottaHandler (E_BLOCK_PINK_GLAZED_TERRACOTTA);
case E_BLOCK_STAINED_GLASS_PANE: return new cBlockGlassHandler (a_BlockType); cBlockHandler BlockPinkShulkerBoxHandler (E_BLOCK_PINK_SHULKER_BOX);
case E_BLOCK_STATIONARY_LAVA: return new cBlockLavaHandler (a_BlockType); cBlockPistonHandler BlockPistonHandler (E_BLOCK_PISTON);
case E_BLOCK_STATIONARY_WATER: return new cBlockFluidHandler (a_BlockType); cBlockPistonHeadHandler BlockPistonHeadHandler;
case E_BLOCK_STICKY_PISTON: return new cBlockPistonHandler (a_BlockType); cBlockHandler BlockPistonMovedBlockHandler (E_BLOCK_PISTON_MOVED_BLOCK);
case E_BLOCK_STONE: return new cBlockStoneHandler (a_BlockType); cBlockPlanksHandler BlockPlanksHandler (E_BLOCK_PLANKS);
case E_BLOCK_STONE_BRICK_STAIRS: return new cBlockStairsHandler (a_BlockType); cBlockCropsHandler<7> BlockPotatoesHandler (E_BLOCK_POTATOES); // 8 stages of growth
case E_BLOCK_STONE_BUTTON: return new cBlockButtonHandler (a_BlockType); cBlockRailHandler BlockPoweredRailHandler (E_BLOCK_POWERED_RAIL);
case E_BLOCK_STONE_PRESSURE_PLATE: return new cBlockPressurePlateHandler (a_BlockType); cBlockHandler BlockPrismarineBlockHandler (E_BLOCK_PRISMARINE_BLOCK);
case E_BLOCK_STONE_SLAB: return new cBlockSlabHandler (a_BlockType); cBlockPumpkinHandler BlockPumpkinHandler (E_BLOCK_PUMPKIN);
case E_BLOCK_SUGARCANE: return new cBlockSugarcaneHandler (a_BlockType); cBlockPumpkinStemHandler BlockPumpkinStemHandler (E_BLOCK_PUMPKIN_STEM);
case E_BLOCK_TALL_GRASS: return new cBlockTallGrassHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockPurpleGlazedTerracottaHandler(E_BLOCK_PURPLE_GLAZED_TERRACOTTA);
case E_BLOCK_TNT: return new cBlockTNTHandler (a_BlockType); cBlockHandler BlockPurpleShulkerBoxHandler (E_BLOCK_PURPLE_SHULKER_BOX);
case E_BLOCK_TORCH: return new cBlockTorchHandler (a_BlockType); cBlockHandler BlockPurpurBlockHandler (E_BLOCK_PURPUR_BLOCK);
case E_BLOCK_TRAPDOOR: return new cBlockTrapdoorHandler (a_BlockType); cBlockDoubleSlabHandler BlockPurpurDoubleSlabHandler (E_BLOCK_PURPUR_DOUBLE_SLAB);
case E_BLOCK_TRAPPED_CHEST: return new cBlockChestHandler (a_BlockType); cBlockHandler BlockPurpurPillarHandler (E_BLOCK_PURPUR_PILLAR);
case E_BLOCK_TRIPWIRE: return new cBlockTripwireHandler (a_BlockType); cBlockSlabHandler BlockPurpurSlabHandler (E_BLOCK_PURPUR_SLAB);
case E_BLOCK_TRIPWIRE_HOOK: return new cBlockTripwireHookHandler (a_BlockType); cBlockStairsHandler BlockPurpurStairsHandler (E_BLOCK_PURPUR_STAIRS);
case E_BLOCK_VINES: return new cBlockVineHandler (a_BlockType); cBlockQuartzHandler BlockQuartzBlockHandler (E_BLOCK_QUARTZ_BLOCK);
case E_BLOCK_WALLSIGN: return new cBlockWallSignHandler (a_BlockType); cBlockStairsHandler BlockQuartzStairsHandler (E_BLOCK_QUARTZ_STAIRS);
case E_BLOCK_WATER: return new cBlockFluidHandler (a_BlockType); cBlockRailHandler BlockRailHandler (E_BLOCK_RAIL);
case E_BLOCK_WHITE_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockGlazedTerracottaHandler BlockRedGlazedTerracottaHandler (E_BLOCK_RED_GLAZED_TERRACOTTA);
case E_BLOCK_WOODEN_BUTTON: return new cBlockButtonHandler (a_BlockType); cBlockMushroomHandler BlockRedMushroomHandler (E_BLOCK_RED_MUSHROOM);
case E_BLOCK_WOODEN_PRESSURE_PLATE: return new cBlockPressurePlateHandler (a_BlockType); cBlockHandler BlockRedNetherBrickHandler (E_BLOCK_RED_NETHER_BRICK);
case E_BLOCK_WOODEN_SLAB: return new cBlockSlabHandler (a_BlockType); cBlockFlowerHandler BlockRedRoseHandler (E_BLOCK_RED_ROSE);
case E_BLOCK_WOOL: return new cBlockClothHandler (a_BlockType); cBlockHandler BlockRedSandstoneHandler (E_BLOCK_RED_SANDSTONE);
case E_BLOCK_WORKBENCH: return new cBlockWorkbenchHandler (a_BlockType); cBlockSlabHandler BlockRedSandstoneSlabHandler (E_BLOCK_RED_SANDSTONE_SLAB);
case E_BLOCK_YELLOW_FLOWER: return new cBlockFlowerHandler (a_BlockType); cBlockStairsHandler BlockRedSandstoneStairsHandler (E_BLOCK_RED_SANDSTONE_STAIRS);
case E_BLOCK_YELLOW_GLAZED_TERRACOTTA: return new cBlockGlazedTerracottaHandler (a_BlockType); cBlockHandler BlockRedShulkerBoxHandler (E_BLOCK_RED_SHULKER_BOX);
cBlockRedstoneLampHandler BlockRedstoneLampHandler (E_BLOCK_REDSTONE_LAMP_ON);
default: return new cBlockHandler(a_BlockType); cBlockGlowingRedstoneOreHandler BlockRedstoneOreGlowingHandler (E_BLOCK_REDSTONE_ORE_GLOWING);
} cBlockRedstoneOreHandler BlockRedstoneOreHandler (E_BLOCK_REDSTONE_ORE);
cBlockRedstoneRepeaterHandler BlockRedstoneRepeaterOffHandler (E_BLOCK_REDSTONE_REPEATER_OFF);
cBlockRedstoneRepeaterHandler BlockRedstoneRepeaterOnHandler (E_BLOCK_REDSTONE_REPEATER_ON);
cBlockRedstoneTorchHandler BlockRedstoneTorchOffHandler (E_BLOCK_REDSTONE_TORCH_OFF);
cBlockRedstoneTorchHandler BlockRedstoneTorchOnHandler (E_BLOCK_REDSTONE_TORCH_ON);
cBlockRedstoneHandler BlockRedstoneWireHandler (E_BLOCK_REDSTONE_WIRE);
cBlockCommandBlockHandler BlockRepeatingCommandBlockHandler (E_BLOCK_REPEATING_COMMAND_BLOCK);
cBlockSandHandler BlockSandHandler (E_BLOCK_SAND);
cBlockHandler BlockSandstoneHandler (E_BLOCK_SANDSTONE);
cBlockStairsHandler BlockSandstoneStairsHandler (E_BLOCK_SANDSTONE_STAIRS);
cBlockSaplingHandler BlockSaplingHandler (E_BLOCK_SAPLING);
cBlockSeaLanternHandler BlockSeaLanternHandler (E_BLOCK_SEA_LANTERN);
cBlockSignPostHandler BlockSignPostHandler (E_BLOCK_SIGN_POST);
cBlockSlimeHandler BlockSlimeBlockHandler (E_BLOCK_SLIME_BLOCK);
cBlockHandler BlockSnowBlockHandler (E_BLOCK_SNOW_BLOCK);
cBlockSnowHandler BlockSnowHandler (E_BLOCK_SNOW);
cBlockHandler BlockSoulSandHandler (E_BLOCK_SOULSAND);
cBlockSpongeHandler BlockSpongeHandler (E_BLOCK_SPONGE);
cBlockDoorHandler BlockSpruceDoorHandler (E_BLOCK_SPRUCE_DOOR);
cBlockFenceGateHandler BlockSpruceFenceGateHandler (E_BLOCK_SPRUCE_FENCE_GATE);
cBlockFenceHandler BlockSpruceFenceHandler (E_BLOCK_SPRUCE_FENCE);
cBlockStairsHandler BlockSpruceWoodStairsHandler (E_BLOCK_SPRUCE_WOOD_STAIRS);
cBlockHandler BlockStainedClayHandler (E_BLOCK_STAINED_CLAY);
cBlockGlassHandler BlockStainedGlassHandler (E_BLOCK_STAINED_GLASS);
cBlockGlassHandler BlockStainedGlassPaneHandler (E_BLOCK_STAINED_GLASS_PANE);
cBlockHandler BlockStandingBannerHandler (E_BLOCK_STANDING_BANNER); // TODO: drops correct?
cBlockLavaHandler BlockStationaryLavaHandler (E_BLOCK_STATIONARY_LAVA);
cBlockFluidHandler BlockStationaryWaterHandler (E_BLOCK_STATIONARY_WATER);
cBlockPistonHandler BlockStickyPistonHandler (E_BLOCK_STICKY_PISTON);
cBlockStairsHandler BlockStoneBrickStairsHandler (E_BLOCK_STONE_BRICK_STAIRS);
cBlockHandler BlockStoneBricksHandler (E_BLOCK_STONE_BRICKS);
cBlockButtonHandler BlockStoneButtonHandler (E_BLOCK_STONE_BUTTON);
cBlockStoneHandler BlockStoneHandler (E_BLOCK_STONE);
cBlockPressurePlateHandler BlockStonePressurePlateHandler (E_BLOCK_STONE_PRESSURE_PLATE);
cBlockSlabHandler BlockStoneSlabHandler (E_BLOCK_STONE_SLAB);
cBlockHandler BlockStructureBlockHandler (E_BLOCK_STRUCTURE_BLOCK);
cBlockHandler BlockStructureVoidHandler (E_BLOCK_STRUCTURE_VOID);
cBlockSugarcaneHandler BlockSugarcaneHandler (E_BLOCK_SUGARCANE);
cBlockTallGrassHandler BlockTallGrassHandler (E_BLOCK_TALL_GRASS);
cBlockTNTHandler BlockTntHandler (E_BLOCK_TNT);
cBlockTorchHandler BlockTorchHandler (E_BLOCK_TORCH);
cBlockTrapdoorHandler BlockTrapdoorHandler (E_BLOCK_TRAPDOOR);
cBlockChestHandler BlockTrappedChestHandler (E_BLOCK_TRAPPED_CHEST);
cBlockTripwireHandler BlockTripwireHandler (E_BLOCK_TRIPWIRE);
cBlockTripwireHookHandler BlockTripwireHookHandler (E_BLOCK_TRIPWIRE_HOOK);
cBlockVineHandler BlockVinesHandler (E_BLOCK_VINES);
cBlockHandler BlockWallBannerHandler (E_BLOCK_WALL_BANNER); // TODO: drops correct?
cBlockWallSignHandler BlockWallsignHandler (E_BLOCK_WALLSIGN);
cBlockFluidHandler BlockWaterHandler (E_BLOCK_WATER);
cBlockGlazedTerracottaHandler BlockWhiteGlazedTerracottaHandler (E_BLOCK_WHITE_GLAZED_TERRACOTTA);
cBlockHandler BlockWhiteShulkerBoxHandler (E_BLOCK_WHITE_SHULKER_BOX);
cBlockButtonHandler BlockWoodenButtonHandler (E_BLOCK_WOODEN_BUTTON);
cBlockPressurePlateHandler BlockWoodenPressurePlateHandler (E_BLOCK_WOODEN_PRESSURE_PLATE);
cBlockSlabHandler BlockWoodenSlabHandler (E_BLOCK_WOODEN_SLAB);
cBlockClothHandler BlockWoolHandler (E_BLOCK_WOOL);
cBlockWorkbenchHandler BlockWorkbenchHandler (E_BLOCK_WORKBENCH);
cBlockFlowerHandler BlockYellowFlowerHandler (E_BLOCK_YELLOW_FLOWER);
cBlockGlazedTerracottaHandler BlockYellowGlazedTerracottaHandler(E_BLOCK_YELLOW_GLAZED_TERRACOTTA);
cBlockHandler BlockYellowShulkerBoxHandler (E_BLOCK_YELLOW_SHULKER_BOX);
} }
@ -599,9 +656,274 @@ bool cBlockHandler::ToolHasSilkTouch(const cItem * a_Tool)
cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE aBlockType) cBlockHandler & cBlockHandler::GetBlockHandler(BLOCKTYPE a_BlockType)
{ {
return ::CreateBlockHandler(aBlockType); // Switch on the block type, as an enumeration
// Clang will fail if any type is unhandled:
switch (static_cast<ENUM_BLOCK_TYPE>(a_BlockType))
{
// Block handlers, alphabetically sorted:
case E_BLOCK_ACACIA_DOOR: return BlockAcaciaDoorHandler;
case E_BLOCK_ACACIA_FENCE: return BlockAcaciaFenceHandler;
case E_BLOCK_ACACIA_FENCE_GATE: return BlockAcaciaFenceGateHandler;
case E_BLOCK_ACACIA_WOOD_STAIRS: return BlockAcaciaWoodStairsHandler;
case E_BLOCK_ACTIVATOR_RAIL: return BlockActivatorRailHandler;
case E_BLOCK_ACTIVE_COMPARATOR: return BlockActiveComparatorHandler;
case E_BLOCK_AIR: return BlockAirHandler;
case E_BLOCK_ANVIL: return BlockAnvilHandler;
case E_BLOCK_BARRIER: return BlockBarrierHandler;
case E_BLOCK_BEACON: return BlockBeaconHandler;
case E_BLOCK_BED: return BlockBedHandler;
case E_BLOCK_BEDROCK: return BlockBedrockHandler;
case E_BLOCK_BEETROOTS: return BlockBeetrootsHandler;
case E_BLOCK_BIG_FLOWER: return BlockBigFlowerHandler;
case E_BLOCK_BIRCH_DOOR: return BlockBirchDoorHandler;
case E_BLOCK_BIRCH_FENCE: return BlockBirchFenceHandler;
case E_BLOCK_BIRCH_FENCE_GATE: return BlockBirchFenceGateHandler;
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_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_STAIRS: return BlockBrickStairsHandler;
case E_BLOCK_BROWN_GLAZED_TERRACOTTA: return BlockBrownGlazedTerracottaHandler;
case E_BLOCK_BROWN_MUSHROOM: return BlockBrownMushroomHandler;
case E_BLOCK_BROWN_SHULKER_BOX: return BlockBrownShulkerBoxHandler;
case E_BLOCK_CACTUS: return BlockCactusHandler;
case E_BLOCK_CAKE: return BlockCakeHandler;
case E_BLOCK_CARPET: return BlockCarpetHandler;
case E_BLOCK_CARROTS: return BlockCarrotsHandler;
case E_BLOCK_CAULDRON: return BlockCauldronHandler;
case E_BLOCK_CHAIN_COMMAND_BLOCK: return BlockChainCommandBlockHandler;
case E_BLOCK_CHEST: return BlockChestHandler;
case E_BLOCK_CHORUS_FLOWER: return BlockChorusFlowerHandler;
case E_BLOCK_CHORUS_PLANT: return BlockChorusPlantHandler;
case E_BLOCK_CLAY: return BlockClayHandler;
case E_BLOCK_COAL_ORE: return BlockCoalOreHandler;
case E_BLOCK_COBBLESTONE: return BlockCobblestoneHandler;
case E_BLOCK_COBBLESTONE_STAIRS: return BlockCobblestoneStairsHandler;
case E_BLOCK_COBBLESTONE_WALL: return BlockCobblestoneWallHandler;
case E_BLOCK_COBWEB: return BlockCobwebHandler;
case E_BLOCK_COCOA_POD: return BlockCocoaPodHandler;
case E_BLOCK_COMMAND_BLOCK: return BlockCommandBlockHandler;
case E_BLOCK_CONCRETE: return BlockConcreteHandler;
case E_BLOCK_CONCRETE_POWDER: return BlockConcretePowderHandler;
case E_BLOCK_CROPS: return BlockCropsHandler;
case E_BLOCK_CYAN_GLAZED_TERRACOTTA: return BlockCyanGlazedTerracottaHandler;
case E_BLOCK_CYAN_SHULKER_BOX: return BlockCyanShulkerBoxHandler;
case E_BLOCK_DARK_OAK_DOOR: return BlockDarkOakDoorHandler;
case E_BLOCK_DARK_OAK_FENCE: return BlockDarkOakFenceHandler;
case E_BLOCK_DARK_OAK_FENCE_GATE: return BlockDarkOakFenceGateHandler;
case E_BLOCK_DARK_OAK_WOOD_STAIRS: return BlockDarkOakWoodStairsHandler;
case E_BLOCK_DAYLIGHT_SENSOR: return BlockDaylightSensorHandler;
case E_BLOCK_DEAD_BUSH: return BlockDeadBushHandler;
case E_BLOCK_DETECTOR_RAIL: return BlockDetectorRailHandler;
case E_BLOCK_DIAMOND_BLOCK: return BlockDiamondBlockHandler;
case E_BLOCK_DIAMOND_ORE: return BlockDiamondOreHandler;
case E_BLOCK_DIRT: return BlockDirtHandler;
case E_BLOCK_DISPENSER: return BlockDispenserHandler;
case E_BLOCK_DOUBLE_RED_SANDSTONE_SLAB: return BlockDoubleRedSandstoneSlabHandler;
case E_BLOCK_DOUBLE_STONE_SLAB: return BlockDoubleStoneSlabHandler;
case E_BLOCK_DOUBLE_WOODEN_SLAB: return BlockDoubleWoodenSlabHandler;
case E_BLOCK_DRAGON_EGG: return BlockDragonEggHandler;
case E_BLOCK_DROPPER: return BlockDropperHandler;
case E_BLOCK_EMERALD_BLOCK: return BlockEmeraldBlockHandler;
case E_BLOCK_EMERALD_ORE: return BlockEmeraldOreHandler;
case E_BLOCK_ENCHANTMENT_TABLE: return BlockEnchantmentTableHandler;
case E_BLOCK_ENDER_CHEST: return BlockEnderChestHandler;
case E_BLOCK_END_BRICKS: return BlockEndBricksHandler;
case E_BLOCK_END_GATEWAY: return BlockEndGatewayHandler;
case E_BLOCK_END_PORTAL: return BlockEndPortalHandler;
case E_BLOCK_END_PORTAL_FRAME: return BlockEndPortalFrameHandler;
case E_BLOCK_END_ROD: return BlockEndRodHandler;
case E_BLOCK_END_STONE: return BlockEndStoneHandler;
case E_BLOCK_FARMLAND: return BlockFarmlandHandler;
case E_BLOCK_FENCE: return BlockFenceHandler;
case E_BLOCK_FIRE: return BlockFireHandler;
case E_BLOCK_FLOWER_POT: return BlockFlowerPotHandler;
case E_BLOCK_FROSTED_ICE: return BlockFrostedIceHandler;
case E_BLOCK_FURNACE: return BlockFurnaceHandler;
case E_BLOCK_GLASS: return BlockGlassHandler;
case E_BLOCK_GLASS_PANE: return BlockGlassPaneHandler;
case E_BLOCK_GLOWSTONE: return BlockGlowstoneHandler;
case E_BLOCK_GOLD_BLOCK: return BlockGoldBlockHandler;
case E_BLOCK_GOLD_ORE: return BlockGoldOreHandler;
case E_BLOCK_GRASS: return BlockGrassHandler;
case E_BLOCK_GRASS_PATH: return BlockGrassPathHandler;
case E_BLOCK_GRAVEL: return BlockGravelHandler;
case E_BLOCK_GRAY_GLAZED_TERRACOTTA: return BlockGrayGlazedTerracottaHandler;
case E_BLOCK_GRAY_SHULKER_BOX: return BlockGrayShulkerBoxHandler;
case E_BLOCK_GREEN_GLAZED_TERRACOTTA: return BlockGreenGlazedTerracottaHandler;
case E_BLOCK_GREEN_SHULKER_BOX: return BlockGreenShulkerBoxHandler;
case E_BLOCK_HARDENED_CLAY: return BlockHardenedClayHandler;
case E_BLOCK_HAY_BALE: return BlockHayBaleHandler;
case E_BLOCK_HEAD: return BlockHeadHandler;
case E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE: return BlockHeavyWeightedPressurePHandler;
case E_BLOCK_HOPPER: return BlockHopperHandler;
case E_BLOCK_HUGE_BROWN_MUSHROOM: return BlockHugeBrownMushroomHandler;
case E_BLOCK_HUGE_RED_MUSHROOM: return BlockHugeRedMushroomHandler;
case E_BLOCK_ICE: return BlockIceHandler;
case E_BLOCK_INACTIVE_COMPARATOR: return BlockInactiveComparatorHandler;
case E_BLOCK_INVERTED_DAYLIGHT_SENSOR: return BlockDaylightSensorHandler;
case E_BLOCK_IRON_BARS: return BlockIronBarsHandler;
case E_BLOCK_IRON_BLOCK: return BlockIronBlockHandler;
case E_BLOCK_IRON_DOOR: return BlockIronDoorHandler;
case E_BLOCK_IRON_ORE: return BlockIronOreHandler;
case E_BLOCK_IRON_TRAPDOOR: return BlockIronTrapdoorHandler;
case E_BLOCK_JACK_O_LANTERN: return BlockJackOLanternHandler;
case E_BLOCK_JUKEBOX: return BlockJukeboxHandler;
case E_BLOCK_JUNGLE_DOOR: return BlockJungleDoorHandler;
case E_BLOCK_JUNGLE_FENCE: return BlockJungleFenceHandler;
case E_BLOCK_JUNGLE_FENCE_GATE: return BlockJungleFenceGateHandler;
case E_BLOCK_JUNGLE_WOOD_STAIRS: return BlockJungleWoodStairsHandler;
case E_BLOCK_LADDER: return BlockLadderHandler;
case E_BLOCK_LAPIS_BLOCK: return BlockLapisBlockHandler;
case E_BLOCK_LAPIS_ORE: return BlockLapisOreHandler;
case E_BLOCK_LAVA: return BlockLavaHandler;
case E_BLOCK_LEAVES: return BlockLeavesHandler;
case E_BLOCK_LEVER: return BlockLeverHandler;
case E_BLOCK_LIGHT_BLUE_GLAZED_TERRACOTTA: return BlockLightBlueGlazedTerracoHandler;
case E_BLOCK_LIGHT_BLUE_SHULKER_BOX: return BlockLightBlueShulkerBoxHandler;
case E_BLOCK_LIGHT_GRAY_GLAZED_TERRACOTTA: return BlockLightGrayGlazedTerracoHandler;
case E_BLOCK_LIGHT_GRAY_SHULKER_BOX: return BlockLightGrayShulkerBoxHandler;
case E_BLOCK_LIGHT_WEIGHTED_PRESSURE_PLATE: return BlockLightWeightedPressurePHandler;
case E_BLOCK_LILY_PAD: return BlockLilyPadHandler;
case E_BLOCK_LIME_GLAZED_TERRACOTTA: return BlockLimeGlazedTerracottaHandler;
case E_BLOCK_LIME_SHULKER_BOX: return BlockLimeShulkerBoxHandler;
case E_BLOCK_LIT_FURNACE: return BlockLitFurnaceHandler;
case E_BLOCK_LOG: return BlockLogHandler;
case E_BLOCK_MAGENTA_GLAZED_TERRACOTTA: return BlockMagentaGlazedTerracottHandler;
case E_BLOCK_MAGENTA_SHULKER_BOX: return BlockMagentaShulkerBoxHandler;
case E_BLOCK_MAGMA: return BlockMagmaHandler;
case E_BLOCK_MELON: return BlockMelonHandler;
case E_BLOCK_MELON_STEM: return BlockMelonStemHandler;
case E_BLOCK_MOB_SPAWNER: return BlockMobSpawnerHandler;
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_FENCE: return BlockNetherBrickFenceHandler;
case E_BLOCK_NETHER_BRICK_STAIRS: return BlockNetherBrickStairsHandler;
case E_BLOCK_NETHER_PORTAL: return BlockNetherPortalHandler;
case E_BLOCK_NETHER_QUARTZ_ORE: return BlockNetherQuartzOreHandler;
case E_BLOCK_NETHER_WART: return BlockNetherWartHandler;
case E_BLOCK_NETHER_WART_BLOCK: return BlockNetherWartBlockHandler;
case E_BLOCK_NEW_LEAVES: return BlockNewLeavesHandler;
case E_BLOCK_NEW_LOG: return BlockNewLogHandler;
case E_BLOCK_NOTE_BLOCK: return BlockNoteBlockHandler;
case E_BLOCK_OAK_DOOR: return BlockOakDoorHandler;
case E_BLOCK_OAK_FENCE_GATE: return BlockOakFenceGateHandler;
case E_BLOCK_OAK_WOOD_STAIRS: return BlockOakWoodStairsHandler;
case E_BLOCK_OBSERVER: return BlockObserverHandler;
case E_BLOCK_OBSIDIAN: return BlockObsidianHandler;
case E_BLOCK_ORANGE_GLAZED_TERRACOTTA: return BlockOrangeGlazedTerracottaHandler;
case E_BLOCK_ORANGE_SHULKER_BOX: return BlockOrangeShulkerBoxHandler;
case E_BLOCK_PACKED_ICE: return BlockPackedIceHandler;
case E_BLOCK_PINK_GLAZED_TERRACOTTA: return BlockPinkGlazedTerracottaHandler;
case E_BLOCK_PINK_SHULKER_BOX: return BlockPinkShulkerBoxHandler;
case E_BLOCK_PISTON: return BlockPistonHandler;
case E_BLOCK_PISTON_EXTENSION: return BlockPistonHeadHandler;
case E_BLOCK_PISTON_MOVED_BLOCK: return BlockPistonMovedBlockHandler;
case E_BLOCK_PLANKS: return BlockPlanksHandler;
case E_BLOCK_POTATOES: return BlockPotatoesHandler;
case E_BLOCK_POWERED_RAIL: return BlockPoweredRailHandler;
case E_BLOCK_PRISMARINE_BLOCK: return BlockPrismarineBlockHandler;
case E_BLOCK_PUMPKIN: return BlockPumpkinHandler;
case E_BLOCK_PUMPKIN_STEM: return BlockPumpkinStemHandler;
case E_BLOCK_PURPLE_GLAZED_TERRACOTTA: return BlockPurpleGlazedTerracottaHandler;
case E_BLOCK_PURPLE_SHULKER_BOX: return BlockPurpleShulkerBoxHandler;
case E_BLOCK_PURPUR_BLOCK: return BlockPurpurBlockHandler;
case E_BLOCK_PURPUR_DOUBLE_SLAB: return BlockPurpurDoubleSlabHandler;
case E_BLOCK_PURPUR_PILLAR: return BlockPurpurPillarHandler;
case E_BLOCK_PURPUR_SLAB: return BlockPurpurSlabHandler;
case E_BLOCK_PURPUR_STAIRS: return BlockPurpurStairsHandler;
case E_BLOCK_QUARTZ_BLOCK: return BlockQuartzBlockHandler;
case E_BLOCK_QUARTZ_STAIRS: return BlockQuartzStairsHandler;
case E_BLOCK_RAIL: return BlockRailHandler;
case E_BLOCK_REDSTONE_LAMP_OFF: return BlockRedstoneLampHandler;
case E_BLOCK_REDSTONE_LAMP_ON: return BlockRedstoneLampHandler;
case E_BLOCK_REDSTONE_ORE: return BlockRedstoneOreHandler;
case E_BLOCK_REDSTONE_ORE_GLOWING: return BlockRedstoneOreGlowingHandler;
case E_BLOCK_REDSTONE_REPEATER_OFF: return BlockRedstoneRepeaterOffHandler;
case E_BLOCK_REDSTONE_REPEATER_ON: return BlockRedstoneRepeaterOnHandler;
case E_BLOCK_REDSTONE_TORCH_OFF: return BlockRedstoneTorchOffHandler;
case E_BLOCK_REDSTONE_TORCH_ON: return BlockRedstoneTorchOnHandler;
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_ROSE: return BlockRedRoseHandler;
case E_BLOCK_RED_SANDSTONE: return BlockRedSandstoneHandler;
case E_BLOCK_RED_SANDSTONE_SLAB: return BlockRedSandstoneSlabHandler;
case E_BLOCK_RED_SANDSTONE_STAIRS: return BlockRedSandstoneStairsHandler;
case E_BLOCK_RED_SHULKER_BOX: return BlockRedShulkerBoxHandler;
case E_BLOCK_REPEATING_COMMAND_BLOCK: return BlockRepeatingCommandBlockHandler;
case E_BLOCK_SAND: return BlockSandHandler;
case E_BLOCK_SANDSTONE: return BlockSandstoneHandler;
case E_BLOCK_SANDSTONE_STAIRS: return BlockSandstoneStairsHandler;
case E_BLOCK_SAPLING: return BlockSaplingHandler;
case E_BLOCK_SEA_LANTERN: return BlockSeaLanternHandler;
case E_BLOCK_SIGN_POST: return BlockSignPostHandler;
case E_BLOCK_SILVERFISH_EGG: return BlockInfestedBlockHandler;
case E_BLOCK_SLIME_BLOCK: return BlockSlimeBlockHandler;
case E_BLOCK_SNOW: return BlockSnowHandler;
case E_BLOCK_SNOW_BLOCK: return BlockSnowBlockHandler;
case E_BLOCK_SOULSAND: return BlockSoulSandHandler;
case E_BLOCK_SPONGE: return BlockSpongeHandler;
case E_BLOCK_SPRUCE_DOOR: return BlockSpruceDoorHandler;
case E_BLOCK_SPRUCE_FENCE: return BlockSpruceFenceHandler;
case E_BLOCK_SPRUCE_FENCE_GATE: return BlockSpruceFenceGateHandler;
case E_BLOCK_SPRUCE_WOOD_STAIRS: return BlockSpruceWoodStairsHandler;
case E_BLOCK_STAINED_CLAY: return BlockStainedClayHandler;
case E_BLOCK_STAINED_GLASS: return BlockStainedGlassHandler;
case E_BLOCK_STAINED_GLASS_PANE: return BlockStainedGlassPaneHandler;
case E_BLOCK_STANDING_BANNER: return BlockStandingBannerHandler;
case E_BLOCK_STATIONARY_LAVA: return BlockStationaryLavaHandler;
case E_BLOCK_STATIONARY_WATER: return BlockStationaryWaterHandler;
case E_BLOCK_STICKY_PISTON: return BlockStickyPistonHandler;
case E_BLOCK_STONE: return BlockStoneHandler;
case E_BLOCK_STONE_BRICKS: return BlockStoneBricksHandler;
case E_BLOCK_STONE_BRICK_STAIRS: return BlockStoneBrickStairsHandler;
case E_BLOCK_STONE_BUTTON: return BlockStoneButtonHandler;
case E_BLOCK_STONE_PRESSURE_PLATE: return BlockStonePressurePlateHandler;
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_TALL_GRASS: return BlockTallGrassHandler;
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;
case E_BLOCK_TRIPWIRE: return BlockTripwireHandler;
case E_BLOCK_TRIPWIRE_HOOK: return BlockTripwireHookHandler;
case E_BLOCK_VINES: return BlockVinesHandler;
case E_BLOCK_WALLSIGN: return BlockWallsignHandler;
case E_BLOCK_WALL_BANNER: return BlockWallBannerHandler;
case E_BLOCK_WATER: return BlockWaterHandler;
case E_BLOCK_WHITE_GLAZED_TERRACOTTA: return BlockWhiteGlazedTerracottaHandler;
case E_BLOCK_WHITE_SHULKER_BOX: return BlockWhiteShulkerBoxHandler;
case E_BLOCK_WOODEN_BUTTON: return BlockWoodenButtonHandler;
case E_BLOCK_WOODEN_PRESSURE_PLATE: return BlockWoodenPressurePlateHandler;
case E_BLOCK_WOODEN_SLAB: return BlockWoodenSlabHandler;
case E_BLOCK_WOOL: return BlockWoolHandler;
case E_BLOCK_WORKBENCH: return BlockWorkbenchHandler;
case E_BLOCK_YELLOW_FLOWER: return BlockYellowFlowerHandler;
case E_BLOCK_YELLOW_GLAZED_TERRACOTTA: return BlockYellowGlazedTerracottaHandler;
case E_BLOCK_YELLOW_SHULKER_BOX: return BlockYellowShulkerBoxHandler;
// TODO: these will be removed in 1.13+ migration
case E_BLOCK_NUMBER_OF_TYPES:
case E_BLOCK_UNFINISHED: return BlockAirHandler;
}
UNREACHABLE("Getting handler for unexpected block type");
} }
@ -1300,7 +1622,7 @@ void Temporary::RegisterAllBlockHandlers(BlockTypeRegistry & aRegistry)
for (const auto & r: regs) for (const auto & r: regs)
{ {
std::shared_ptr<cBlockHandler> handler(::CreateBlockHandler(r.oldBlockType)); // std::shared_ptr<cBlockHandler> handler(::CreateBlockHandler(r.oldBlockType));
aRegistry.registerBlockType("<built-in>", r.newBlockTypeName, handler); // aRegistry.registerBlockType("<built-in>", r.newBlockTypeName, handler);
} }
} }

6
src/Blocks/BlockHandler.h
View File

@ -228,12 +228,12 @@ public:
Helper used in many ConvertToPickups() implementations. */ Helper used in many ConvertToPickups() implementations. */
static bool ToolHasSilkTouch(const cItem * a_Tool); static bool ToolHasSilkTouch(const cItem * a_Tool);
// Gets the blockhandler for the given block type.
static cBlockHandler & GetBlockHandler(BLOCKTYPE a_BlockType);
protected: protected:
BLOCKTYPE m_BlockType;
// Creates a new blockhandler for the given block type. For internal use only, use ::GetBlockHandler() instead. BLOCKTYPE m_BlockType;
static cBlockHandler * CreateBlockHandler(BLOCKTYPE a_BlockType);
friend class cBlockInfo; friend class cBlockInfo;
}; };

6
tests/Generating/Stubs.cpp
View File

@ -406,7 +406,9 @@ void cItem::Empty()
cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType) cBlockHandler & cBlockHandler::GetBlockHandler(BLOCKTYPE a_BlockType)
{ {
return new cBlockHandler(a_BlockType); // Dummy handler.
static cBlockHandler Handler(E_BLOCK_AIR);
return Handler;
} }

25
tests/LuaThreadStress/Stubs.cpp
View File

@ -86,15 +86,6 @@ extern "C" int luaopen_lxp(lua_State * a_LuaState)
void cBlockInfo::sHandlerDeleter::operator () (cBlockHandler * a_Handler)
{
delete a_Handler;
}
cBlockInfo::cBlockInfo() cBlockInfo::cBlockInfo()
{ {
} }
@ -105,13 +96,15 @@ cBlockInfo::cBlockInfo()
cBlockInfo::cBlockInfoArray::cBlockInfoArray() cBlockInfo::cBlockInfoArray::cBlockInfoArray()
{ {
cBlockInfoArray & BlockInfos = *this; }
// The piece-loading code uses the handlers for rotations, so we need valid handlers
// Insert dummy handlers:
for (size_t i = 0; i < BlockInfos.size(); i++)
{
BlockInfos[i].m_Handler.reset(new cBlockHandler(static_cast<BLOCKTYPE>(i)));
} cBlockHandler * cBlockInfo::GetHandler(BLOCKTYPE a_Type)
{
return nullptr;
} }

13
tests/SchematicFileSerializer/Stubs.cpp
View File

@ -21,24 +21,17 @@ cBlockInfo::cBlockInfo()
void cBlockInfo::sHandlerDeleter::operator () (cBlockHandler * a_Handler) cBlockInfo::cBlockInfoArray::cBlockInfoArray()
{ {
delete a_Handler;
} }
cBlockInfo::cBlockInfoArray::cBlockInfoArray() cBlockHandler * cBlockInfo::GetHandler(BLOCKTYPE a_Type)
{ {
cBlockInfoArray & BlockInfos = *this; return nullptr;
// The piece-loading code uses the handlers for rotations, so we need valid handlers
// Insert dummy handlers:
for (size_t i = 0; i < BlockInfos.size(); i++)
{
BlockInfos[i].m_Handler.reset(new cBlockHandler(static_cast<BLOCKTYPE>(i)));
}
} }