diff --git a/src/Ad5001/BetterGen/biome/BetterDesert.php b/src/Ad5001/BetterGen/biome/BetterDesert.php index 4816f3e..8a17e9b 100644 --- a/src/Ad5001/BetterGen/biome/BetterDesert.php +++ b/src/Ad5001/BetterGen/biome/BetterDesert.php @@ -18,6 +18,7 @@ use Ad5001\BetterGen\populator\DeadbushPopulator; use Ad5001\BetterGen\populator\SugarCanePopulator; use Ad5001\BetterGen\populator\TemplePopulator; use Ad5001\BetterGen\populator\WellPopulator; +use Ad5001\BetterGen\generator\BetterNormal; use pocketmine\block\Block; use pocketmine\level\generator\biome\Biome; use pocketmine\level\generator\normal\biome\SandyBiome; @@ -41,11 +42,11 @@ class BetterDesert extends SandyBiome implements Mountainable { $well = new WellPopulator (); - $this->addPopulator($cactus); - $this->addPopulator($deadBush); - $this->addPopulator($sugarCane); - $this->addPopulator($temple); - $this->addPopulator($well); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Cactus", BetterNormal::$options["delStruct"])) $this->addPopulator($cactus); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Deadbush", BetterNormal::$options["delStruct"])) $this->addPopulator($deadBush); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("SugarCane", BetterNormal::$options["delStruct"])) $this->addPopulator($sugarCane); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Temples", BetterNormal::$options["delStruct"])) $this->addPopulator($temple); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Wells", BetterNormal::$options["delStruct"])) $this->addPopulator($well); $this->setElevation(63, 70); // $this->setElevation(66, 70); diff --git a/src/Ad5001/BetterGen/biome/BetterForest.php b/src/Ad5001/BetterGen/biome/BetterForest.php index 24a6d66..36f8ec5 100644 --- a/src/Ad5001/BetterGen/biome/BetterForest.php +++ b/src/Ad5001/BetterGen/biome/BetterForest.php @@ -42,21 +42,21 @@ class BetterForest extends ForestBiome implements Mountainable { $bush = new BushPopulator($type); $bush->setBaseAmount(10); - $this->addPopulator($bush); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Bushes", BetterNormal::$options["delStruct"])) $this->addPopulator($bush); $ft = new FallenTreePopulator($type); $ft->setBaseAmount(0); $ft->setRandomAmount(4); - $this->addPopulator($ft); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("FallenTrees", BetterNormal::$options["delStruct"])) $this->addPopulator($ft); $trees = new TreePopulator($type); $trees->setBaseAmount((null !== @constant(TreePopulator::$types[$type] . "::maxPerChunk")) ? constant(TreePopulator::$types[$type] . "::maxPerChunk") : 5); - $this->addPopulator($trees); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Trees", BetterNormal::$options["delStruct"])) $this->addPopulator($trees); $tallGrass = Main::isOtherNS() ? new \pocketmine\level\generator\normal\populator\TallGrass () : new \pocketmine\level\generator\populator\TallGrass(); $tallGrass->setBaseAmount(3); - $this->addPopulator($tallGrass); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("TallGrass", BetterNormal::$options["delStruct"])) $this->addPopulator($tallGrass); $this->setElevation(63, 69); diff --git a/src/Ad5001/BetterGen/biome/BetterIcePlains.php b/src/Ad5001/BetterGen/biome/BetterIcePlains.php index edf960c..f377073 100644 --- a/src/Ad5001/BetterGen/biome/BetterIcePlains.php +++ b/src/Ad5001/BetterGen/biome/BetterIcePlains.php @@ -30,12 +30,12 @@ class BetterIcePlains extends SnowyBiome implements Mountainable { Block::get(Block::DIRT, 0), Block::get(Block::DIRT, 0) ]); - $this->addPopulator(new IglooPopulator ()); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Igloos", BetterNormal::$options["delStruct"])) $this->addPopulator(new IglooPopulator ()); $tallGrass = Main::isOtherNS() ? new \pocketmine\level\generator\normal\populator\TallGrass() : new \pocketmine\level\generator\populator\TallGrass(); $tallGrass->setBaseAmount(3); - $this->addPopulator($tallGrass); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("TallGrass", BetterNormal::$options["delStruct"])) $this->addPopulator($tallGrass); $this->setElevation(63, 74); diff --git a/src/Ad5001/BetterGen/biome/BetterMesa.php b/src/Ad5001/BetterGen/biome/BetterMesa.php index 63f1145..5ae0494 100644 --- a/src/Ad5001/BetterGen/biome/BetterMesa.php +++ b/src/Ad5001/BetterGen/biome/BetterMesa.php @@ -47,10 +47,10 @@ class BetterMesa extends SandyBiome { Main::isOtherNS() ? new \pocketmine\level\generator\normal\object\OreType(new GoldOre (), 2, 8, 0, 32) : new \pocketmine\level\generator\object\OreType(new GoldOre (), 2, 8, 0, 32) ]); - $this->addPopulator($cactus); - $this->addPopulator($deadBush); - $this->addPopulator($sugarCane); - $this->addPopulator($ores); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Cactus", BetterNormal::$options["delStruct"])) $this->addPopulator($cactus); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("DeadBush", BetterNormal::$options["delStruct"])) $this->addPopulator($deadBush); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("SugarCane", BetterNormal::$options["delStruct"])) $this->addPopulator($sugarCane); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Ores", BetterNormal::$options["delStruct"])) $this->addPopulator($ores); $this->setElevation(80, 83); // $this->setElevation(66, 70); diff --git a/src/Ad5001/BetterGen/biome/BetterMesaPlains.php b/src/Ad5001/BetterGen/biome/BetterMesaPlains.php index b349469..2fcb936 100644 --- a/src/Ad5001/BetterGen/biome/BetterMesaPlains.php +++ b/src/Ad5001/BetterGen/biome/BetterMesaPlains.php @@ -42,10 +42,10 @@ class BetterMesaPlains extends SandyBiome { Main::isOtherNS() ? new \pocketmine\level\generator\normal\object\OreType(new GoldOre (), 2, 8, 0, 32) : new \pocketmine\level\generator\object\OreType(new GoldOre (), 2, 8, 0, 32) ]); - $this->addPopulator($cactus); - $this->addPopulator($deadBush); - $this->addPopulator($sugarCane); - $this->addPopulator($ores); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Cactus", BetterNormal::$options["delStruct"])) $this->addPopulator($cactus); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("DeadBush", BetterNormal::$options["delStruct"])) $this->addPopulator($deadBush); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("SugarCane", BetterNormal::$options["delStruct"])) $this->addPopulator($sugarCane); + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Ores", BetterNormal::$options["delStruct"])) $this->addPopulator($ores); $this->setElevation(62, 67); // $this->setElevation(66, 70); diff --git a/src/Ad5001/BetterGen/generator/BetterNormal.php b/src/Ad5001/BetterGen/generator/BetterNormal.php index b21d893..a0c7528 100644 --- a/src/Ad5001/BetterGen/generator/BetterNormal.php +++ b/src/Ad5001/BetterGen/generator/BetterNormal.php @@ -163,33 +163,42 @@ class BetterNormal extends Generator { $cover = Main::isOtherNS() ? new \pocketmine\level\generator\normal\populator\GroundCover() : new \pocketmine\level\generator\populator\GroundCover(); $this->generationPopulators[] = $cover; - if() { + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Lakes", self::$options["delStruct"])) { $lake = new LakePopulator(); $lake->setBaseAmount(0); $lake->setRandomAmount(1); $this->generationPopulators[] = $lake; + } + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Caves", self::$options["delStruct"])) { $cave = new CavePopulator (); $cave->setBaseAmount(0); $cave->setRandomAmount(2); $this->generationPopulators[] = $cave; + } + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Ravines", self::$options["delStruct"])) { $ravine = new RavinePopulator (); $ravine->setBaseAmount(0); $ravine->setRandomAmount(51); $this->generationPopulators[] = $ravine; + } + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Mineshafts", self::$options["delStruct"])) { $mineshaft = new MineshaftPopulator (); $mineshaft->setBaseAmount(0); $mineshaft->setRandomAmount(102); $this->populators[] = $mineshaft; + } - + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("FloatingIslands", self::$options["delStruct"])) { $fisl = new FloatingIslandPopulator(); $fisl->setBaseAmount(0); $fisl->setRandomAmount(132); $this->populators[] = $fisl; + } + if(!\Ad5001\BetterGen\utils\CommonUtils::in_arrayi("Ores", self::$options["delStruct"])) { $ores = Main::isOtherNS() ? new \pocketmine\level\generator\normal\populator\Ore() : new \pocketmine\level\generator\populator\Ore(); if(Main::isOtherNS()) $ores->setOreTypes([ new OreType2(new CoalOre (), 20, 16, 0, 128), @@ -212,6 +221,7 @@ class BetterNormal extends Generator { new OreType(new Gravel (), 10, 16, 0, 128) ]); $this->populators[] = $ores; + } } /*