From edb03e8a9b31ae1bd01aa79ce4c59d78f927b483 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 26 Jul 2018 19:21:38 +0100 Subject: [PATCH] Remove more dead code from the generator this stuff is useless broken crap that just makes noise in inspections for no good reason... bye --- .../level/generator/object/BigTree.php | 85 ------------------- .../level/generator/object/Pond.php | 47 ---------- .../generator/object/PopulatorObject.php | 32 ------- .../level/generator/populator/Pond.php | 60 ------------- 4 files changed, 224 deletions(-) delete mode 100644 src/pocketmine/level/generator/object/BigTree.php delete mode 100644 src/pocketmine/level/generator/object/Pond.php delete mode 100644 src/pocketmine/level/generator/object/PopulatorObject.php delete mode 100644 src/pocketmine/level/generator/populator/Pond.php diff --git a/src/pocketmine/level/generator/object/BigTree.php b/src/pocketmine/level/generator/object/BigTree.php deleted file mode 100644 index 0306c6b726..0000000000 --- a/src/pocketmine/level/generator/object/BigTree.php +++ /dev/null @@ -1,85 +0,0 @@ -trunkHeight = (int) ($this->totalHeight * $this->trunkHeightMultiplier); - $leaves = $this->getLeafGroupPoints($level, $pos); - foreach($leaves as $leafGroup){ - $groupX = $leafGroup->getBlockX(); - $groupY = $leafGroup->getBlockY(); - $groupZ = $leafGroup->getBlockZ(); - for($yy = $groupY; $yy < $groupY + $this->leafDistanceLimit; ++$yy){ - $this->generateGroupLayer($level, $groupX, $yy, $groupZ, $this->getLeafGroupLayerSize($yy - $groupY)); - } - } - final BlockIterator trunk = new BlockIterator(new Point(w, x, y - 1, z), new Point(w, x, y + trunkHeight, z)); - while (trunk.hasNext()) { - trunk.next().setMaterial(VanillaMaterials.LOG, logMetadata); - } - generateBranches(w, x, y, z, leaves); - - $level->setBlock($x, $pos->y - 1, $z, 3, 0); - $this->totalHeight += $random->nextRange(0, 2); - $this->leavesHeight += mt_rand(0, 1); - for($yy = ($this->totalHeight - $this->leavesHeight); $yy < ($this->totalHeight + 1); ++$yy){ - $yRadius = ($yy - $this->totalHeight); - $xzRadius = (int) (($this->radiusIncrease + 1) - $yRadius / 2); - for($xx = -$xzRadius; $xx < ($xzRadius + 1); ++$xx){ - for($zz = -$xzRadius; $zz < ($xzRadius + 1); ++$zz){ - if((abs($xx) != $xzRadius or abs($zz) != $xzRadius) and $yRadius != 0){ - $level->setBlock($pos->x + $xx, $pos->y + $yy, $pos->z + $zz, 18, $this->type); - } - } - } - } - for($yy = 0; $yy < ($this->totalHeight - 1); ++$yy){ - $level->setBlock($x, $pos->y + $yy, $z, 17, $this->type); - } - */ - } -} diff --git a/src/pocketmine/level/generator/object/Pond.php b/src/pocketmine/level/generator/object/Pond.php deleted file mode 100644 index 560d644648..0000000000 --- a/src/pocketmine/level/generator/object/Pond.php +++ /dev/null @@ -1,47 +0,0 @@ -type = $type; - $this->random = $random; - } - - public function canPlaceObject(ChunkManager $level, Vector3 $pos) : bool{ - return false; - } - - public function placeObject(ChunkManager $level, Vector3 $pos){ - - } -} diff --git a/src/pocketmine/level/generator/object/PopulatorObject.php b/src/pocketmine/level/generator/object/PopulatorObject.php deleted file mode 100644 index 0b7b0def64..0000000000 --- a/src/pocketmine/level/generator/object/PopulatorObject.php +++ /dev/null @@ -1,32 +0,0 @@ -nextRange(0, $this->waterOdd) === 0){ - $x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 16); - $y = $random->nextBoundedInt(128); - $z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 16); - $pond = new \pocketmine\level\generator\object\Pond($random, BlockFactory::get(Block::WATER)); - if($pond->canPlaceObject($level, $v = new Vector3($x, $y, $z))){ - $pond->placeObject($level, $v); - } - } - } - - public function setWaterOdd(int $waterOdd){ - $this->waterOdd = $waterOdd; - } - - public function setLavaOdd(int $lavaOdd){ - $this->lavaOdd = $lavaOdd; - } - - public function setLavaSurfaceOdd(int $lavaSurfaceOdd){ - $this->lavaSurfaceOdd = $lavaSurfaceOdd; - } -}