From 36be0211f96a8ce0e8eb76d9c3b07e788315fed9 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Wed, 10 Jul 2024 19:58:25 +0300 Subject: [PATCH] static blockID for all blocks --- src/material/Block.php | 2 +- src/material/StaticBlock.php | 5 ++--- src/material/block/attachable/LadderBlock.php | 1 + src/material/block/attachable/SignPostBlock.php | 2 +- src/material/block/attachable/TorchBlock.php | 1 + src/material/block/attachable/TrapdoorBlock.php | 3 ++- src/material/block/attachable/WallSignBlock.php | 1 + src/material/block/liquid/WaterBlock.php | 1 - src/material/block/misc/AirBlock.php | 2 ++ src/material/block/misc/BedBlock.php | 2 +- src/material/block/misc/FireBlock.php | 2 +- src/material/block/misc/NetherReactorBlock.php | 1 + src/material/block/misc/TNTBlock.php | 1 + src/material/block/nonfull/CakeBlock.php | 1 + src/material/block/nonfull/CarpetBlock.php | 1 + src/material/block/nonfull/ChestBlock.php | 1 + src/material/block/nonfull/CobwebBlock.php | 1 + src/material/block/nonfull/FarmlandBlock.php | 1 + src/material/block/nonfull/FenceBlock.php | 2 +- src/material/block/nonfull/FenceGateBlock.php | 2 +- src/material/block/nonfull/GlassPaneBlock.php | 1 + src/material/block/nonfull/IronBarsBlock.php | 1 + src/material/block/nonfull/IronDoorBlock.php | 1 + src/material/block/nonfull/PoweredRailBlock.php | 1 + src/material/block/nonfull/RailBlock.php | 1 + src/material/block/nonfull/SlabBlock.php | 2 +- src/material/block/nonfull/SnowLayerBlock.php | 1 + src/material/block/nonfull/StoneWallBlock.php | 1 + src/material/block/nonfull/WoodDoorBlock.php | 1 + src/material/block/nonfull/WoodSlabBlock.php | 1 + src/material/block/nonfull/stairs/BirchWoodStairsBlock.php | 1 + src/material/block/nonfull/stairs/BrickStairsBlock.php | 1 + src/material/block/nonfull/stairs/CobblestoneStairsBlock.php | 1 + src/material/block/nonfull/stairs/JungleWoodStairsBlock.php | 1 + .../block/nonfull/stairs/NetherBricksStairsBlock.php | 1 + src/material/block/nonfull/stairs/QuartzStairsBlock.php | 1 + src/material/block/nonfull/stairs/SandstoneStairsBlock.php | 1 + src/material/block/nonfull/stairs/SpruceWoodStairsBlock.php | 1 + src/material/block/nonfull/stairs/StoneBrickStairsBlock.php | 1 + src/material/block/nonfull/stairs/WoodStairsBlock.php | 1 + src/material/block/ore/CoalOreBlock.php | 1 + src/material/block/ore/DiamondOreBlock.php | 1 + src/material/block/ore/GlowingRedstoneOreBlock.php | 1 + src/material/block/ore/GoldOreBlock.php | 1 + src/material/block/ore/IronOreBlock.php | 1 + src/material/block/ore/LapisOreBlock.php | 1 + src/material/block/ore/RedstoneOreBlock.php | 1 + src/material/block/plant/BeetrootBlock.php | 1 + src/material/block/plant/BrownMushroomBlock.php | 1 + src/material/block/plant/CactusBlock.php | 1 + src/material/block/plant/CarrotBlock.php | 1 + src/material/block/plant/CyanFlowerBlock.php | 1 + src/material/block/plant/DandelionBlock.php | 1 + src/material/block/plant/DeadBushBlock.php | 1 + src/material/block/plant/MelonStemBlock.php | 1 + src/material/block/plant/PotatoBlock.php | 1 + src/material/block/plant/PumpkinStemBlock.php | 1 + src/material/block/plant/RedMushroomBlock.php | 1 + src/material/block/plant/SaplingBlock.php | 1 + src/material/block/plant/SugarcaneBlock.php | 1 + src/material/block/plant/TallGrassBlock.php | 1 + src/material/block/plant/WheatBlock.php | 1 + src/material/block/solid/BedrockBlock.php | 1 + src/material/block/solid/BookshelfBlock.php | 1 + src/material/block/solid/BricksBlock.php | 1 + src/material/block/solid/BurningFurnaceBlock.php | 1 + src/material/block/solid/ClayBlock.php | 1 + src/material/block/solid/CoalBlock.php | 1 + src/material/block/solid/CobblestoneBlock.php | 1 + src/material/block/solid/DiamondBlock.php | 1 + src/material/block/solid/DirtBlock.php | 1 + src/material/block/solid/DoubleSlabBlock.php | 1 + src/material/block/solid/DoubleWoodSlabBlock.php | 1 + src/material/block/solid/FurnaceBlock.php | 1 + src/material/block/solid/GlassBlock.php | 1 + src/material/block/solid/GlowingObsidianBlock.php | 1 + src/material/block/solid/GlowstoneBlock.php | 1 + src/material/block/solid/GoldBlock.php | 1 + src/material/block/solid/GrassBlock.php | 1 + src/material/block/solid/GravelBlock.php | 1 + src/material/block/solid/HayBaleBlock.php | 1 + src/material/block/solid/IceBlock.php | 1 + src/material/block/solid/InfoUpdate2Block.php | 1 + src/material/block/solid/InfoUpdateBlock.php | 1 + src/material/block/solid/InvisibleBedrockBlock.php | 1 + src/material/block/solid/IronBlock.php | 1 + src/material/block/solid/LapisBlock.php | 1 + src/material/block/solid/LeavesBlock.php | 1 + src/material/block/solid/LitPumpkinBlock.php | 2 +- src/material/block/solid/MelonBlock.php | 1 + src/material/block/solid/MossStoneBlock.php | 1 + src/material/block/solid/NetherBricksBlock.php | 1 + src/material/block/solid/NetherrackBlock.php | 1 + src/material/block/solid/ObsidianBlock.php | 1 + src/material/block/solid/PlanksBlock.php | 1 + src/material/block/solid/PumpkinBlock.php | 1 + src/material/block/solid/QuartzBlock.php | 1 + src/material/block/solid/Reserved6Block.php | 1 + src/material/block/solid/SandBlock.php | 1 + src/material/block/solid/SandstoneBlock.php | 1 + src/material/block/solid/SnowBlock.php | 1 + src/material/block/solid/SoulSandBlock.php | 1 + src/material/block/solid/SpongeBlock.php | 1 + src/material/block/solid/StoneBlock.php | 1 + src/material/block/solid/StoneBricksBlock.php | 1 + src/material/block/solid/StonecutterBlock.php | 1 + src/material/block/solid/WoodBlock.php | 1 + src/material/block/solid/WoolBlock.php | 1 + src/material/block/solid/WorkbenchBlock.php | 1 + 109 files changed, 111 insertions(+), 13 deletions(-) diff --git a/src/material/Block.php b/src/material/Block.php index 894c7e54..dc4653b1 100755 --- a/src/material/Block.php +++ b/src/material/Block.php @@ -159,7 +159,7 @@ abstract class Block extends Position{ public static function neighborChanged(Level $level, $x, $y, $z, $nX, $nY, $nZ, $oldID){} public static function getAABB(Level $level, $x, $y, $z){ - return StaticBlock::getAABB($level, $x, $y, $z); + return StaticBlock::getAABB(static::$blockID, $x, $y, $z); } public static function containsX($id, $v){ diff --git a/src/material/StaticBlock.php b/src/material/StaticBlock.php index 1bca3311..cf6c75a2 100644 --- a/src/material/StaticBlock.php +++ b/src/material/StaticBlock.php @@ -41,7 +41,7 @@ class StaticBlock self::$boundingBoxes[$b->getID()] = $b->boundingBox; self::$hardness[$b->getID()] = $b->getHardness(); self::$prealloc[$b->getID()] = $b; - + $b::$blockID = $b->getID(); FireBlock::setFlammabilityAndCatchingChance($b->getID(), 0, 0); self::setBlockBounds($b->getID(), 0, 0, 0, 1, 1, 1); } @@ -111,8 +111,7 @@ class StaticBlock self::$minZs[$blockID] = $minZ; } - public static function getAABB(Level $level, $x, $y, $z){ - $id = $level->level->getBlockID($x, $y, $z); + public static function getAABB($id, $x, $y, $z){ return new AxisAlignedBB(self::$minXs[$id] + $x, self::$minYs[$id] + $y, self::$minZs[$id] + $z, self::$maxXs[$id] + $x, self::$maxYs[$id] + $y, self::$maxZs[$id] + $z); //TODO get bb from self::$boundingBoxes ? } diff --git a/src/material/block/attachable/LadderBlock.php b/src/material/block/attachable/LadderBlock.php index 97f83b37..82ef14b3 100644 --- a/src/material/block/attachable/LadderBlock.php +++ b/src/material/block/attachable/LadderBlock.php @@ -1,6 +1,7 @@ level->getBlock($x, $y, $z); diff --git a/src/material/block/attachable/SignPostBlock.php b/src/material/block/attachable/SignPostBlock.php index 514b9fc5..a635eccc 100644 --- a/src/material/block/attachable/SignPostBlock.php +++ b/src/material/block/attachable/SignPostBlock.php @@ -1,7 +1,7 @@ 2, 3 => 3, diff --git a/src/material/block/attachable/TorchBlock.php b/src/material/block/attachable/TorchBlock.php index c8b81963..761ba9d7 100644 --- a/src/material/block/attachable/TorchBlock.php +++ b/src/material/block/attachable/TorchBlock.php @@ -1,6 +1,7 @@ hardness = 0; diff --git a/src/material/block/attachable/TrapdoorBlock.php b/src/material/block/attachable/TrapdoorBlock.php index 5674318b..5aab66cd 100644 --- a/src/material/block/attachable/TrapdoorBlock.php +++ b/src/material/block/attachable/TrapdoorBlock.php @@ -1,6 +1,7 @@ isActivable = true; @@ -23,7 +24,7 @@ class TrapdoorBlock extends TransparentBlock{ public static function getAABB(Level $level, $x, $y, $z){ static::updateShape($level, $x, $y, $z); - return StaticBlock::getAABB($level, $x, $y, $z); + return StaticBlock::getAABB(static::$blockID, $x, $y, $z); } public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ diff --git a/src/material/block/attachable/WallSignBlock.php b/src/material/block/attachable/WallSignBlock.php index 5eff39af..02ca1aa5 100644 --- a/src/material/block/attachable/WallSignBlock.php +++ b/src/material/block/attachable/WallSignBlock.php @@ -5,6 +5,7 @@ require_once("SignPostBlock.php"); /***REM_END***/ class WallSignBlock extends SignPostBlock{ + public static $blockID; public function __construct($meta = 0){ TransparentBlock::__construct(WALL_SIGN, $meta, "Wall Sign"); $this->isSolid = false; diff --git a/src/material/block/liquid/WaterBlock.php b/src/material/block/liquid/WaterBlock.php index d8030f62..c9e5c3e9 100644 --- a/src/material/block/liquid/WaterBlock.php +++ b/src/material/block/liquid/WaterBlock.php @@ -2,7 +2,6 @@ require_once("LiquidBlockDynamic.php"); //TODO class loader? class WaterBlock extends LiquidBlockDynamic{ - public static $blockID = WATER; public function __construct($meta = 0){ diff --git a/src/material/block/misc/AirBlock.php b/src/material/block/misc/AirBlock.php index d8533473..9d6545b9 100644 --- a/src/material/block/misc/AirBlock.php +++ b/src/material/block/misc/AirBlock.php @@ -1,6 +1,8 @@ isActivable = false; diff --git a/src/material/block/misc/BedBlock.php b/src/material/block/misc/BedBlock.php index cb2a9885..dcfb3729 100644 --- a/src/material/block/misc/BedBlock.php +++ b/src/material/block/misc/BedBlock.php @@ -1,7 +1,7 @@ 3, 1 => 4, diff --git a/src/material/block/misc/FireBlock.php b/src/material/block/misc/FireBlock.php index 8d906438..8e3b9365 100644 --- a/src/material/block/misc/FireBlock.php +++ b/src/material/block/misc/FireBlock.php @@ -1,7 +1,7 @@ hardness = 0; diff --git a/src/material/block/nonfull/CakeBlock.php b/src/material/block/nonfull/CakeBlock.php index 50a3baeb..f7eded78 100644 --- a/src/material/block/nonfull/CakeBlock.php +++ b/src/material/block/nonfull/CakeBlock.php @@ -1,6 +1,7 @@ isFullBlock = false; diff --git a/src/material/block/nonfull/CarpetBlock.php b/src/material/block/nonfull/CarpetBlock.php index 0e9959e7..47820c7c 100644 --- a/src/material/block/nonfull/CarpetBlock.php +++ b/src/material/block/nonfull/CarpetBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/nonfull/CobwebBlock.php b/src/material/block/nonfull/CobwebBlock.php index 76e79d93..4b6a9226 100644 --- a/src/material/block/nonfull/CobwebBlock.php +++ b/src/material/block/nonfull/CobwebBlock.php @@ -1,6 +1,7 @@ isSolid = true; diff --git a/src/material/block/nonfull/FarmlandBlock.php b/src/material/block/nonfull/FarmlandBlock.php index 7efa4cc0..580f78d3 100644 --- a/src/material/block/nonfull/FarmlandBlock.php +++ b/src/material/block/nonfull/FarmlandBlock.php @@ -1,6 +1,7 @@ hardness = 3; diff --git a/src/material/block/nonfull/FenceBlock.php b/src/material/block/nonfull/FenceBlock.php index 4f419226..b9ceb18b 100644 --- a/src/material/block/nonfull/FenceBlock.php +++ b/src/material/block/nonfull/FenceBlock.php @@ -1,7 +1,7 @@ isFullBlock = false; diff --git a/src/material/block/nonfull/FenceGateBlock.php b/src/material/block/nonfull/FenceGateBlock.php index 4f6e3e2d..be286bf9 100644 --- a/src/material/block/nonfull/FenceGateBlock.php +++ b/src/material/block/nonfull/FenceGateBlock.php @@ -1,7 +1,7 @@ isFullBlock = false; diff --git a/src/material/block/nonfull/IronBarsBlock.php b/src/material/block/nonfull/IronBarsBlock.php index 1d766734..feeca1cc 100644 --- a/src/material/block/nonfull/IronBarsBlock.php +++ b/src/material/block/nonfull/IronBarsBlock.php @@ -1,6 +1,7 @@ isFullBlock = false; diff --git a/src/material/block/nonfull/IronDoorBlock.php b/src/material/block/nonfull/IronDoorBlock.php index ab8bb315..6dda4ee5 100644 --- a/src/material/block/nonfull/IronDoorBlock.php +++ b/src/material/block/nonfull/IronDoorBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/nonfull/PoweredRailBlock.php b/src/material/block/nonfull/PoweredRailBlock.php index c8362074..0fd8a32a 100644 --- a/src/material/block/nonfull/PoweredRailBlock.php +++ b/src/material/block/nonfull/PoweredRailBlock.php @@ -1,6 +1,7 @@ hardness = 0.7; diff --git a/src/material/block/nonfull/RailBlock.php b/src/material/block/nonfull/RailBlock.php index fb739ef9..9d63e231 100644 --- a/src/material/block/nonfull/RailBlock.php +++ b/src/material/block/nonfull/RailBlock.php @@ -1,6 +1,7 @@ hardness = 0.7; diff --git a/src/material/block/nonfull/SlabBlock.php b/src/material/block/nonfull/SlabBlock.php index c59caf60..3dae5588 100644 --- a/src/material/block/nonfull/SlabBlock.php +++ b/src/material/block/nonfull/SlabBlock.php @@ -1,7 +1,7 @@ "Stone", 1 => "Sandstone", diff --git a/src/material/block/nonfull/SnowLayerBlock.php b/src/material/block/nonfull/SnowLayerBlock.php index 834cc71d..3e9961a3 100644 --- a/src/material/block/nonfull/SnowLayerBlock.php +++ b/src/material/block/nonfull/SnowLayerBlock.php @@ -1,6 +1,7 @@ isReplaceable = true; diff --git a/src/material/block/nonfull/StoneWallBlock.php b/src/material/block/nonfull/StoneWallBlock.php index b9ac1194..730bc480 100644 --- a/src/material/block/nonfull/StoneWallBlock.php +++ b/src/material/block/nonfull/StoneWallBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/nonfull/WoodSlabBlock.php b/src/material/block/nonfull/WoodSlabBlock.php index 7072f9f9..6d7b5104 100644 --- a/src/material/block/nonfull/WoodSlabBlock.php +++ b/src/material/block/nonfull/WoodSlabBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/DiamondOreBlock.php b/src/material/block/ore/DiamondOreBlock.php index 03cb0605..fc399807 100644 --- a/src/material/block/ore/DiamondOreBlock.php +++ b/src/material/block/ore/DiamondOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/GlowingRedstoneOreBlock.php b/src/material/block/ore/GlowingRedstoneOreBlock.php index fc123f00..9915c10e 100644 --- a/src/material/block/ore/GlowingRedstoneOreBlock.php +++ b/src/material/block/ore/GlowingRedstoneOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/GoldOreBlock.php b/src/material/block/ore/GoldOreBlock.php index f82b8698..e715498d 100644 --- a/src/material/block/ore/GoldOreBlock.php +++ b/src/material/block/ore/GoldOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/IronOreBlock.php b/src/material/block/ore/IronOreBlock.php index 08e2ccea..3ad09768 100644 --- a/src/material/block/ore/IronOreBlock.php +++ b/src/material/block/ore/IronOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/LapisOreBlock.php b/src/material/block/ore/LapisOreBlock.php index 58782f0c..f75f6a9d 100644 --- a/src/material/block/ore/LapisOreBlock.php +++ b/src/material/block/ore/LapisOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/ore/RedstoneOreBlock.php b/src/material/block/ore/RedstoneOreBlock.php index ca134967..471f87ae 100644 --- a/src/material/block/ore/RedstoneOreBlock.php +++ b/src/material/block/ore/RedstoneOreBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/plant/BeetrootBlock.php b/src/material/block/plant/BeetrootBlock.php index 5a1b273a..7b820259 100644 --- a/src/material/block/plant/BeetrootBlock.php +++ b/src/material/block/plant/BeetrootBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/BrownMushroomBlock.php b/src/material/block/plant/BrownMushroomBlock.php index d0892ccb..495d8a73 100644 --- a/src/material/block/plant/BrownMushroomBlock.php +++ b/src/material/block/plant/BrownMushroomBlock.php @@ -1,6 +1,7 @@ hardness = 0; diff --git a/src/material/block/plant/CactusBlock.php b/src/material/block/plant/CactusBlock.php index dd03036a..4dd97196 100644 --- a/src/material/block/plant/CactusBlock.php +++ b/src/material/block/plant/CactusBlock.php @@ -1,6 +1,7 @@ isFullBlock = false; diff --git a/src/material/block/plant/CarrotBlock.php b/src/material/block/plant/CarrotBlock.php index b82ab91a..4c2df687 100644 --- a/src/material/block/plant/CarrotBlock.php +++ b/src/material/block/plant/CarrotBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/CyanFlowerBlock.php b/src/material/block/plant/CyanFlowerBlock.php index 4addd322..44529373 100644 --- a/src/material/block/plant/CyanFlowerBlock.php +++ b/src/material/block/plant/CyanFlowerBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/DandelionBlock.php b/src/material/block/plant/DandelionBlock.php index bdd94561..1d82b7e7 100644 --- a/src/material/block/plant/DandelionBlock.php +++ b/src/material/block/plant/DandelionBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/DeadBushBlock.php b/src/material/block/plant/DeadBushBlock.php index 100d51f6..4f7d49b7 100644 --- a/src/material/block/plant/DeadBushBlock.php +++ b/src/material/block/plant/DeadBushBlock.php @@ -1,6 +1,7 @@ isReplaceable = true; diff --git a/src/material/block/plant/MelonStemBlock.php b/src/material/block/plant/MelonStemBlock.php index ca9571b6..a9e3c542 100644 --- a/src/material/block/plant/MelonStemBlock.php +++ b/src/material/block/plant/MelonStemBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/PotatoBlock.php b/src/material/block/plant/PotatoBlock.php index 35296a50..ccb4542a 100644 --- a/src/material/block/plant/PotatoBlock.php +++ b/src/material/block/plant/PotatoBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/PumpkinStemBlock.php b/src/material/block/plant/PumpkinStemBlock.php index df914871..c7492623 100644 --- a/src/material/block/plant/PumpkinStemBlock.php +++ b/src/material/block/plant/PumpkinStemBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/RedMushroomBlock.php b/src/material/block/plant/RedMushroomBlock.php index 233ff0fc..29bdc225 100644 --- a/src/material/block/plant/RedMushroomBlock.php +++ b/src/material/block/plant/RedMushroomBlock.php @@ -1,6 +1,7 @@ hardness = 0; diff --git a/src/material/block/plant/SaplingBlock.php b/src/material/block/plant/SaplingBlock.php index 42bc95a6..fafa4f57 100644 --- a/src/material/block/plant/SaplingBlock.php +++ b/src/material/block/plant/SaplingBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/plant/TallGrassBlock.php b/src/material/block/plant/TallGrassBlock.php index 33afa559..b60bbe42 100644 --- a/src/material/block/plant/TallGrassBlock.php +++ b/src/material/block/plant/TallGrassBlock.php @@ -1,6 +1,7 @@ isReplaceable = true; diff --git a/src/material/block/plant/WheatBlock.php b/src/material/block/plant/WheatBlock.php index 80b46af0..a78bdade 100644 --- a/src/material/block/plant/WheatBlock.php +++ b/src/material/block/plant/WheatBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/solid/BedrockBlock.php b/src/material/block/solid/BedrockBlock.php index 0324e418..8974deae 100644 --- a/src/material/block/solid/BedrockBlock.php +++ b/src/material/block/solid/BedrockBlock.php @@ -1,6 +1,7 @@ breakable = false; diff --git a/src/material/block/solid/BookshelfBlock.php b/src/material/block/solid/BookshelfBlock.php index 4e6fe99c..8f19b6fe 100644 --- a/src/material/block/solid/BookshelfBlock.php +++ b/src/material/block/solid/BookshelfBlock.php @@ -1,6 +1,7 @@ hardness = 7.5; diff --git a/src/material/block/solid/BricksBlock.php b/src/material/block/solid/BricksBlock.php index f212b494..bd571961 100644 --- a/src/material/block/solid/BricksBlock.php +++ b/src/material/block/solid/BricksBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/BurningFurnaceBlock.php b/src/material/block/solid/BurningFurnaceBlock.php index 98f24ec6..da123cd5 100644 --- a/src/material/block/solid/BurningFurnaceBlock.php +++ b/src/material/block/solid/BurningFurnaceBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/solid/ClayBlock.php b/src/material/block/solid/ClayBlock.php index 0341e768..3ca8b2a4 100644 --- a/src/material/block/solid/ClayBlock.php +++ b/src/material/block/solid/ClayBlock.php @@ -1,6 +1,7 @@ hardness = 3; diff --git a/src/material/block/solid/CoalBlock.php b/src/material/block/solid/CoalBlock.php index 7b488670..c81d36f7 100644 --- a/src/material/block/solid/CoalBlock.php +++ b/src/material/block/solid/CoalBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/CobblestoneBlock.php b/src/material/block/solid/CobblestoneBlock.php index cab26772..f6c60a4e 100644 --- a/src/material/block/solid/CobblestoneBlock.php +++ b/src/material/block/solid/CobblestoneBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/DiamondBlock.php b/src/material/block/solid/DiamondBlock.php index 5d698469..308860e6 100644 --- a/src/material/block/solid/DiamondBlock.php +++ b/src/material/block/solid/DiamondBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/DirtBlock.php b/src/material/block/solid/DirtBlock.php index d8c2617a..bf96b7c2 100644 --- a/src/material/block/solid/DirtBlock.php +++ b/src/material/block/solid/DirtBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/solid/DoubleSlabBlock.php b/src/material/block/solid/DoubleSlabBlock.php index 4000199f..9edd5916 100755 --- a/src/material/block/solid/DoubleSlabBlock.php +++ b/src/material/block/solid/DoubleSlabBlock.php @@ -1,6 +1,7 @@ id = FURNACE; diff --git a/src/material/block/solid/GlassBlock.php b/src/material/block/solid/GlassBlock.php index 41985a34..a6149c59 100644 --- a/src/material/block/solid/GlassBlock.php +++ b/src/material/block/solid/GlassBlock.php @@ -1,6 +1,7 @@ hardness = 1.5; diff --git a/src/material/block/solid/GlowingObsidianBlock.php b/src/material/block/solid/GlowingObsidianBlock.php index b3e67e27..ea88b779 100644 --- a/src/material/block/solid/GlowingObsidianBlock.php +++ b/src/material/block/solid/GlowingObsidianBlock.php @@ -1,6 +1,7 @@ hardness = 1.5; diff --git a/src/material/block/solid/GoldBlock.php b/src/material/block/solid/GoldBlock.php index a4f632dc..28c136c3 100644 --- a/src/material/block/solid/GoldBlock.php +++ b/src/material/block/solid/GoldBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/GrassBlock.php b/src/material/block/solid/GrassBlock.php index 59501f5e..fdeee837 100644 --- a/src/material/block/solid/GrassBlock.php +++ b/src/material/block/solid/GrassBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/solid/GravelBlock.php b/src/material/block/solid/GravelBlock.php index b2a410b7..f35adb53 100644 --- a/src/material/block/solid/GravelBlock.php +++ b/src/material/block/solid/GravelBlock.php @@ -1,6 +1,7 @@ hardness = 3; diff --git a/src/material/block/solid/HayBaleBlock.php b/src/material/block/solid/HayBaleBlock.php index 4a9bf8fc..869eebe5 100644 --- a/src/material/block/solid/HayBaleBlock.php +++ b/src/material/block/solid/HayBaleBlock.php @@ -1,6 +1,7 @@ hardness = 10; diff --git a/src/material/block/solid/IceBlock.php b/src/material/block/solid/IceBlock.php index e394825b..4cc688cf 100644 --- a/src/material/block/solid/IceBlock.php +++ b/src/material/block/solid/IceBlock.php @@ -1,6 +1,7 @@ hardness = 2.5; diff --git a/src/material/block/solid/InfoUpdate2Block.php b/src/material/block/solid/InfoUpdate2Block.php index 78eb44bb..0497b861 100755 --- a/src/material/block/solid/InfoUpdate2Block.php +++ b/src/material/block/solid/InfoUpdate2Block.php @@ -1,6 +1,7 @@ breakable = true; diff --git a/src/material/block/solid/InfoUpdateBlock.php b/src/material/block/solid/InfoUpdateBlock.php index abda197f..8b088190 100755 --- a/src/material/block/solid/InfoUpdateBlock.php +++ b/src/material/block/solid/InfoUpdateBlock.php @@ -1,6 +1,7 @@ breakable = true; diff --git a/src/material/block/solid/InvisibleBedrockBlock.php b/src/material/block/solid/InvisibleBedrockBlock.php index 3b067016..dede980e 100755 --- a/src/material/block/solid/InvisibleBedrockBlock.php +++ b/src/material/block/solid/InvisibleBedrockBlock.php @@ -1,6 +1,7 @@ breakable = false; diff --git a/src/material/block/solid/IronBlock.php b/src/material/block/solid/IronBlock.php index 2cc7d298..12acd700 100644 --- a/src/material/block/solid/IronBlock.php +++ b/src/material/block/solid/IronBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/LapisBlock.php b/src/material/block/solid/LapisBlock.php index 3b4911cb..868f3077 100644 --- a/src/material/block/solid/LapisBlock.php +++ b/src/material/block/solid/LapisBlock.php @@ -1,6 +1,7 @@ hardness = 15; diff --git a/src/material/block/solid/LeavesBlock.php b/src/material/block/solid/LeavesBlock.php index c64564a8..35391300 100644 --- a/src/material/block/solid/LeavesBlock.php +++ b/src/material/block/solid/LeavesBlock.php @@ -1,6 +1,7 @@ 1, 1 => 2, diff --git a/src/material/block/solid/MelonBlock.php b/src/material/block/solid/MelonBlock.php index 2f4ccd8d..4b46e393 100644 --- a/src/material/block/solid/MelonBlock.php +++ b/src/material/block/solid/MelonBlock.php @@ -1,6 +1,7 @@ hardness = 5; diff --git a/src/material/block/solid/MossStoneBlock.php b/src/material/block/solid/MossStoneBlock.php index 068a8e7a..20242931 100644 --- a/src/material/block/solid/MossStoneBlock.php +++ b/src/material/block/solid/MossStoneBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/NetherBricksBlock.php b/src/material/block/solid/NetherBricksBlock.php index fa662f0e..2b0b5b8c 100644 --- a/src/material/block/solid/NetherBricksBlock.php +++ b/src/material/block/solid/NetherBricksBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/NetherrackBlock.php b/src/material/block/solid/NetherrackBlock.php index 9e2f0b9c..8ff38854 100644 --- a/src/material/block/solid/NetherrackBlock.php +++ b/src/material/block/solid/NetherrackBlock.php @@ -1,6 +1,7 @@ hardness = 2; diff --git a/src/material/block/solid/ObsidianBlock.php b/src/material/block/solid/ObsidianBlock.php index 03b56770..dc0ff733 100644 --- a/src/material/block/solid/ObsidianBlock.php +++ b/src/material/block/solid/ObsidianBlock.php @@ -1,6 +1,7 @@ hardness = 6000; diff --git a/src/material/block/solid/PlanksBlock.php b/src/material/block/solid/PlanksBlock.php index 7b5f135e..ed0ba041 100644 --- a/src/material/block/solid/PlanksBlock.php +++ b/src/material/block/solid/PlanksBlock.php @@ -1,6 +1,7 @@ hardness = 5; diff --git a/src/material/block/solid/QuartzBlock.php b/src/material/block/solid/QuartzBlock.php index 4c1aaa5f..5ceb6385 100644 --- a/src/material/block/solid/QuartzBlock.php +++ b/src/material/block/solid/QuartzBlock.php @@ -1,6 +1,7 @@ breakable = true; diff --git a/src/material/block/solid/SandBlock.php b/src/material/block/solid/SandBlock.php index d10aa6dc..fa41be00 100644 --- a/src/material/block/solid/SandBlock.php +++ b/src/material/block/solid/SandBlock.php @@ -1,6 +1,7 @@ hardness = 2.5; diff --git a/src/material/block/solid/SandstoneBlock.php b/src/material/block/solid/SandstoneBlock.php index 766097da..2d800596 100644 --- a/src/material/block/solid/SandstoneBlock.php +++ b/src/material/block/solid/SandstoneBlock.php @@ -1,6 +1,7 @@ hardness = 1; diff --git a/src/material/block/solid/SoulSandBlock.php b/src/material/block/solid/SoulSandBlock.php index 10ff2e49..f5ff6e20 100644 --- a/src/material/block/solid/SoulSandBlock.php +++ b/src/material/block/solid/SoulSandBlock.php @@ -1,6 +1,7 @@ hardness = 2.5; diff --git a/src/material/block/solid/SpongeBlock.php b/src/material/block/solid/SpongeBlock.php index 5ab60495..39b4c237 100644 --- a/src/material/block/solid/SpongeBlock.php +++ b/src/material/block/solid/SpongeBlock.php @@ -1,6 +1,7 @@ hardness = 3; diff --git a/src/material/block/solid/StoneBlock.php b/src/material/block/solid/StoneBlock.php index dd154b15..ac838511 100644 --- a/src/material/block/solid/StoneBlock.php +++ b/src/material/block/solid/StoneBlock.php @@ -1,6 +1,7 @@ hardness = 30; diff --git a/src/material/block/solid/StoneBricksBlock.php b/src/material/block/solid/StoneBricksBlock.php index 1a25f8f1..0ad41942 100644 --- a/src/material/block/solid/StoneBricksBlock.php +++ b/src/material/block/solid/StoneBricksBlock.php @@ -1,6 +1,7 @@ isActivable = true; diff --git a/src/material/block/solid/WoodBlock.php b/src/material/block/solid/WoodBlock.php index c82d434f..e9711141 100644 --- a/src/material/block/solid/WoodBlock.php +++ b/src/material/block/solid/WoodBlock.php @@ -1,6 +1,7 @@ isActivable = true;