diff --git a/src/material/StaticBlock.php b/src/material/StaticBlock.php index 89c8767b..09b59a10 100644 --- a/src/material/StaticBlock.php +++ b/src/material/StaticBlock.php @@ -65,8 +65,6 @@ class StaticBlock self::setBlockBounds(SAPLING, 0.1, 0, 0.1, 0.9, 0.8, 0.9); self::setBlockBounds(BROWN_MUSHROOM, 0.3, 0, 0.3, 0.8, 0.4, 0.8); self::setBlockBounds(SLAB, 0, 0, 0, 1, 0.5, 1); - //Ladder: based on rotation - //Glass Pane: based on state self::setBlockBounds(RAIL, 0, 0, 0, 1, 0.125, 1); self::setBlockBounds(POWERED_RAIL, 0, 0, 0, 1, 0.125, 1); diff --git a/src/material/block/attachable/LadderBlock.php b/src/material/block/attachable/LadderBlock.php index efa624ad..e51d6888 100644 --- a/src/material/block/attachable/LadderBlock.php +++ b/src/material/block/attachable/LadderBlock.php @@ -8,7 +8,27 @@ class LadderBlock extends TransparentBlock{ 5 => 4, 4 => 5, ]; - + public static function getAABB(Level $level, $x, $y, $z){ + [$id, $meta] = $level->level->getBlock($x, $y, $z); + + switch($meta){ + case 2: + StaticBlock::setBlockBounds($id, 0.0, 0.0, 0.875, 1.0, 1.0, 1.0); + break; + case 3: + StaticBlock::setBlockBounds($id, 0, 0.0, 0.0, 1.0, 1.0, 0.125); + break; + case 4: + StaticBlock::setBlockBounds($id, 0.875, 0.0, 0.0, 1.0, 1.0, 1.0); + break; + case 5: + StaticBlock::setBlockBounds($id, 0, 0.0, 0.0, 0.125, 1.0, 1.0); + break; + + } + + return parent::getAABB($level, $x, $y, $z); + } public function __construct($meta = 0){ parent::__construct(LADDER, $meta, "Ladder"); $this->isSolid = false; diff --git a/src/material/block/nonfull/GlassPaneBlock.php b/src/material/block/nonfull/GlassPaneBlock.php index 14d60875..7dfa44b5 100644 --- a/src/material/block/nonfull/GlassPaneBlock.php +++ b/src/material/block/nonfull/GlassPaneBlock.php @@ -6,7 +6,37 @@ class GlassPaneBlock extends TransparentBlock{ $this->isFullBlock = false; $this->isSolid = false; } - + public static function updateShape(Level $level, $x, $y, $z){ + $id = $level->level->getBlockID($x, $y, $z); + + $minX = 0.4375; + $maxX = 0.5625; + $minZ = 0.4375; + $maxZ = 0.5625; + + $var9 = self::canConnectTo($level->level->getBlockID($x, $y, $z - 1)); + $var10 = self::canConnectTo($level->level->getBlockID($x, $y, $z + 1)); + $var11 = self::canConnectTo($level->level->getBlockID($x - 1, $y, $z)); + $var12 = self::canConnectTo($level->level->getBlockID($x + 1, $y, $z)); + + if((!$var11 || !$var12) && ($var11 || $var12 || $var9 || $var10)){ + if($var11 && !$var12) $minX = 0; + else if(!$var11 && $var12) $maxX = 1; + }else{ + $minX = 0; + $maxX = 1; + } + + if((!$var9 || !$var10) && ($var11 || $var12 || $var9 || $var10)){ + if($var9 && !$var10) $minZ = 0; + else if(!$var9 && $var10) $maxZ = 1; + }else{ + $minZ = 0; + $maxZ = 1; + } + + StaticBlock::setBlockBounds($id, $minX, 0, $minZ, $maxX, 1, $maxZ); + } public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ $var8 = self::canConnectTo($level->level->getBlockID($x, $y, $z - 1)); $var9 = self::canConnectTo($level->level->getBlockID($x, $y, $z + 1)); diff --git a/src/material/block/nonfull/IronBarsBlock.php b/src/material/block/nonfull/IronBarsBlock.php index 45c60198..1d766734 100644 --- a/src/material/block/nonfull/IronBarsBlock.php +++ b/src/material/block/nonfull/IronBarsBlock.php @@ -7,6 +7,37 @@ class IronBarsBlock extends TransparentBlock{ $this->isSolid = false; } + public static function updateShape(Level $level, $x, $y, $z){ + $id = $level->level->getBlockID($x, $y, $z); + + $minX = 0.4375; + $maxX = 0.5625; + $minZ = 0.4375; + $maxZ = 0.5625; + + $var9 = self::canConnectTo($level->level->getBlockID($x, $y, $z - 1)); + $var10 = self::canConnectTo($level->level->getBlockID($x, $y, $z + 1)); + $var11 = self::canConnectTo($level->level->getBlockID($x - 1, $y, $z)); + $var12 = self::canConnectTo($level->level->getBlockID($x + 1, $y, $z)); + + if((!$var11 || !$var12) && ($var11 || $var12 || $var9 || $var10)){ + if($var11 && !$var12) $minX = 0; + else if(!$var11 && $var12) $maxX = 1; + }else{ + $minX = 0; + $maxX = 1; + } + + if((!$var9 || !$var10) && ($var11 || $var12 || $var9 || $var10)){ + if($var9 && !$var10) $minZ = 0; + else if(!$var9 && $var10) $maxZ = 1; + }else{ + $minZ = 0; + $maxZ = 1; + } + + StaticBlock::setBlockBounds($id, $minX, 0, $minZ, $maxX, 1, $maxZ); + } public static function getCollisionBoundingBoxes(Level $level, $x, $y, $z, Entity $entity){ $var8 = self::canConnectTo($level->level->getBlockID($x, $y, $z - 1));