From caaa29388f299d688212c2b93fe0f141a7d2dd95 Mon Sep 17 00:00:00 2001 From: ArkQuark <74979909+ArkQuark@users.noreply.github.com> Date: Wed, 1 Jun 2022 21:46:03 +0300 Subject: [PATCH] Farmland now can dry & wet, grass and dirt fix --- src/material/block/nonfull/Farmland.php | 116 ++++++++++++++++++++++++ src/material/block/solid/Dirt.php | 3 +- src/material/block/solid/Farmland.php | 32 ------- src/material/block/solid/Grass.php | 15 +++ 4 files changed, 133 insertions(+), 33 deletions(-) create mode 100644 src/material/block/nonfull/Farmland.php delete mode 100644 src/material/block/solid/Farmland.php diff --git a/src/material/block/nonfull/Farmland.php b/src/material/block/nonfull/Farmland.php new file mode 100644 index 00000000..c2ebf0c3 --- /dev/null +++ b/src/material/block/nonfull/Farmland.php @@ -0,0 +1,116 @@ +hardness = 3; + } + public function getDrops(Item $item, Player $player){ + return array( + array(DIRT, 0, 1), + ); + } + + public function onUpdate($type){ + if($type === BLOCK_UPDATE_NORMAL){ + if($this->getSide(1)->isTransparent === false){ + $this->level->setBlock($this, BlockAPI::get(DIRT, 0), true, false, true); + return BLOCK_UPDATE_NORMAL; + } + return false; + } + $this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM); + if($type === BLOCK_UPDATE_RANDOM){ + if($this->checkWater()){ + $this->level->setBlock($this, BlockAPI::get(FARMLAND, 1), true, false, true); + return BLOCK_UPDATE_RANDOM; + } + else{ + $this->level->setBlock($this, BlockAPI::get(DIRT, 0), true, false, true); + return BLOCK_UPDATE_RANDOM; + } + + } + return false; + } + + public function getBlockID($x, $y, $z){ + return $this->level->getBlock(new Vector3($x, $y, $z))->getID(); + } + + public function checkWater(){ + $x9 = $this->x+4; + $x8 = $this->x+3; + $x7 = $this->x+2; + $x6 = $this->x+1; + $x5 = $this->x; + $x4 = $this->x-1; + $x3 = $this->x-2; + $x2 = $this->x-3; + $x1 = $this->x-4; + + $y = $this->y; + $z = $this->z; + + for($i = 1; $i < 82; $i++){ + switch($i){ + case($i < 10): + $z9 = $z + 5 - $i; + if($this->getBlockID($x9, $y, $z9) == 8 or $this->getBlockID($x9, $y, $z9) == 9) return true; + break; + case($i < 19): + $z8 = $z + 5 - ($i - 9); + if($this->getBlockID($x8, $y, $z8) == 8 or $this->getBlockID($x8, $y, $z8) == 9) return true; + break; + case($i < 28): + $z7 = $z + 5 - ($i - 18); + if($this->getBlockID($x7, $y, $z7) == 8 or $this->getBlockID($x7, $y, $z7) == 9) return true; + break; + case($i < 37): + $z6 = $z + 5 - ($i - 27); + if($this->getBlockID($x6, $y, $z6) == 8 or $this->getBlockID($x6, $y, $z6) == 9) return true; + break; + case($i < 46): + $z5 = $z + 5 - ($i - 36); + if($this->getBlockID($x5, $y, $z5) == 8 or $this->getBlockID($x5, $y, $z5) == 9) return true; + break; + case($i < 55): + $z4 = $z + 5 - ($i - 45); + if($this->getBlockID($x4, $y, $z4) == 8 or $this->getBlockID($x4, $y, $z4) == 9) return true; + break; + case($i < 64): + $z3 = $z + 5 - ($i - 54); + if($this->getBlockID($x3, $y, $z3) == 8 or $this->getBlockID($x3, $y, $z3) == 9) return true; + break; + case($i < 73): + $z2 = $z + 5 - ($i - 63); + if($this->getBlockID($x2, $y, $z2) == 8 or $this->getBlockID($x2, $y, $z2) == 9) return true; + break; + case($i < 82): + $z1 = $z + 5 - ($i - 72); + if($this->getBlockID($x1, $y, $z1) == 8 or $this->getBlockID($x1, $y, $z1) == 9) return true; + break; + } + } + return false; + } +} \ No newline at end of file diff --git a/src/material/block/solid/Dirt.php b/src/material/block/solid/Dirt.php index 2b93c7c2..99aa5940 100644 --- a/src/material/block/solid/Dirt.php +++ b/src/material/block/solid/Dirt.php @@ -28,6 +28,7 @@ class DirtBlock extends SolidBlock{ public function onActivate(Item $item, Player $player){ if($item->isHoe()){ + if($this->getSide(1)->isTransparent === false) return false; if(($player->gamemode & 0x01) === 0){ $item->useOn($this); } @@ -41,7 +42,7 @@ class DirtBlock extends SolidBlock{ $this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM); if($type === BLOCK_UPDATE_RANDOM){ if(mt_rand(0, 3) == 0){ - if($this->getSide(1)->isTransparent === false) return false; + if(($this->getSide(1)->isTransparent === false) or ($this->getSide(1)->getID()->isLiquid) or ($this->getSide(1)->getID() == 60)) return false; if($this->getGrassInRadius() == true){ $this->level->setBlock($this, BlockAPI::get(GRASS, 0), true, false, true); return BLOCK_UPDATE_RANDOM; diff --git a/src/material/block/solid/Farmland.php b/src/material/block/solid/Farmland.php deleted file mode 100644 index 8a01dd18..00000000 --- a/src/material/block/solid/Farmland.php +++ /dev/null @@ -1,32 +0,0 @@ -hardness = 3; - } - public function getDrops(Item $item, Player $player){ - return array( - array(DIRT, 0, 1), - ); - } -} \ No newline at end of file diff --git a/src/material/block/solid/Grass.php b/src/material/block/solid/Grass.php index 5af7bf36..605943df 100644 --- a/src/material/block/solid/Grass.php +++ b/src/material/block/solid/Grass.php @@ -40,14 +40,29 @@ class GrassBlock extends SolidBlock{ TallGrassObject::growGrass($this->level, $this, new Random(), 8, 2); return true; }elseif($item->isHoe()){ + if($this->getSide(1)->isTransparent === false) return false; if(($player->gamemode & 0x01) === 0){ $item->useOn($this); } $this->level->setBlock($this, new FarmlandBlock()); + $this->seedsDrop(); return true; } return false; } + + public function seedsDrop(){ + $chance = Utils::randomFloat() * 100; + if($chance <= 1){ + ServerAPI::request()->api->entity->drop(new Position($this->x+0.5, $this->y+1, $this->z+0.5, $this->level), BlockAPI::getItem(458,0,1)); + return; + } + elseif($chance <= 15){ + ServerAPI::request()->api->entity->drop(new Position($this->x+0.5, $this->y+1, $this->z+0.5, $this->level), BlockAPI::getItem(295,0,1)); + return; + } + return; + } public function onUpdate($type){ $this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);