diff --git a/src/API/LevelAPI.php b/src/API/LevelAPI.php
index 93f6a15f..77772650 100644
--- a/src/API/LevelAPI.php
+++ b/src/API/LevelAPI.php
@@ -130,10 +130,17 @@ class LevelAPI{
if($generator !== false and class_exists($generator)){
$generator = new $generator($options);
}else{
- if(strtoupper($this->server->api->getProperty("level-type")) == "FLAT"){
- $generator = new SuperflatGenerator($options);
- }else{
- $generator = new TemporalGenerator($options);
+ $type = strtoupper($this->server->api->getProperty("level-type"));
+ switch($type){
+ case "FLAT":
+ $generator = new SuperflatGenerator($options);
+ break;
+ case "EXPERIMENTAL":
+ $generator = new NormalGenerator($options);
+ break;
+ default:
+ $generator = new TemporalGenerator($options);
+ break;
}
}
$gen = new WorldGenerator($generator, $name, $seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)) : (int) $seed);
diff --git a/src/world/generator/NewLevelGenerator.php b/src/world/generator/NewLevelGenerator.php
new file mode 100644
index 00000000..7359e7db
--- /dev/null
+++ b/src/world/generator/NewLevelGenerator.php
@@ -0,0 +1,18 @@
+level = $level;
+ $this->random = $random;
+ $this->random->setSeed($this->level->getSeed());
+ $this->noiseHills = new NoiseGeneratorSimplex($this->random, 3);
+ $this->noisePatches = new NoiseGeneratorSimplex($this->random, 2);
+ $this->noisePatchesSmall = new NoiseGeneratorSimplex($this->random, 2);
+ $this->noiseBase = new NoiseGeneratorSimplex($this->random, 16);
+
+
+
+ $ores = new OrePopulator();
+ $ores->setOreTypes(array(
+ new OreType(new CoalOreBlock(), 20, 16, 0, 128),
+ new OreType(New IronOreBlock(), 20, 8, 0, 64),
+ new OreType(new RedstoneOreBlock(), 8, 7, 0, 16),
+ new OreType(new LapisOreBlock(), 1, 6, 0, 32),
+ new OreType(new GoldOreBlock(), 2, 8, 0, 32),
+ new OreType(new DiamondOreBlock(), 1, 7, 0, 16),
+ new OreType(new EmeraldOreBlock(), 1, 7, 0, 16), //TODO vanilla
+ new OreType(new DirtBlock(), 20, 32, 0, 128),
+ new OreType(new GravelBlock(), 10, 16, 0, 128),
+ ));
+ $this->populators[] = $ores;
+
+ $trees = new TreePopulator();
+ $trees->setBaseAmount(3);
+ $trees->setRandomAmount(0);
+ $this->populators[] = $trees;
+
+ $tallGrass = new TallGrassPopulator();
+ $tallGrass->setBaseAmount(5);
+ $tallGrass->setRandomAmount(0);
+ $this->populators[] = $tallGrass;
+ }
+
+ public function generateChunk($chunkX, $chunkZ){
+ $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
+ $hills = array();
+ $patchesSmall = array();
+ $base = array();
+ for($z = 0; $z < 16; ++$z){
+ for($x = 0; $x < 16; ++$x){
+ $i = ($z << 4) + $x;
+ $hills[$i] = $this->noiseHills->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.11, 12, true);
+ $patches[$i] = $this->noisePatches->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.03, 16, true);
+ $patchesSmall[$i] = $this->noisePatchesSmall->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.5, 4, true);
+ $base[$i] = $this->noiseBase->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.7, 16, true);
+
+ if($base[$i] < 0){
+ $base[$i] *= 0.5;
+ }
+ }
+ }
+
+ for($chunkY = 0; $chunkY < 8; ++$chunkY){
+ $chunk = "";
+ $startY = $chunkY << 4;
+ $endY = $startY + 16;
+ for($z = 0; $z < 16; ++$z){
+ for($x = 0; $x < 16; ++$x){
+ $i = ($z << 4) + $x;
+ $height = $this->worldHeight + $hills[$i] * 14 + $base[$i] * 7;
+ $height = (int) $height;
+
+ for($y = $startY; $y < $endY; ++$y){
+ $diff = $height - $y;
+ if($y <= 4 and ($y === 0 or $this->random->nextFloat() < 0.75)){
+ $chunk .= "\x07"; //bedrock
+ }elseif($diff > 2){
+ $chunk .= "\x01"; //stone
+ }elseif($diff > 0){
+ if($patches[$i] > 0.7){
+ $chunk .= "\x01"; //stone
+ }elseif($patches[$i] < -0.8){
+ $chunk .= "\x0d"; //gravel
+ }else{
+ $chunk .= "\x03"; //dirt
+ }
+ }elseif($y <= $this->waterHeight){
+ if(($this->waterHeight - $y) <= 1 and $diff === 0){
+ $chunk .= "\x0c"; //sand
+ }elseif($diff === 0){
+ if($patchesSmall[$i] > 0.3){
+ $chunk .= "\x0d"; //gravel
+ }elseif($patchesSmall[$i] < -0.45){
+ $chunk .= "\x0c"; //sand
+ }else{
+ $chunk .= "\x03"; //dirt
+ }
+ }else{
+ $chunk .= "\x09"; //still_water
+ }
+ }elseif($diff === 0){
+ if($patches[$i] > 0.7){
+ $chunk .= "\x01"; //stone
+ }elseif($patches[$i] < -0.8){
+ $chunk .= "\x0d"; //gravel
+ }else{
+ $chunk .= "\x02"; //grass
+ }
+ }else{
+ $chunk .= "\x00";
+ }
+ }
+ $chunk .= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+ }
+ }
+ $this->level->setMiniChunk($chunkX, $chunkZ, $chunkY, $chunk);
+ }
+
+ }
+
+ public function populateChunk($chunkX, $chunkZ){
+ $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
+ foreach($this->populators as $populator){
+ $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
+ $populator->populate($this->level, $chunkX, $chunkZ, $this->random);
+ }
+ }
+
+ public function getSpawn(){
+ return $this->level->getSafeSpawn(new Vector3(127.5, 128, 127.5));
+ }
+ public function populateLevel()
+ {}
+
+
+}
\ No newline at end of file
diff --git a/src/world/generator/biome/Biome.php b/src/world/generator/biome/Biome.php
index 82b8b0d2..5967c719 100644
--- a/src/world/generator/biome/Biome.php
+++ b/src/world/generator/biome/Biome.php
@@ -1,8 +1,32 @@
name = $name;
+ self::$biomes[$id] = $this;
+ }
+
+ public function setTopBlock($id){
+ $this->topBlock = $id;
+ return $this;
+ }
+
+ public function setFillerBlock($id){
+ $this->fillerBlock = $id;
+ return $this;
+ }
+
+ public function getBiomeAt($x, $z){
+ self::$biomeLookup[$x + $z * 64];
+ }
+
public static function init(){
//register biomes
}
+
+ public static $temperature, $rainfall;
+ private static $biomeLookup = [];
+ public static $biomes = [];
}
\ No newline at end of file
diff --git a/src/world/generator/biome/BiomeSelector.php b/src/world/generator/biome/BiomeSelector.php
new file mode 100644
index 00000000..b324366b
--- /dev/null
+++ b/src/world/generator/biome/BiomeSelector.php
@@ -0,0 +1,51 @@
+fallback = $fallback;
+ $this->lookup = $lookup;
+ $this->temperature = new NoiseGeneratorSimplex($random, 2);
+ $this->rainfall = new NoiseGeneratorSimplex($random, 2);
+ }
+
+ public function generateBiomeLookup(){
+ $this->map = new SplFixedArray(64 * 64);
+ for($t = 0; $t < 64; ++$t){
+ for($r = 0; $r < 64; ++$r){
+ $this->map[$t + $r << 6] = call_user_func($this->lookup, $t / 63, $r / 63);
+ }
+ }
+ }
+ public function getTemperature($x, $z){ //TODO cache
+ return ($this->temperature->noise2D($x, $z, 1 / 16, 1 / 512, true) + 1) / 2;
+ }
+
+ public function getRainfall($x, $z){
+ return ($this->rainfall->noise2D($x, $z, 1 / 16, 1 / 512, true) + 1) / 2;
+ }
+
+ public function getBiome($x, $z){
+ $temperature = (int) ($this->getTemperature($x, $z) * 63);
+ $rainfall = (int) ($this->getRainfall($x, $z) * 63);
+
+ $biomeId = $this->map[$temperature + ($rainfall << 6)];
+ return isset($this->biomes[$biomeId]) ? $this->biomes[$biomeId] : $this->fallback;
+ }
+}
+
diff --git a/src/world/generator/noise/NoiseGenerator.php b/src/world/generator/noise/NoiseGenerator.php
index 227a6693..7f9e0b98 100644
--- a/src/world/generator/noise/NoiseGenerator.php
+++ b/src/world/generator/noise/NoiseGenerator.php
@@ -1,5 +1,96 @@
= 0 ? (int) $x : (int) ($x - 1);
+ }
+ public static function fade($x){
+ return $x * $x * $x * ($x * ($x * 6 - 15) + 10);
+ }
+
+ public static function lerp($x, $y, $z){
+ return $y + $x * ($z - $y);
+ }
+
+ public static function grad($hash, $x, $y, $z){
+ $hash &= 15;
+ $u = $hash < 8 ? $x : $y;
+ $v = $hash < 4 ? $y : (($hash === 12 or $hash === 14) ? $x : $z);
+ return (($hash & 1) === 0 ? $u : -$u) + (($hash & 2) === 0 ? $v : -$v);
+ }
+
+ abstract public function getNoise2D($x, $z);
+
+ abstract public function getNoise3D($x, $y, $z);
+
+ public function noise2D($x, $z, $frequency, $amplitude, $normalized = false){
+ $result = 0;
+ $amp = 1;
+ $freq = 1;
+ $max = 0;
+
+ for($i = 0; $i < $this->octaves; ++$i){
+ $result += $this->getNoise2D($x * $freq, $z * $freq) * $amp;
+ $max += $amp;
+ $freq *= $frequency;
+ $amp *= $amplitude;
+ }
+ if($normalized === true){
+ $result /= $max;
+ }
+
+ return $result;
+ }
+
+ public function noise3D($x, $y, $z, $frequency, $amplitude, $normalized = false){
+ $result = 0;
+ $amp = 1;
+ $freq = 1;
+ $max = 0;
+
+ for($i = 0; $i < $this->octaves; ++$i){
+ $result += $this->getNoise3D($x * $freq, $y * $freq, $z * $freq) * $amp;
+ $max += $amp;
+ $freq *= $frequency;
+ $amp *= $amplitude;
+ }
+ if($normalized === true){
+ $result /= $max;
+ }
+
+ return $result;
+ }
+
+ public function setOffset($x, $y, $z){
+ $this->offsetX = $x;
+ $this->offsetY = $y;
+ $this->offsetZ = $z;
+ }
}
\ No newline at end of file
diff --git a/src/world/generator/noise/NoiseGeneratorOctaves.php b/src/world/generator/noise/NoiseGeneratorOctaves.php
index 30a207d9..cc977171 100644
--- a/src/world/generator/noise/NoiseGeneratorOctaves.php
+++ b/src/world/generator/noise/NoiseGeneratorOctaves.php
@@ -1,13 +1,32 @@
generatorCollection = array();
$this->octaves = (int) $octaves;
for($o = 0; $o < $this->octaves; ++$o){
diff --git a/src/world/generator/noise/NoiseGeneratorPerlin.php b/src/world/generator/noise/NoiseGeneratorPerlin.php
index 0b26493e..78b324f8 100644
--- a/src/world/generator/noise/NoiseGeneratorPerlin.php
+++ b/src/world/generator/noise/NoiseGeneratorPerlin.php
@@ -1,151 +1,102 @@
xCoord = $random->nextFloat() * 256;
- $this->yCoord = $random->nextFloat() * 256;
- $this->zCoord = $random->nextFloat() * 256;
-
+ public static $grad3 = [
+ [1, 1, 0], [-1, 1, 0], [1, -1, 0], [-1, -1, 0],
+ [1, 0, 1], [-1, 0, 1], [1, 0, -1], [-1, 0, -1],
+ [0, 1, 1], [0, -1, 1], [0, 1, -1], [0, -1, -1]
+ ];
+
+
+ public function __construct(Random $random, $octaves){
+ $this->octaves = $octaves;
+ $this->offsetX = $random->nextFloat() * 256;
+ $this->offsetY = $random->nextFloat() * 256;
+ $this->offsetZ = $random->nextFloat() * 256;
+
for($i = 0; $i < 512; ++$i){
- $this->permutations[$i] = 0;
+ $this->perm[$i] = 0;
}
+
for($i = 0; $i < 256; ++$i){
- $this->permutations[$i] = $i;
+ $this->perm[$i] = $random->nextRange(0, 255);
}
-
+
for($i = 0; $i < 256; ++$i){
- $j = $random->nextRange(0, 256 - $i) + $i;
- $k = $this->permutations[$i];
- $this->permutations[$i] = $this->permutations[$j];
- $this->permutations[$j] = $k;
- $this->permutations[$i + 256] = $this->permutations[$i];
+ $pos = $random->nextRange(0, 255 - $i) + $i;
+ $old = $this->perm[$i];
+
+ $this->perm[$i] = $this->perm[$pos];
+ $this->perm[$pos] = $old;
+ $this->perm[$i + 256] = $this->perm[$i];
}
-
+
}
-
- public function populateNoiseArray(&$floats, $par1, $par2, $par3, $int1, $int2, $int3, $par4, $par5, $par6, $par7){
- if($int2 === 1){
- $n = 0;
- $d3 = 1 / $par7;
- for($i1 = 0; $i1 < $int1; ++$i1){
- $d4 = $par1 + $i1 * $par4 + $this->xCoord;
- $i2 = (int) $d4;
- if($d4 < $i2){
- --$i2;
- }
- $i3 = $i2 & 0xFF;
- $d4 -= $i2;
- $d5 = $d4 * $d4 * $d4 * ($d4 * ($d4 * 6 - 15) + 10);
-
- for($i4 = 0; $i4 < $int3; ++$i4){
- $d6 = $par3 + $i4 * $par6 + $this->zCoord;
- $i5 = (int) $d6;
- if($d6 < $i5){
- --$i5;
- }
- $i6 = $i5 & 0xFF;
- $d6 -= $i5;
- $d7 = $d6 * $d6 * $d6 * ($d6 * ($d6 * 6 - 15) + 10);
-
- $i = $this->permutations[$i3];
- $j = $this->permutations[$i] + $i6;
- $k = $this->permutations[$i3 + 1];
- $m = $this->permutations[$k] + $i6;
- $d1 = $this->curve($d5, $this->grad2D($this->permutations[$j], $d4, $d6), $this->grad3D($this->permutations[$m], $d4 - 1, 0, $d6));
- $d2 = $this->curve($d5, $this->grad3D($this->permutations[$j + 1], $d4, 0, $d6 - 1), $this->grad3D($this->permutations[$m + 1], $d4 - 1, 0, $d6 - 1));
-
- $d8 = $this->curve($d7, $d1, $d2);
- $floats[$n++] += $d8 * $d3;
- }
- }
- return;
- }
-
- $d9 = 1 / $par7;
- $m = -1;
- $n = 0;
- $i = 0;
-
- for($i4 = 0; $i4 < $int1; ++$i4){
- $d6 = $par1 + $i4 * $par4 + $this->xCoord;
- $i5 = (int) $d6;
- if($d6 < $i5){
- --$i5;
- }
- $i6 = $i5 & 0xFF;
- $d6 -= $i5;
- $d7 = $d6 * $d6 * $d6 * ($d6 * ($d6 * 6 - 15) + 10);
-
- for($i12 = 0; $i12 < $int3; ++$i12){
- $d12 = $par3 + $i12 * $par6 + $this->zCoord;
- $i13 = (int) $d12;
- if($d12 < $i13){
- --$i13;
- }
- $i14 = $i13 & 0xFF;
- $d12 -= $i13;
- $d13 = $d12 * $d12 * $d12 * ($d12 * ($d12 * 6 - 15) + 10);
-
- for($i15 = 0; $i15 < $int2; ++$i15){
- $d14 = $par2 + $i15 * $par5 + $this->yCoord;
- $i16 = (int) $d14;
- if($d14 < $i16){
- --$i16;
- }
- $d14 -= $i16;
- $d15 = $d14 * $d14 * $d14 * ($d14 * ($d14 * 6 - 15) + 10);
-
- if($i15 === 0 or $i17 !== $m){
- $m = $i17;
- $i7 = $this->permutations[$i6] + $i17;
- $i8 = $this->permutations[$i7] + $i14;
- $i9 = $this->permutations[$i7 + 1] + $i14;
- $i10 = $this->permutations[$i6 + 1] + $i17;
- $n = $this->permutations[$i10] + $i14;
- $i11 = $this->permutations[$i10 + 1] + $i14;
- $d10 = $this->curve($d7, $this->grad3D($this->permutations[$i8], $d6, $d14, $d12), $this->grad3D($this->permutations[$n], $d6 - 1, $d14, $d12));
- $d4 = $this->curve($d7, $this->grad3D($this->permutations[$i9], $d6, $d14 - 1, $d12), $this->grad3D($this->permutations[$i11], $d6 - 1, $d14 - 1, $d12));
- $d11 = $this->curve($d7, $this->grad3D($this->permutations[$i8 + 1], $d6, $d14, $d12 - 1), $this->grad3D($this->permutations[$n + 1], $d6 - 1, $d14, $d12 - 1));
- $d5 = $this->curve($d7, $this->grad3D($this->permutations[$i9 + 1], $d6, $d14 - 1, $d12 - 1), $this->grad3D($this->permutations[$i11 + 1], $d6 - 1, $d14 - 1, $d12 - 1));
- }
-
- $d16 = $this->curve($d15, $d10, $d4);
- $d17 = $this->curve($d15, $d11, $d5);
- $d18 = $this->curve($d13, $d16, $d17);
- $floats[$i++] += $d18 * $d9;
- }
- }
- }
+
+ public function getNoise3D($x, $y, $z){
+ $x += $this->offsetX;
+ $y += $this->offsetY;
+ $z += $this->offsetZ;
+
+ $floorX = self::floor($x);
+ $floorY = self::floor($y);
+ $floorZ = self::floor($z);
+
+ $X = $floorX & 0xFF;
+ $Y = $floorY & 0xFF;
+ $Z = $floorZ & 0xFF;
+
+ $x -= $floorX;
+ $y -= $floorY;
+ $z -= $floorZ;
+
+ //Fade curves
+ $fX = self::fade($x);
+ $fY = self::fade($y);
+ $fZ = self::fade($z);
+
+ //Cube corners
+ $A = $this->perm[$X] + $Y;
+ $AA = $this->perm[$A] + $Z;
+ $AB = $this->perm[$A + 1] + $Z;
+ $B = $this->perm[$X + 1] + $Y;
+ $BA = $this->perm[$B] + $Z;
+ $BB = $this->perm[$B + 1] + $Z;
+
+ return self::lerp($fZ, self::lerp($fY, self::lerp($fX, self::grad($this->perm[$AA], $x, $y, $z),
+ self::grad($this->perm[$BA], $x - 1, $y, $z)),
+ self::lerp($fX, self::grad($this->perm[$AB], $x, $y - 1, $z),
+ self::grad($this->perm[$BB], $x - 1, $y - 1, $z))),
+ self::lerp($fY, self::lerp($fX, self::grad($this->perm[$AA + 1], $x, $y, $z - 1),
+ self::grad($this->perm[$BA + 1], $x - 1, $y, $z - 1)),
+ self::lerp($fX, self::grad($this->perm[$AB + 1], $x, $y - 1, $z - 1),
+ self::grad($this->perm[$BB + 1], $x - 1, $y - 1, $z - 1))));
}
-
- public final function curve($par1, $par2, $par3){
- return $par2 + $par1 * ($par3 - $par2);
- }
-
- public function grad2D($int, $par1, $par2){
- $i = $int & 0x0F;
- $d1 = (1 - (($i & 0x08) >> 3)) * $par1;
- $d2 = ($i === 12 or $i === 14) ? $par1 : ($i < 4 ? 0 : $par2);
-
- return (($i & 0x01) === 0 ? $d1 : -$d1) + (($i & 0x02) === 0 ? $d2 : -$d2);
- }
-
- public function grad3D($int, $par1, $par2, $par3){
- $i = $int & 0x0F;
- $d1 = $i < 8 ? $par1 : $par2;
- $d2 = ($i === 12 or $i === 14) ? $par1 : ($i < 4 ? $par2 : $par3);
-
- return (($i & 0x01) === 0 ? $d1 : -$d1) + (($i & 0x02) === 0 ? $d2 : -$d2);
+
+ public function getNoise2D($x, $y){
+ return $this->getNoise3D($x, $y, 0);
}
}
\ No newline at end of file
diff --git a/src/world/generator/noise/NoiseGeneratorSimplex.php b/src/world/generator/noise/NoiseGeneratorSimplex.php
new file mode 100644
index 00000000..66034cec
--- /dev/null
+++ b/src/world/generator/noise/NoiseGeneratorSimplex.php
@@ -0,0 +1,282 @@
+
+ * This is a modified version of the freely published version in the paper by
+ * Stefan Gustavson at
+ *
+ * http://staffwww.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
+ */
+class NoiseGeneratorSimplex extends NoiseGeneratorPerlin{
+ protected static $SQRT_3;
+ protected static $SQRT_5;
+ protected static $F2;
+ protected static $G2;
+ protected static $G22;
+ protected static $F3;
+ protected static $G3;
+ protected static $F4;
+ protected static $G4;
+ protected static $G42;
+ protected static $G43;
+ protected static $G44;
+ protected static $grad4 = [[0, 1, 1, 1],[0, 1, 1, -1],[0, 1, -1, 1],[0, 1, -1, -1],
+ [0, -1, 1, 1],[0, -1, 1, -1],[0, -1, -1, 1],[0, -1, -1, -1],
+ [1, 0, 1, 1],[1, 0, 1, -1],[1, 0, -1, 1],[1, 0, -1, -1],
+ [-1, 0, 1, 1],[-1, 0, 1, -1],[-1, 0, -1, 1],[-1, 0, -1, -1],
+ [1, 1, 0, 1],[1, 1, 0, -1],[1, -1, 0, 1],[1, -1, 0, -1],
+ [-1, 1, 0, 1],[-1, 1, 0, -1],[-1, -1, 0, 1],[-1, -1, 0, -1],
+ [1, 1, 1, 0],[1, 1, -1, 0],[1, -1, 1, 0],[1, -1, -1, 0],
+ [-1, 1, 1, 0],[-1, 1, -1, 0],[-1, -1, 1, 0],[-1, -1, -1, 0]];
+ protected static $simplex = [
+ [0, 1, 2, 3],[0, 1, 3, 2],[0, 0, 0, 0],[0, 2, 3, 1],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[1, 2, 3, 0],
+ [0, 2, 1, 3],[0, 0, 0, 0],[0, 3, 1, 2],[0, 3, 2, 1],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[1, 3, 2, 0],
+ [0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],
+ [1, 2, 0, 3],[0, 0, 0, 0],[1, 3, 0, 2],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[2, 3, 0, 1],[2, 3, 1, 0],
+ [1, 0, 2, 3],[1, 0, 3, 2],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[2, 0, 3, 1],[0, 0, 0, 0],[2, 1, 3, 0],
+ [0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],
+ [2, 0, 1, 3],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[3, 0, 1, 2],[3, 0, 2, 1],[0, 0, 0, 0],[3, 1, 2, 0],
+ [2, 1, 0, 3],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[3, 1, 0, 2],[0, 0, 0, 0],[3, 2, 0, 1],[3, 2, 1, 0]];
+ protected $offsetW;
+
+ public function __construct(Random $random, $octaves){
+ parent::__construct($random, $octaves);
+ $this->offsetW = $random->nextFloat() * 256;
+ self::$SQRT_3 = sqrt(3);
+ self::$SQRT_5 = sqrt(5);
+ self::$F2 = 0.5 * (self::$SQRT_3 - 1);
+ self::$G2 = (3 - self::$SQRT_3) / 6;
+ self::$G22 = self::$G2 * 2.0 - 1;
+ self::$F3 = 1.0 / 3.0;
+ self::$G3 = 1.0 / 6.0;
+ self::$F4 = (self::$SQRT_5 - 1.0) / 4.0;
+ self::$G4 = (5.0 - self::$SQRT_5) / 20.0;
+ self::$G42 = self::$G4 * 2.0;
+ self::$G43 = self::$G4 * 3.0;
+ self::$G44 = self::$G4 * 4.0 - 1.0;
+ }
+
+ protected static function dot2D($g, $x, $y){
+ return $g[0] * $x + $g[1] * $y;
+ }
+
+ protected static function dot3D($g, $x, $y, $z){
+ return $g[0] * $x + $g[1] * $y + $g[2] * $z;
+ }
+
+ protected static function dot4D($g, $x, $y, $z, $w){
+ return $g[0] * $x + $g[1] * $y + $g[2] * $z + $g[3] * $w;
+ }
+
+ public function getNoise3D($x, $y, $z){
+ $x += $this->offsetX;
+ $y += $this->offsetY;
+ $z += $this->offsetZ;
+
+ // Skew the input space to determine which simplex cell we're in
+ $s = ($x + $y + $z) * self::$F3; // Very nice and simple skew factor for 3D
+ $i = self::floor($x + $s);
+ $j = self::floor($y + $s);
+ $k = self::floor($z + $s);
+ $t = ($i + $j + $k) * self::$G3;
+ $X0 = $i - $t; // Unskew the cell origin back to (x,y,z) space
+ $Y0 = $j - $t;
+ $Z0 = $k - $t;
+ $x0 = $x - $X0; // The x,y,z distances from the cell origin
+ $y0 = $y - $Y0;
+ $z0 = $z - $Z0;
+
+ // For the 3D case, the simplex shape is a slightly irregular tetrahedron.
+
+ // Determine which simplex we are in.
+ if($x0 >= $y0){
+ if($y0 >= $z0){
+ $i1 = 1;
+ $j1 = 0;
+ $k1 = 0;
+ $i2 = 1;
+ $j2 = 1;
+ $k2 = 0;
+ }// X Y Z order
+ elseif($x0 >= $z0){
+ $i1 = 1;
+ $j1 = 0;
+ $k1 = 0;
+ $i2 = 1;
+ $j2 = 0;
+ $k2 = 1;
+ }// X Z Y order
+ else{
+ $i1 = 0;
+ $j1 = 0;
+ $k1 = 1;
+ $i2 = 1;
+ $j2 = 0;
+ $k2 = 1;
+ }// Z X Y order
+ }else{ // x0perm[$ii + $this->perm[$jj + $this->perm[$kk]]] % 12;
+ $gi1 = $this->perm[$ii + $i1 + $this->perm[$jj + $j1 + $this->perm[$kk + $k1]]] % 12;
+ $gi2 = $this->perm[$ii + $i2 + $this->perm[$jj + $j2 + $this->perm[$kk + $k2]]] % 12;
+ $gi3 = $this->perm[$ii + 1 + $this->perm[$jj + 1 + $this->perm[$kk + 1]]] % 12;
+
+ // Calculate the contribution from the four corners
+ $t0 = 0.6 - $x0 * $x0 - $y0 * $y0 - $z0 * $z0;
+ if($t0 < 0){
+ $n0 = 0.0;
+ }else{
+ $t0 *= $t0;
+ $n0 = $t0 * $t0 * self::dot3D(self::$grad3[$gi0], $x0, $y0, $z0);
+ }
+
+ $t1 = 0.6 - $x1 * $x1 - $y1 * $y1 - $z1 * $z1;
+ if($t1 < 0){
+ $n1 = 0.0;
+ }else{
+ $t1 *= $t1;
+ $n1 = $t1 * $t1 * self::dot3D(self::$grad3[$gi1], $x1, $y1, $z1);
+ }
+
+ $t2 = 0.6 - $x2 * $x2 - $y2 * $y2 - $z2 * $z2;
+ if($t2 < 0){
+ $n2 = 0.0;
+ }else{
+ $t2 *= $t2;
+ $n2 = $t2 * $t2 * self::dot3D(self::$grad3[$gi2], $x2, $y2, $z2);
+ }
+
+ $t3 = 0.6 - $x3 * $x3 - $y3 * $y3 - $z3 * $z3;
+ if($t3 < 0){
+ $n3 = 0.0;
+ }else{
+ $t3 *= $t3;
+ $n3 = $t3 * $t3 * self::dot3D(self::$grad3[$gi3], $x3, $y3, $z3);
+ }
+
+ // Add contributions from each corner to get the noise value.
+ // The result is scaled to stay just inside [-1,1]
+ return 32.0 * ($n0 + $n1 + $n2 + $n3);
+ }
+
+ public function getNoise2D($x, $y){
+ $x += $this->offsetX;
+ $y += $this->offsetY;
+
+ // Skew the input space to determine which simplex cell we're in
+ $s = ($x + $y) * self::$F2; // Hairy factor for 2D
+ $i = self::floor($x + $s);
+ $j = self::floor($y + $s);
+ $t = ($i + $j) * self::$G2;
+ $X0 = $i - $t; // Unskew the cell origin back to (x,y) space
+ $Y0 = $j - $t;
+ $x0 = $x - $X0; // The x,y distances from the cell origin
+ $y0 = $y - $Y0;
+
+ // For the 2D case, the simplex shape is an equilateral triangle.
+
+ // Determine which simplex we are in.
+ if($x0 > $y0){
+ $i1 = 1;
+ $j1 = 0;
+ }// lower triangle, XY order: (0,0)->(1,0)->(1,1)
+ else{
+ $i1 = 0;
+ $j1 = 1;
+ }// upper triangle, YX order: (0,0)->(0,1)->(1,1)
+
+ // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and
+ // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where
+ // c = (3-sqrt(3))/6
+
+ $x1 = $x0 - $i1 + self::$G2; // Offsets for middle corner in (x,y) unskewed coords
+ $y1 = $y0 - $j1 + self::$G2;
+ $x2 = $x0 + self::$G22; // Offsets for last corner in (x,y) unskewed coords
+ $y2 = $y0 + self::$G22;
+
+ // Work out the hashed gradient indices of the three simplex corners
+ $ii = $i & 255;
+ $jj = $j & 255;
+ $gi0 = $this->perm[$ii + $this->perm[$jj]] % 12;
+ $gi1 = $this->perm[$ii + $i1 + $this->perm[$jj + $j1]] % 12;
+ $gi2 = $this->perm[$ii + 1 + $this->perm[$jj + 1]] % 12;
+
+ // Calculate the contribution from the three corners
+ $t0 = 0.5 - $x0 * $x0 - $y0 * $y0;
+ if($t0 < 0){
+ $n0 = 0.0;
+ }else{
+ $t0 *= $t0;
+ $n0 = $t0 * $t0 * self::dot2D(self::$grad3[$gi0], $x0, $y0); // (x,y) of grad3 used for 2D gradient
+ }
+
+ $t1 = 0.5 - $x1 * $x1 - $y1 * $y1;
+ if($t1 < 0){
+ $n1 = 0.0;
+ }else{
+ $t1 *= $t1;
+ $n1 = $t1 * $t1 * self::dot2D(self::$grad3[$gi1], $x1, $y1);
+ }
+
+ $t2 = 0.5 - $x2 * $x2 - $y2 * $y2;
+ if($t2 < 0){
+ $n2 = 0.0;
+ }else{
+ $t2 *= $t2;
+ $n2 = $t2 * $t2 * self::dot2D(self::$grad3[$gi2], $x2, $y2);
+ }
+
+ // Add contributions from each corner to get the noise value.
+ // The result is scaled to return values in the interval [-1,1].
+ return 70.0 * ($n0 + $n1 + $n2);
+ }
+}
\ No newline at end of file
diff --git a/src/world/generator/noise/OctaveGenerator.php b/src/world/generator/noise/OctaveGenerator.php
new file mode 100644
index 00000000..8424b35d
--- /dev/null
+++ b/src/world/generator/noise/OctaveGenerator.php
@@ -0,0 +1,108 @@
+octaves = $octaves;
+ }
+
+ public function setScale($scale){
+ $this->setXScale($scale);
+ $this->setYScale($scale);
+ $this->setZScale($scale);
+ }
+
+ public function getXScale(){
+ return $this->xScale;
+ }
+
+ public function setXScale($scale){
+ $this->xScale = $scale;
+ }
+
+ public function getYScale(){
+ return $this->yScale;
+ }
+
+ public function setYScale($scale){
+ $this->yScale = $scale;
+ }
+
+ public function getZScale(){
+ return $this->zScale;
+ }
+
+ public function setZScale($scale){
+ $this->zScale = $scale;
+ }
+
+ public function getOctaves(){
+ $array = array();
+ foreach($this->octaves as $index => $value){
+ $array[$index] = clone $value;
+ }
+ return $array;
+ }
+
+ //1D-noise
+ public function noise1D($x, $frequency, $amplitude, $normalized = false){
+ return $this->noise3D($x, 0, 0, $frequency, $amplitude, $normalized);
+ }
+
+ //2D-noise
+ public function noise2D($x, $y, $frequency, $amplitude, $normalized = false){
+ return $this->noise3D($x, $y, 0, $frequency, $amplitude, $normalized);
+ }
+
+ //3D-noise
+ public function noise3D($x, $y, $z, $frequency, $amplitude, $normalized = false){
+ $result = 0;
+ $amp = 1;
+ $freq = 1;
+ $max = 0;
+
+ $x *= $this->xScale;
+ $y *= $this->yScale;
+ $z *= $this->zScale;
+
+ foreach($this->octaves as $octave){
+ $result += $octave->noise($x * $freq, $y * $freq, $z * $freq) * $amp;
+ $max += $amp;
+ $freq *= $frequency;
+ $amp *= $amplitude;
+ }
+ if($normalized === true){
+ $result /= $max;
+ }
+
+ return $result;
+ }
+
+ /*public function generateNoiseOctaves($x, $y, $z, $frequency, $amplitude){
+
+ }*/
+}
\ No newline at end of file
diff --git a/src/world/generator/noise/PerlinOctaveGenerator.php b/src/world/generator/noise/PerlinOctaveGenerator.php
new file mode 100644
index 00000000..474c4a3f
--- /dev/null
+++ b/src/world/generator/noise/PerlinOctaveGenerator.php
@@ -0,0 +1,63 @@
+octaves = array();
+ for($o = 0; $o < $octaves; ++$o){
+ $this->octaves[$o] = new NoiseGeneratorPerlin($random);
+ }
+ }
+
+ /*public function generateNoiseOctaves($x, $y, $z, $sizeX, $sizeY, $sizeZ, $fX, $fY, $fZ){
+ $adouble = array_fill(0, $sizeX * $sizeY * $sizeZ, 0.0);
+
+ $d3 = 1.0;
+
+ foreach($this->octaves as $octave){
+ $dX = $x * $d3 * $fX;
+ $dY = $y * $d3 * $fY;
+ $dZ = $x * $d3 * $fZ;
+
+ $x1 = NoiseGenerator::floor($dX);
+ $z1 = NoiseGenerator::floor($dZ);
+
+ $dX -= $x1;
+ $dZ -= $z1;
+
+ $x1 %= 16777216;
+ $z1 %= 16777216;
+ //$x1 &= 0xFFFFFF;
+ //$z1 &= 0xFFFFFF;
+
+ $dX += $x1;
+ $dZ += $z1;
+ $octave->populateNoiseArray($adouble, $dX, $dY, $dZ, $sizeX, $sizeY, $sizeZ, $fX * $d3, $fY * $d3, $fZ * $d3, $d3);
+ $d3 *= 0.5;
+ }
+
+ return $adouble;
+ }*/
+}
\ No newline at end of file
diff --git a/src/world/generator/populator/TallGrassPopulator.php b/src/world/generator/populator/TallGrassPopulator.php
new file mode 100644
index 00000000..132a94a0
--- /dev/null
+++ b/src/world/generator/populator/TallGrassPopulator.php
@@ -0,0 +1,75 @@
+randomAmount = $amount;
+ }
+
+ public function setBaseAmount($amount){
+ $this->baseAmount = $amount;
+ }
+
+ public function populate(Level $level, $chunkX, $chunkZ, Random $random){
+ $this->level = $level;
+ $amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
+ for($i = 0; $i < $amount; ++$i){
+ $x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15);
+ $z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15);
+ for($size = 30; $size > 0; --$size){
+ $xx = $x - 7 + $random->nextRange(0, 15);
+ $zz = $z - 7 + $random->nextRange(0, 15);
+ $yy = $this->getHighestWorkableBlock($xx, $zz);
+ $vector = new Vector3($xx, $yy, $zz);
+ if($yy !== -1 and $this->canTallGrassStay($this->level->getBlockRaw($vector))){
+ if(mt_rand(1,4) == 1){
+ $this->level->setBlockRaw($vector, new TallGrassBlock(2));
+ }else{
+ $this->level->setBlockRaw($vector, new TallGrassBlock(1));
+ }
+
+ }
+ }
+ }
+ }
+
+ private function canTallGrassStay(Block $block){
+ return $block->getID() === AIR and $block->getSide(0)->getID() === GRASS;
+ }
+
+ private function getHighestWorkableBlock($x, $z){
+ for($y = 128; $y > 0; --$y){
+ $b = $this->level->getBlockRaw(new Vector3($x, $y, $z));
+ if($b->getID() === AIR or $b->getID() === LEAVES){
+ if(--$y <= 0){
+ return -1;
+ }
+ }else{
+ break;
+ }
+ }
+ return ++$y;
+ }
+}
\ No newline at end of file
diff --git a/src/world/generator/populator/TreePopulator.php b/src/world/generator/populator/TreePopulator.php
new file mode 100644
index 00000000..2676f087
--- /dev/null
+++ b/src/world/generator/populator/TreePopulator.php
@@ -0,0 +1,49 @@
+randomAmount = $amount;
+ }
+
+ public function setBaseAmount($amount){
+ $this->baseAmount = $amount;
+ }
+
+ public function populate(Level $level, $chunkX, $chunkZ, Random $random){
+ $this->level = $level;
+ $amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount;
+ for($i = 0; $i < $amount; ++$i){
+ $x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15);
+ $z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15);
+ $y = $this->getHighestWorkableBlock($x, $z);
+ if($y === -1){
+ continue;
+ }
+ if($random->nextFloat() > 0.75){
+ $meta = SaplingBlock::BIRCH;
+ }elseif(($random->nextFloat() < 0.75) and ($random->nextFloat() > 0.25)){
+ $meta = SaplingBlock::OAK;
+ }else{
+ $meta = SaplingBlock::JUNGLE;
+ }
+ TreeObject::growTree($this->level, new Vector3($x, $y, $z), $random, $meta);
+ }
+ }
+
+ private function getHighestWorkableBlock($x, $z){
+ for($y = 128; $y > 0; --$y){
+ $b = $this->level->getBlockRaw(new Vector3($x, $y, $z));
+ if($b->getID() !== DIRT and $b->getID() !== GRASS){
+ if(--$y <= 0){
+ return -1;
+ }
+ }else{
+ break;
+ }
+ }
+ return ++$y;
+ }
+}
\ No newline at end of file