From fe3c054c83fc72d64fe33147193b1fb33e58af69 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Sun, 23 Dec 2012 20:02:58 +0100 Subject: [PATCH] World generation presets with metadata --- classes/DefaultGenerator.class.php | 53 ++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/classes/DefaultGenerator.class.php b/classes/DefaultGenerator.class.php index 91dea6e8..a1a5f6cb 100644 --- a/classes/DefaultGenerator.class.php +++ b/classes/DefaultGenerator.class.php @@ -27,13 +27,14 @@ the Free Software Foundation, either version 3 of the License, or class DefaultGenerator{ - private $config, $spawn, $seed, $structure; + private $config, $spawn, $structure; public function __construct($seed){ - $this->seed = (int) $seed; $this->config = array( - "preset" => "7;20x1;3x3;2;spawn-surface(24);spawn-radius(10)", + "preset" => "7;20x1;3x3;2", "spawn-surface" => 24, "spawn-radius" => 10, + "torches" => 0, + "seed" => (int) $seed, ); $this->parsePreset(); } @@ -47,26 +48,41 @@ class DefaultGenerator{ private function parsePreset(){ $preset = explode(";", $this->config["preset"]); - $this->structure = ""; + $this->structure = array( + 0 => "", + 1 => "", + 2 => str_repeat("\x00", 64), + 3 => str_repeat("\x00", 64), + ); + foreach($preset as $i => $data){ + $num = 1; if(preg_match('#([a-zA-Z\-_]*)\((.*)\)#', $data, $matches) > 0){ //Property $this->config[$matches[1]] = $matches[2]; - }elseif(preg_match('#([0-9]*)x([0-9]*)#', $data, $matches) > 0){ + continue; + }elseif(preg_match('#([0-9]*)x([0-9:]*)#', $data, $matches) > 0){ $num = (int) $matches[1]; - $block = (int) $matches[2]; - for($j = 0; $j < $num; ++$j){ - $this->structure .= chr($block%256); - } + $d = explode(":", $matches[2]); }else{ - $block = (int) $data; - $this->structure .= chr($block%256); + $d = explode(":", $data); + } + $block = (int) array_shift($d); + $meta = (int) @array_shift($d); + for($j = 0; $j < $num; ++$j){ + $this->structure[0] .= chr($block & 0xFF); + $this->structure[1] .= substr(dechex($meta & 0x0F),0,-1); } } - $this->structure = substr($this->structure, 0, 128); + $this->structure[1] = Utils::hexToStr(str_pad($this->structure[1], (strlen($this->structure[1])&0xFE) + 2, "0", STR_PAD_RIGHT)); + + $this->structure[0] = substr($this->structure[0], 0, 128); + $this->structure[1] = substr($this->structure[1], 0, 64); + $this->structure[2] = substr($this->structure[2], 0, 64); + $this->structure[3] = substr($this->structure[3], 0, 64); } public function init(){ - $this->spawn = array(128, strlen($this->structure), 128); + $this->spawn = array(128, strlen($this->structure[0]), 128); } public function getSpawn(){ @@ -82,14 +98,17 @@ class DefaultGenerator{ 2 => "", 3 => "", ); - $column[0] = $this->structure; + $column = $this->structure; if(floor(sqrt(pow($x - $this->spawn[0], 2) + pow($z - $this->spawn[2], 2))) <= $this->config["spawn-radius"]){ $column[0]{strlen($column[0])-1} = chr($this->config["spawn-surface"]); } + if(($x % 8) === 0 and ($z % 8) === 0){ + $column[0] .= chr(50); + } $column[0] .= str_repeat(chr(0), 128 - strlen($column[0])); - $column[1] = str_repeat(chr(0), 64); - $column[2] = str_repeat(chr(0), 64); - $column[3] = str_repeat(chr(0), 64); + $column[1] .= str_repeat(chr(0), 64 - strlen($column[1])); + $column[2] .= str_repeat(chr(0), 64 - strlen($column[2])); + $column[3] .= str_repeat(chr(0), 64 - strlen($column[3])); return $column; }