Big update !

- Updating headers, - Adding first setting, deleteBiomes, wiki comming soon
Ad5001 · May 10, 2017 · b73d3c9 · b73d3c9
1 parent acd3273
commit b73d3c9
Show file tree

Hide file tree

Showing 37 changed files with 534 additions and 275 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,17 +1,31 @@
 ---
-# Base generated with ImagicalPlugCreator by Ad5001 (C) 2017 for Ad5001
-# link: https://ad5001.eu
+#  ____             __     __                    ____                       
+# /\  _`\          /\ \__ /\ \__                /\  _`\                     
+# \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+#  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+#   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+#    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+#     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+# Tommorow's pocketmine generator.
+# @author Ad5001
+# @link https://github.com/Ad5001/BetterGen
 name: BetterGen
 author: Ad5001
 main: Ad5001\BetterGen\Main
-version: 1.0
+version: 1.1
 api: [3.0.1, 3.0.0-ALPHA3]
 commands:
     createworld:
         description: Generates a new world.
         usage: "/createworld <name> [generator = betternormal] [seed = rand()] [options (json)]"
         permission: bettergen.cmd.createworld
+    worldtp:
+        description: Teleports you to an another world
+        usage: "/worldtp <world name>"
+        permission: bettergen.cmd.worldtp
 permissions:
     bettergen.cmd.createworld:
         default: op
+    bettergen.cmd.worldtp:
+        default: op
 ...
diff --git a/src/Ad5001/BetterGen/Main.php b/src/Ad5001/BetterGen/Main.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * Main from BetterGen
- * Copyright(C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen;
@@ -112,6 +117,7 @@ public function onCommand(\pocketmine\command\CommandSender $sender, \pocketmine
 							return true;
 						}
 						$generatorName = strtolower($args [1]);
+						if($args[2] == "rand") $args[2] = $this->generateRandomSeed();
 						if(preg_match("[^\d]", $args [2]) !== false) {
 							$parts = str_split($args [2]);
 							foreach($parts as $key => $str) {
@@ -123,12 +129,17 @@ public function onCommand(\pocketmine\command\CommandSender $sender, \pocketmine
 						}
 						unset($args [0], $args [1], $args [2]);
 						$options = json_decode($args [3], true);
-						if(! is_array($json)) {
+						if(! is_array($options)) {
 							$sender->sendMessage(Main::PREFIX . "§4Invalid JSON for options.");
 							return true;
 						}
 						break;
 				}
+				$options["preset"] = json_encode($options);
+				if((int) $seed == 0/*String*/){
+					$seed = $this->generateRandomSeed();
+					echo "Rechoosen seed";
+				}
 				$this->getServer()->broadcastMessage(Main::PREFIX . "§aGenerating level $name with generator $generatorName and seed $seed..");
 				$this->getServer()->generateLevel($name, $seed, $generator, $options);
 				$this->getServer()->loadLevel($name);
@@ -161,10 +172,6 @@ public function registerForest(string $name, string $treeClass, array $infos): b
 	 * @return void
 	 */
 	public static function registerBiome(int $id, Biome $biome) {
-		$reflection = new \ReflectionClass('pocketmine\\level\\generator\\biome\\Biome');
-		$register = $reflection->getMethod('register');
-		$register->setAccessible(true);
-		$register->invoke(null, $id, $biome);
 		BetterNormal::registerBiome($biome);
 	}
 
@@ -173,7 +180,7 @@ public static function registerBiome(int $id, Biome $biome) {
 	 * @return int
 	 */
 	public function generateRandomSeed(): int {
-		return(int) round(time() * rand(0, time()) / memory_get_usage());
+		return (int) round(rand(0, round(time()) / memory_get_usage(true)) * (int) str_shuffle("127469453645108") / (int) str_shuffle("12746945364"));
 	}
 
 	// Listener

diff --git a/src/Ad5001/BetterGen/biome/BetterDesert.php b/src/Ad5001/BetterGen/biome/BetterDesert.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * BetterDesert from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 namespace Ad5001\BetterGen\biome;
 
@@ -67,7 +72,7 @@ public function __construct() {
 		]);
 	}
 	public function getName(): string {
-		return "Better Desert";
+		return "BetterDesert";
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/BetterForest.php b/src/Ad5001/BetterGen/biome/BetterForest.php
@@ -1,11 +1,18 @@
 <?php
 
-/*
- * BetterForest from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
+
 namespace Ad5001\BetterGen\biome;
 
 use pocketmine\level\generator\normal\biome\ForestBiome;
@@ -49,7 +56,7 @@ public function __construct($type = 0, array $infos = [0.6, 0.5]) {
 		$this->rainfall = $infos [1];
 	}
 	public function getName() {
-		return self::$types [$this->type];
+		return str_ireplace(" ", "", self::$types[$this->type]);
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/BetterIcePlains.php b/src/Ad5001/BetterGen/biome/BetterIcePlains.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * BetterIcePlains from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
@@ -38,7 +43,7 @@ public function __construct() {
 		$this->rainfall = 0.8;
 	}
 	public function getName() {
-		return "Better Ice Plains";
+		return "BetterIcePlains";
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/BetterMesa.php b/src/Ad5001/BetterGen/biome/BetterMesa.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * BetterMesa from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
@@ -102,7 +107,7 @@ public function __construct() {
 		]);
 	}
 	public function getName(): string {
-		return "Better Mesa";
+		return "BetterMesa";
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/BetterMesaPlains.php b/src/Ad5001/BetterGen/biome/BetterMesaPlains.php
@@ -1,11 +1,17 @@
 <?php
-
-/*
- * BetterMesaPlains from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
+
 namespace Ad5001\BetterGen\biome;
 
 use pocketmine\level\generator\normal\biome\SandyBiome;
@@ -96,7 +102,7 @@ public function __construct() {
 		]);
 	}
 	public function getName(): string {
-		return "Better Mesa Plains";
+		return "BetterMesaPlains";
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/BetterRiver.php b/src/Ad5001/BetterGen/biome/BetterRiver.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * BetterRiver from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;
@@ -36,7 +41,7 @@ public function __construct() {
 		$this->rainfall = 0.7;
 	}
 	public function getName() {
-		return "Better River";
+		return "BetterRiver";
 	}
 
 	/*

diff --git a/src/Ad5001/BetterGen/biome/Mountainable.php b/src/Ad5001/BetterGen/biome/Mountainable.php
@@ -1,10 +1,15 @@
 <?php
-
-/*
- * Mountainable from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
  */
 
 namespace Ad5001\BetterGen\biome;

diff --git a/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php b/src/Ad5001/BetterGen/generator/BetterBiomeSelector.php
@@ -1,11 +1,16 @@
 <?php
-
-/*
- * BetterBiomeSelector from BetterGen
- * Copyright (C) Ad5001 2017
- * Licensed under the BoxOfDevs Public General LICENSE which can be found in the file LICENSE in the root directory
- * @author ad5001
- */
+/**
+ *  ____             __     __                    ____                       
+ * /\  _`\          /\ \__ /\ \__                /\  _`\                     
+ * \ \ \L\ \     __ \ \ ,_\\ \ ,_\     __   _ __ \ \ \L\_\     __     ___    
+ *  \ \  _ <'  /'__`\\ \ \/ \ \ \/   /'__`\/\`'__\\ \ \L_L   /'__`\ /' _ `\  
+ *   \ \ \L\ \/\  __/ \ \ \_ \ \ \_ /\  __/\ \ \/  \ \ \/, \/\  __/ /\ \/\ \ 
+ *    \ \____/\ \____\ \ \__\ \ \__\\ \____\\ \_\   \ \____/\ \____\\ \_\ \_\
+ *     \/___/  \/____/  \/__/  \/__/ \/____/ \/_/    \/___/  \/____/ \/_/\/_/
+ * Tommorow's pocketmine generator.
+ * @author Ad5001
+ * @link https://github.com/Ad5001/BetterGen
+*/
 namespace Ad5001\BetterGen\generator;
 
 use pocketmine\level\generator\biome\BiomeSelector;
@@ -59,7 +64,6 @@ public function pickBiome($x, $z) {
 		$rainfall = ($this->getRainfall($x, $z ));
 
 		$biomeId = BetterNormal::getBiome($temperature, $rainfall);
-		// $biomeId = new \Ad5001\BetterGen\biome\BetterDesert();
 		$b = (($biomeId instanceof Biome) ? $biomeId : ($this->biomes [$biomeId] ?? $this->fallback));
 		return $b;
 	}