mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 13:49:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'Core-Rewrite' of github.com:PocketMine/PocketMine-MP into Core-Rewrite

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-06-04 17:08:28 +02:00
commit cce9499a61
4 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/build/compile.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
PHP_VERSION="5.5.12"
PHP_VERSION="5.5.13"
ZEND_VM="GOTO"
ZLIB_VERSION="1.2.8"
@ -9,7 +9,7 @@ READLINE_VERSION="6.3"
NCURSES_VERSION="5.9"
PHPNCURSES_VERSION="1.0.2"
PTHREADS_VERSION="2.0.7"
PHP_POCKETMINE_VERSION="0.0.4"
PHP_POCKETMINE_VERSION="0.0.6"
UOPZ_VERSION="2.0.4"
WEAKREF_VERSION="0.2.4"
PHPYAML_VERSION="1.1.1"

24
src/build/jenkins.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -x
export PATH="/opt/arm-2013.05/bin:/opt/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:/opt/arm-unknown-linux-uclibcgnueabi/bin:$PATH"
export THREADS=2
PHP_VERSION="5.5.12"
PHP_VERSION="5.5.13"
#Needed to use aliases
shopt -s expand_aliases
@ -32,7 +32,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/32bit
cd $COMPILEDIR/linux/32bit
$SCRIPT -t linux32 -o -j 2 -c -f x86
$SCRIPT -t linux32 -o -j 2 -c $EXTRA_FLAGS -f x86
tar -czf PHP_${PHP_VERSION}_x86_Linux.tar.gz bin/
cp -r $COMPILEDIR/linux/32bit/{install.log,PHP_${PHP_VERSION}_x86_Linux.tar.gz} $ARCHIVE/linux/32bit/
@ -46,7 +46,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/linux/64bit
cd $COMPILEDIR/linux/64bit
$SCRIPT -t linux64 -o -j 2 -c -f x86_64
$SCRIPT -t linux64 -o -j 2 -c $EXTRA_FLAGS -f x86_64
tar -czf PHP_${PHP_VERSION}_x86-64_Linux.tar.gz bin/
cp -r $COMPILEDIR/linux/64bit/{install.log,PHP_${PHP_VERSION}_x86-64_Linux.tar.gz} $ARCHIVE/linux/64bit/
@ -69,7 +69,7 @@ then
rm -rf libtool-2.4.2
export LIBTOOL="$COMPILEDIR/mac/libtool/bin/libtool"
export LIBTOOLIZE="$COMPILEDIR/mac/libtool/bin/libtoolize"
$SCRIPT -t mac32 -o -j 1 -c -f
$SCRIPT -t mac32 -o -j 1 -c $EXTRA_FLAGS -f
tar -czf PHP_${PHP_VERSION}_x86_MacOS.tar.gz bin/
cp -r $COMPILEDIR/mac32/{install.log,PHP_${PHP_VERSION}_x86_MacOS.tar.gz} $ARCHIVE/mac32/
@ -92,7 +92,7 @@ then
rm -rf libtool-2.4.2
export LIBTOOL="$COMPILEDIR/mac/libtool/bin/libtool"
export LIBTOOLIZE="$COMPILEDIR/mac/libtool/bin/libtoolize"
$SCRIPT -t mac64 -o -j 1 -c -f
$SCRIPT -t mac64 -o -j 1 -c $EXTRA_FLAGS -f
tar -czf PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz bin/
cp -r $COMPILEDIR/mac64/{install.log,PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz} $ARCHIVE/mac64
@ -106,7 +106,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/rpi
cd $COMPILEDIR/rpi
$SCRIPT -t rpi -o -j 1 -c -f arm
$SCRIPT -t rpi -o -j 1 -c $EXTRA_FLAGS -f arm
tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/
cp -r $COMPILEDIR/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz} $ARCHIVE/rpi/
@ -120,7 +120,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv6
cd $COMPILEDIR/crosscompile/android-armv6
$SCRIPT -t android-armv6 -o -j 1 -c -x -s -f arm
$SCRIPT -t android-armv6 -o -j 1 -c -x -s $EXTRA_FLAGS -f arm
tar -czf PHP_${PHP_VERSION}_ARMv6_Android.tar.gz bin/
cp -r $COMPILEDIR/crosscompile/android-armv6/{install.log,PHP_${PHP_VERSION}_ARMv6_Android.tar.gz} $ARCHIVE/crosscompile/android-armv6/
@ -134,7 +134,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv7
cd $COMPILEDIR/crosscompile/android-armv7
$SCRIPT -t android-armv7 -o -j 1 -c -x -s -f arm
$SCRIPT -t android-armv7 -o -j 1 -c -x -s $EXTRA_FLAGS -f arm
tar -czf PHP_${PHP_VERSION}_ARMv7_Android.tar.gz bin/
cp -r $COMPILEDIR/crosscompile/android-armv7/{install.log,PHP_${PHP_VERSION}_ARMv7_Android.tar.gz} $ARCHIVE/crosscompile/android-armv7/
@ -156,7 +156,7 @@ then
rm -rf libtool-2.4.2
export LIBTOOL="$COMPILEDIR/crosscompile/ios-armv6/libtool/bin/libtool"
export LIBTOOLIZE="$COMPILEDIR/crosscompile/ios-armv6/libtool/bin/libtoolize"
PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x -f arm
PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x $EXTRA_FLAGS -f arm
cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*} $ARCHIVE/crosscompile/ios-armv6/
if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then
@ -177,7 +177,7 @@ then
rm -rf libtool-2.4.2
export LIBTOOL="$COMPILEDIR/crosscompile/ios-armv7/libtool/bin/libtool"
export LIBTOOLIZE="$COMPILEDIR/crosscompile/ios-armv7/libtool/bin/libtoolize"
PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x -f arm
PATH="/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:$PATH" $SCRIPT -t ios-armv6 -o -j 1 -c -x $EXTRA_FLAGS -f arm
cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*} $ARCHIVE/crosscompile/ios-armv7/
if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then
@ -190,7 +190,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi
cd $COMPILEDIR/crosscompile/rpi
$SCRIPT -t rpi -o -j 1 -c -x -f arm
$SCRIPT -t rpi -o -j 1 -c -x $EXTRA_FLAGS -f arm
tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/
cp -r $COMPILEDIR/crosscompile/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz} $ARCHIVE/crosscompile/rpi/
@ -204,7 +204,7 @@ then
mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/mac
cd $COMPILEDIR/crosscompile/mac
$SCRIPT -t mac -o -j 1 -c -f -x
$SCRIPT -t mac -o -j 1 -c $EXTRA_FLAGS -f -x
cp -r $COMPILEDIR/crosscompile/mac/{install.log,bin/*} $ARCHIVE/crosscompile/mac/
if [ ! -f $COMPILEDIR/crosscompile/mac/bin/php5/bin/php ]; then

23
src/pocketmine/PocketMine.php
View File

@ -315,31 +315,12 @@ namespace pocketmine {
$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
}
include_once("../RakLib/raklib/RakLib.php");
\raklib\RakLib::bootstrap($autoloader);
$server = new \raklib\server\RakLibServer($logger, $autoloader, 19132, "192.168.1.1");
$socket = $server->getExternalSocket();
while(true){
if(($len = @socket_read($socket, 4)) !== ""){
$packet = socket_read($socket, Binary::readInt($len));
$id = ord($packet{0});
if($id === \raklib\RakLib::PACKET_ENCAPSULATED){
$len = ord($packet{1});
$identifier = substr($packet, 2, $len);
$buffer = substr($packet, 2 + $len);
$pk = \raklib\protocol\EncapsulatedPacket::fromBinary($buffer);
var_dump($pk);
}
}
usleep(1000);
}
/*$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
$server->start();
$logger->shutdown();
$logger->join();
kill(getmypid());
exit(0);*/
exit(0);
}

7
src/pocketmine/Server.php
View File

@ -84,7 +84,6 @@ use pocketmine\tile\Sign;
use pocketmine\tile\Tile;
use pocketmine\utils\Binary;
use pocketmine\utils\Config;
use pocketmine\utils\Logger;
use pocketmine\utils\MainLogger;
use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils;
@ -124,7 +123,7 @@ class Server{
/** @var TickScheduler */
private $tickScheduler = null;
/** @var \pocketmine\utils\Logger */
/** @var \Logger */
private $logger;
/** @var CommandReader */
@ -1187,12 +1186,12 @@ class Server{
/**
* @param \SplClassLoader $autoloader
* @param Logger $logger
* @param \Logger $logger
* @param string $filePath
* @param string $dataPath
* @param string $pluginPath
*/
public function __construct(\SplClassLoader $autoloader, Logger $logger, $filePath, $dataPath, $pluginPath){
public function __construct(\SplClassLoader $autoloader, \Logger $logger, $filePath, $dataPath, $pluginPath){
self::$instance = $this;
$this->autoloader = $autoloader;