From b712c4b7a9b30d93dbbeaf015ae46ad12e7893c2 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Thu, 17 Aug 2023 15:17:49 +0300 Subject: [PATCH] bad --- src/constants/BlockIDs.php | 1 + src/material/block/plant/SaplingBlock.php | 8 +- src/utils/Direction.php | 10 ++ src/utils/MersenneTwister.php | 131 ++++---------- src/utils/Random.php | 5 +- src/world/Level.php | 14 ++ .../object/tree/AcaciaTreeObject.php | 170 ++++++++++++++++++ .../object/tree/FallenTreeObject.php | 2 + .../generator/object/tree/SmallTreeObject.php | 2 +- .../generator/object/tree/TreeObject.php | 14 +- 10 files changed, 257 insertions(+), 100 deletions(-) create mode 100644 src/utils/Direction.php diff --git a/src/constants/BlockIDs.php b/src/constants/BlockIDs.php index 619e2ec1..8b8c4797 100755 --- a/src/constants/BlockIDs.php +++ b/src/constants/BlockIDs.php @@ -233,6 +233,7 @@ define("LEAVES2", 161); define("ACACIA_LEAVES", 161); define("DARK_OAK_LEAVES", "161:1"); define("LOG2", 162); +define("TRUNK2", 162); define("ACACIA_WOOD", "162:0"); define("DARK_OAK_WOOD", "162:1"); define("ACACIA_WOOD_STAIRS", 163); diff --git a/src/material/block/plant/SaplingBlock.php b/src/material/block/plant/SaplingBlock.php index a30f42ea..ed4319aa 100644 --- a/src/material/block/plant/SaplingBlock.php +++ b/src/material/block/plant/SaplingBlock.php @@ -20,7 +20,7 @@ class SaplingBlock extends FlowableBlock{ 4 => "Acacia Sapling", 5 => "Dark Oak Sapling", ); - $this->name = $names[$this->meta & 0x05]; + $this->name = $names[$this->meta & 0x07]; $this->hardness = 0; } @@ -36,7 +36,7 @@ class SaplingBlock extends FlowableBlock{ public function onActivate(Item $item, Player $player){ if($item->getID() === DYE and $item->getMetadata() === 0x0F){ //Bonemeal - TreeObject::growTree($this->level, $this, new Random(), $this->meta & 0x03); + TreeObject::growTree($this->level, $this, new Random(), $this->meta); if(($player->gamemode & 0x01) === 0){ $player->removeItem(DYE, 0x0F, 1); } @@ -54,7 +54,7 @@ class SaplingBlock extends FlowableBlock{ }elseif($type === BLOCK_UPDATE_RANDOM){ //Growth if(mt_rand(1, 7) === 1){ if(($this->meta & 0x08) === 0x08){ - TreeObject::growTree($this->level, $this, new Random(), $this->meta & 0x03); + TreeObject::growTree($this->level, $this, new Random(), $this->meta & 0x07); }else{ $this->meta |= 0x08; $this->level->setBlock($this, $this, true, false, true); @@ -69,7 +69,7 @@ class SaplingBlock extends FlowableBlock{ public function getDrops(Item $item, Player $player){ return array( - array($this->id, $this->meta & 0x05, 1), + array($this->id, $this->meta & 0x07, 1), ); } } \ No newline at end of file diff --git a/src/utils/Direction.php b/src/utils/Direction.php new file mode 100644 index 00000000..3029d450 --- /dev/null +++ b/src/utils/Direction.php @@ -0,0 +1,10 @@ +bits32 = PHP_INT_MAX == 2147483647; @@ -59,75 +62,12 @@ class MersenneTwister extends Random{ } } - /**RANDOM IMPL START**/ - - public function setSeed($seed = false){ - $this->init_with_integer($seed === false ? Utils::getRandomBytes(4, false) : $seed); - } - - public function nextGaussian(){ - if($this->haveNextNextGaussian){ - $this->haveNextNextGaussian = false; - return $this->nextNextGaussian; - }else{ - $v1 = $v2 = $s = null; - do{ - $v1 = 2 * $this->nextFloat() - 1; // between -1.0 and 1.0 - $v2 = 2 * $this->nextFloat() - 1; // between -1.0 and 1.0 - $s = $v1 * $v1 + $v2 * $v2; - }while($s >= 1 || $s == 0); - $multiplier = sqrt(-2 * log($s) / $s); - $this->nextNextGaussian = $v2 * $multiplier; - $this->haveNextNextGaussian = true; - return $v1 * $multiplier; - } - } - - function nextInt(){ - return ($this->int32() >> 1); - } - - function nextFloat(){ - return $this->int32() * 2.3283064365386963E-010; - } - - function nextBytes($byteCount){ - return 0; //idc, not implemented - } - - function nextSignedFloat(){ - return $this->nextFloat(); //idc, not implemented - } - function nextSignedInt(){ //TODO - return $this->int31(); - } - - public function nextBoolean(){ - return 0; //idc not implemented - } - - public function nextRange($start = 0, $end = PHP_INT_MAX){ - return $end === 0 ? 0 : (($this->int32() + $start) % $end); - } - /**RANDOM IMPL END**/ - function init_with_integer($integer_seed){ $integer_seed = force_32_bit_int($integer_seed); - - $mt = &$this->mt; - $mti = &$this->mti; - - $mt = array_fill(0, N, 0); - - $mt[0] = $integer_seed; - - for($mti = 1; $mti < N; $mti++){ - $mt[$mti] = add_2(mul(1812433253, - ($mt[$mti - 1] ^ (($mt[$mti - 1] >> 30) & 3))), $mti); - /* - mt[mti] = - (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti); - */ + $this->mt = array_fill(0, N, 0); + $this->mt[0] = $integer_seed; + for($this->mti = 1; $this->mti < N; ++$this->mti){ + $this->mt[$this->mti] = add_2(mul(1812433253, ($this->mt[$this->mti - 1] ^ (($this->mt[$this->mti - 1] >> 30) & 3))), $this->mti); } } @@ -179,7 +119,6 @@ class MersenneTwister extends Random{ array_map("force_32_bit_int", $integer_array); $mt = &$this->mt; - $mti = &$this->mti; $key_length = count($integer_array); @@ -227,28 +166,22 @@ class MersenneTwister extends Random{ } function int32(){ - static $mag01 = [0, MATRIX_A]; - - $mt = &$this->mt; - $mti = &$this->mti; - - if($mti >= N){ /* generate N words all at once */ - for($kk = 0; $kk < N - M; $kk++){ - $y = ($mt[$kk] & UPPER_MASK) | ($mt[$kk + 1] & LOWER_MASK); - $mt[$kk] = $mt[$kk + M] ^ (($y >> 1) & MASK31) ^ $mag01[$y & 1]; + if($this->mti >= N){ /* generate N words all at once */ + for($kk = 0; $kk < N - M; ++$kk){ + $y = ($this->mt[$kk] & UPPER_MASK) | ($this->mt[$kk + 1] & LOWER_MASK); + $this->mt[$kk] = $this->mt[$kk + M] ^ (($y >> 1) & MASK31) ^ self::$MAG_01[$y & 1]; } - for(; $kk < N - 1; $kk++){ - $y = ($mt[$kk] & UPPER_MASK) | ($mt[$kk + 1] & LOWER_MASK); - $mt[$kk] = - $mt[$kk + (M - N)] ^ (($y >> 1) & MASK31) ^ $mag01[$y & 1]; + for(; $kk < N - 1; ++$kk){ + $y = ($this->mt[$kk] & UPPER_MASK) | ($this->mt[$kk + 1] & LOWER_MASK); + $this->mt[$kk] = $this->mt[$kk + (M - N)] ^ (($y >> 1) & MASK31) ^ self::$MAG_01[$y & 1]; } - $y = ($mt[N - 1] & UPPER_MASK) | ($mt[0] & LOWER_MASK); - $mt[N - 1] = $mt[M - 1] ^ (($y >> 1) & MASK31) ^ $mag01[$y & 1]; + $y = ($this->mt[N - 1] & UPPER_MASK) | ($this->mt[0] & LOWER_MASK); + $this->mt[N - 1] = $this->mt[M - 1] ^ (($y >> 1) & MASK31) ^ self::$MAG_01[$y & 1]; - $mti = 0; + $this->mti = 0; } - $y = $mt[$mti++]; + $y = $this->mt[$this->mti++]; /* Tempering */ $y ^= ($y >> 11) & MASK21; @@ -256,7 +189,7 @@ class MersenneTwister extends Random{ $y ^= ($y << 15) & (0xefc6 << 16); $y ^= ($y >> 18) & MASK14; - return $y; + return $y & 0xFFFFFFFF; } /* generates a random number on [0,1]-real-interval */ @@ -386,6 +319,20 @@ class MersenneTwister extends Random{ ($this->int32() & MASK26)) * (1.0 / 9007199254740992.0); } + function nextIntBndn($bound){ + return ($this->int32() % $bound); + } + function nextInt($bound = null){ + return $bound == null ? ($this->int32() >> 1) : ($this->int32() % $bound); + } + + function nextFloat(){ + return $this->int32() * 2.32830644e-10; + } + + function setSeed($seed){ + $this->init_with_integer($seed); + } } diff --git a/src/utils/Random.php b/src/utils/Random.php index 567a92d3..510b1bbd 100644 --- a/src/utils/Random.php +++ b/src/utils/Random.php @@ -50,7 +50,10 @@ class Random{ return $this->nextInt() / 0x7FFFFFFF; } - public function nextInt(){ + public function nextInt($n = -1){ + if($n > 0){ + return Utils::readInt($this->nextBytes(4)) & 0x7FFFFFFF % $n; + } return Utils::readInt($this->nextBytes(4)) & 0x7FFFFFFF; } diff --git a/src/world/Level.php b/src/world/Level.php index 3094113f..93f25172 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -84,6 +84,20 @@ class Level{ return $aABBs; } + public function fastSetBlockUpdate($x, $y, $z, $id, $meta, $updateBlocksAround = false){ + $this->level->setBlock($x, $y, $z, $id, $meta); + $pk = new UpdateBlockPacket; + $pk->x = $x; + $pk->y = $y; + $pk->z = $z; + $pk->block = $id; + $pk->meta = $meta; + $this->server->api->player->broadcastPacket($this->players, $pk); + if($updateBlocksAround){ + $this->server->api->block->blockUpdateAround(new Position($x, $y, $z, $this), BLOCK_UPDATE_NORMAL, 1); + } + } + public function __destruct(){ if(isset($this->level)){ $this->save(false, false); diff --git a/src/world/generator/object/tree/AcaciaTreeObject.php b/src/world/generator/object/tree/AcaciaTreeObject.php index e69de29b..728a7442 100644 --- a/src/world/generator/object/tree/AcaciaTreeObject.php +++ b/src/world/generator/object/tree/AcaciaTreeObject.php @@ -0,0 +1,170 @@ +level->getBlockID($x, $y, $z); + if($id == AIR || $id == LEAVES || $id == LEAVES2){ + $level->fastSetBlockUpdate($x, $y, $z, LEAVES2, 0); + } + } + + public function placeObject(Level $level, Vector3 $pos, Random $random){ //World p_76484_1_, Random $random, int $pos->x, int $pos->y, int $pos->z + $var6 = $this->height; + $var21 = $level->level->getBlockID($pos->x, $pos->y - 1, $pos->z); + + if (($var21 == GRASS || $var21 == DIRT) && $pos->y < 128 - $var6 - 1) + { + $level->fastSetBlockUpdate($pos->x, $pos->y - 1, $pos->z, DIRT, 0); + $var22 = $random->nextInt(4); + $var10 = $var6 - $random->nextInt(4) - 1; + $var11 = 3 - $random->nextInt(3); + $var23 = (int)$pos->x; + $var13 = (int)$pos->z; + $var14 = (int)0; + //int var15; + //int var16; + + for ($var15 = 0; $var15 < $var6; ++$var15) + { + $var16 = (int)($pos->y + $var15); + + if ($var15 >= $var10 && $var11 > 0) + { + $var23 += Direction::offsetX[$var22]; + $var13 += Direction::offsetZ[$var22]; + --$var11; + } + + $var17 = $level->level->getBlockID($var23, $var16, $var13); + + if ($var17 == AIR || $var17 == LEAVES || $var17 == LEAVES2) + { + $level->fastSetBlockUpdate($var23, $var16, $var13, TRUNK2, 0); + $var14 = $var16; + } + } + + for ($var15 = -1; $var15 <= 1; ++$var15) + { + for ($var16 = -1; $var16 <= 1; ++$var16) + { + $this->setBlockWithSomeAdditionalConditions($level, $var23 + $var15, $var14 + 1, $var13 + $var16); + } + } + + $this->setBlockWithSomeAdditionalConditions($level, $var23 + 2, $var14 + 1, $var13); + $this->setBlockWithSomeAdditionalConditions($level, $var23 - 2, $var14 + 1, $var13); + $this->setBlockWithSomeAdditionalConditions($level, $var23, $var14 + 1, $var13 + 2); + $this->setBlockWithSomeAdditionalConditions($level, $var23, $var14 + 1, $var13 - 2); + + for ($var15 = -3; $var15 <= 3; ++$var15) + { + for ($var16 = -3; $var16 <= 3; ++$var16) + { + if (abs($var15) != 3 || abs($var16) != 3) + { + $this->setBlockWithSomeAdditionalConditions($level, $var23 + $var15, $var14, $var13 + $var16); + } + } + } + + $var23 = $pos->x; + $var13 = $pos->z; + $var15 = $random->nextInt(4); + + if ($var15 != $var22) + { + $var16 = $var10 - $random->nextInt(2) - 1; + $var24 = 1 + $random->nextInt(3); + $var14 = 0; + //int var18; + //int var19; + + for ($var18 = $var16; $var18 < $var6 && $var24 > 0; --$var24) + { + if ($var18 >= 1) + { + $var19 = $pos->y + $var18; + $var23 += Direction::offsetX[$var15]; + $var13 += Direction::offsetZ[$var15]; + $var20 = $level->level->getBlockID($var23, $var19, $var13); + + if ($var20 == AIR || $var20 == LEAVES || $var20 == LEAVES2) + { + $level->fastSetBlockUpdate($var23, $var19, $var13, TRUNK2, 0); + $var14 = $var19; + } + } + + ++$var18; + } + + if ($var14 > 0) + { + for ($var18 = -1; $var18 <= 1; ++$var18) + { + for ($var19 = -1; $var19 <= 1; ++$var19) + { + $this->setBlockWithSomeAdditionalConditions($level, $var23 + $var18, $var14 + 1, $var13 + $var19); + } + } + + for ($var18 = -2; $var18 <= 2; ++$var18) + { + for ($var19 = -2; $var19 <= 2; ++$var19) + { + if (abs($var18) != 2 || abs($var19) != 2) + { + $this->setBlockWithSomeAdditionalConditions($level, $var23 + $var18, $var14, $var13 + $var19); + } + } + } + } + } + + return true; + } + } + + public function canPlaceObject(Level $level, Vector3 $pos, Random $random) + { + $var6 = $this->height = ($random->nextInt(3) + $random->nextInt(3) + 5); + $var7 = true; + + if ($pos->y >= 1 && $pos->y + $var6 + 1 <= 128) { + for ($var8 = $pos->y; $var8 <= $pos->y + 1 + $var6; ++$var8) { + $var9 = 1; + + if ($var8 == $pos->y) { + $var9 = 0; + } + + if ($var8 >= $pos->y + 1 + $var6 - 2) { + $var9 = 2; + } + + for ($var10 = (int)($pos->x - $var9); $var10 <= $pos->x + $var9 && $var7; ++$var10) { + for ($var11 = (int)($pos->z - $var9); $var11 <= $pos->z + $var9 && $var7; ++$var11) { + if ($var8 >= 0 && $var8 < 128) { + $var12 = $level->level->getBlockID($var10, $var8, $var11); + + if (! $this->isBlockCorrect($var12)) { + return false; + } + } else { + return false; + } + } + } + } + return true; + } + return false; + } +} \ No newline at end of file diff --git a/src/world/generator/object/tree/FallenTreeObject.php b/src/world/generator/object/tree/FallenTreeObject.php index e69de29b..fbb2ae57 100644 --- a/src/world/generator/object/tree/FallenTreeObject.php +++ b/src/world/generator/object/tree/FallenTreeObject.php @@ -0,0 +1,2 @@ + true, 18 => true, ]; - + public function isBlockCorrect(int $id) + { + return $id == 0 || ($id == LEAVES || $id == LEAVES2) || $id == GRASS || $id == DIRT || $id == TRUNK || $id == TRUNK2 || $id == SAPLING || $id == VINES; + } public static function growTree(Level $level, Vector3 $pos, Random $random, $type = 0){ - switch($type & 0x03){ + switch($type & 0xf){ case SaplingBlock::SPRUCE: if($random->nextRange(0, 1) === 1){ $tree = new SpruceTreeObject(); @@ -24,6 +27,13 @@ class TreeObject{ case SaplingBlock::JUNGLE: $tree = new SmallTreeObject(); $tree->type = SaplingBlock::JUNGLE; + break; + case SaplingBlock::ACACIA: + console("acacia"); + $tree = new AcaciaTreeObject(); + break; + case SaplingBlock::DARK_OAK: + break; default: case SaplingBlock::OAK: