Skip to content

Commit

Permalink
Bump to API 3.0.0-ALPHA2 - READ DESCRIPTION!
Browse files Browse the repository at this point in the history 
Refactored level\format\generic\GenericChunk -> level\format\Chunk.
Re-added support for async chunk sending
Refactored most Level IO into new namespaces for more organisation
Removed LevelDB loader completely (will be re-added at a later date)
  • Loading branch information
@dktapps
dktapps committed Jan 6, 2017
1 parent d890867 commit ad0553f
Show file tree
Hide file tree
Showing 23 changed files with 774 additions and 1,931 deletions.
2 changes: 1 addition & 1 deletion src/pocketmine/PocketMine.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function dummy(){
use raklib\RakLib;

const VERSION = "1.6.2dev";
const API_VERSION = "3.0.0-ALPHA1";
const API_VERSION = "3.0.0-ALPHA2";
const CODENAME = "Unleashed";

/*
Expand Down
17 changes: 9 additions & 8 deletions src/pocketmine/Server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@
use pocketmine\item\enchantment\Enchantment;
use pocketmine\item\Item;
use pocketmine\lang\BaseLang;
use pocketmine\level\format\leveldb\LevelDB;
use pocketmine\level\format\LevelProviderManager;
use pocketmine\level\format\region\Anvil;
use pocketmine\level\format\region\McRegion;
use pocketmine\level\format\region\PMAnvil;
use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\format\io\region\Anvil;
use pocketmine\level\format\io\region\McRegion;
use pocketmine\level\format\io\region\PMAnvil;
use pocketmine\level\generator\biome\Biome;
use pocketmine\level\generator\Flat;
use pocketmine\level\generator\Generator;
Expand Down Expand Up @@ -107,6 +106,8 @@
use pocketmine\utils\UUID;
use pocketmine\utils\VersionString;

//use pocketmine\level\format\leveldb\LevelDB;

/**
* The class that manages everything
*/
Expand Down Expand Up @@ -1013,7 +1014,7 @@ public function generateLevel($name, $seed = null, $generator = null, $options =

try{
$path = $this->getDataPath() . "worlds/" . $name . "/";
/** @var \pocketmine\level\format\LevelProvider $provider */
/** @var \pocketmine\level\format\io\LevelProvider $provider */
$provider::generate($path, $name, $seed, $generator, $options);

$level = new Level($this, $name, $path, $provider);
Expand Down Expand Up @@ -1518,10 +1519,10 @@ public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, $
LevelProviderManager::addProvider(Anvil::class);
LevelProviderManager::addProvider(McRegion::class);
LevelProviderManager::addProvider(PMAnvil::class);
if(extension_loaded("leveldb")){
/*if(extension_loaded("leveldb")){
$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
LevelProviderManager::addProvider(LevelDB::class);
}
}*/


Generator::addGenerator(Flat::class, "flat");
Expand Down
8 changes: 2 additions & 6 deletions src/pocketmine/block/ItemFrame.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@
use pocketmine\item\Item;
use pocketmine\level\Level;
use pocketmine\nbt\tag\{
ByteTag,
CompoundTag,
FloatTag,
IntTag,
StringTag
ByteTag, CompoundTag, FloatTag, IntTag, StringTag
};
use pocketmine\Player;
use pocketmine\tile\Tile;
use pocketmine\tile\ItemFrame as TileItemFrame;
use pocketmine\tile\Tile;

class ItemFrame extends Flowable{
protected $id = Block::ITEM_FRAME_BLOCK;
Expand Down
4 changes: 2 additions & 2 deletions src/pocketmine/level/Level.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item;
use pocketmine\level\format\Chunk;
use pocketmine\level\format\generic\BaseLevelProvider;
use pocketmine\level\format\LevelProvider;
use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\LevelProvider;
use pocketmine\level\generator\GenerationTask;
use pocketmine\level\generator\Generator;
use pocketmine\level\generator\GeneratorRegisterTask;
Expand Down
Loading

8 comments on commit ad0553f

@Sandertv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@Magicode1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job!

@dktapps
Copy link
Member Author

@dktapps dktapps commented on ad0553f Jan 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is mostly just refactoring, nothing particularly interesting yet.

@Sandertv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't care about interesting stuff too much, I care about the progress you guys are making.

@markkrueg
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mcpe-1.0 branch with ALPHA2 API is working well. Had up to 60 players simultaneously today. I assume we should not use this yet:

async-chunk-request: false

I tried setting it to true and chests became invisible, enchantment tables lost their books, and all sorts of other voodoo occurred. Everything went back to normal once I set it back to false. I shouldn't be experimenting with settings I don't understand ;-)

Thanks for the countless hours of work you have put into the refactoring/cleanup dktapps. You are legend.

@JackNoordhuis
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dktapps it may only be preparation for what's to come but it's good to see things happening :)

@dktapps
Copy link
Member Author

@dktapps dktapps commented on ad0553f Jan 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markkrueg that was expected, yeah. Not done with it yet.

@Hyphona
Copy link

@Hyphona Hyphona commented on ad0553f Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, thanks : D

Please sign in to comment.