Merge branch 'stable'

.github/workflows/main.yml

@@ -16,17 +16,11 @@ jobs:
         php: [8.0.11]
 
     steps:
-      - uses: actions/checkout@v2 #needed for build.sh
+      - name: Build and prepare PHP cache
-      - name: Check for PHP build cache
+        uses: pmmp/setup-php-action@e232f72a4330a07aae8418e8aa56b64efcdda636
-        id: php-build-cache
-        uses: actions/cache@v2
         with:
-          path: "./bin"
+          php-version: ${{ matrix.php }}
-          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+          install-path: "./bin"
-
-      - name: Compile PHP
-        if: steps.php-build-cache.outputs.cache-hit != 'true'
-        run: ./tests/gh-actions/build.sh "${{ matrix.php }}"
 
   phpstan:
     name: PHPStan analysis
@@ -42,23 +36,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Restore PHP build cache
+      - name: Setup PHP
-        id: php-build-cache
+        uses: pmmp/setup-php-action@e232f72a4330a07aae8418e8aa56b64efcdda636
-        uses: actions/cache@v2
         with:
-          path: "./bin"
+          php-version: ${{ matrix.php }}
-          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+          install-path: "./bin"
-
-      - name: Kill build on PHP build cache miss (should never happen)
-        if: steps.php-build-cache.outputs.cache-hit != 'true'
-        run: exit 1
-
-      - name: Install cached PHP's dependencies
-        if: steps.php-build-cache.outputs.cache-hit == 'true'
-        run: ./tests/gh-actions/install-dependencies.sh
-
-      - name: Prefix PHP to PATH
-        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
 
       - name: Install Composer
         run: curl -sS https://getcomposer.org/installer | php
@@ -92,23 +74,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Restore PHP build cache
+      - name: Setup PHP
-        id: php-build-cache
+        uses: pmmp/setup-php-action@e232f72a4330a07aae8418e8aa56b64efcdda636
-        uses: actions/cache@v2
         with:
-          path: "./bin"
+          php-version: ${{ matrix.php }}
-          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+          install-path: "./bin"
-
-      - name: Kill build on PHP build cache miss (should never happen)
-        if: steps.php-build-cache.outputs.cache-hit != 'true'
-        run: exit 1
-
-      - name: Install cached PHP's dependencies
-        if: steps.php-build-cache.outputs.cache-hit == 'true'
-        run: ./tests/gh-actions/install-dependencies.sh
-
-      - name: Prefix PHP to PATH
-        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
 
       - name: Install Composer
         run: curl -sS https://getcomposer.org/installer | php
@@ -144,23 +114,11 @@ jobs:
         with:
           submodules: true
 
-      - name: Restore PHP build cache
+      - name: Setup PHP
-        id: php-build-cache
+        uses: pmmp/setup-php-action@e232f72a4330a07aae8418e8aa56b64efcdda636
-        uses: actions/cache@v2
         with:
-          path: "./bin"
+          php-version: ${{ matrix.php }}
-          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+          install-path: "./bin"
-
-      - name: Kill build on PHP build cache miss (should never happen)
-        if: steps.php-build-cache.outputs.cache-hit != 'true'
-        run: exit 1
-
-      - name: Install cached PHP's dependencies
-        if: steps.php-build-cache.outputs.cache-hit == 'true'
-        run: ./tests/gh-actions/install-dependencies.sh
-
-      - name: Prefix PHP to PATH
-        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
 
       - name: Install Composer
         run: curl -sS https://getcomposer.org/installer | php
@@ -194,23 +152,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Restore PHP build cache
+      - name: Setup PHP
-        id: php-build-cache
+        uses: pmmp/setup-php-action@e232f72a4330a07aae8418e8aa56b64efcdda636
-        uses: actions/cache@v2
         with:
-          path: "./bin"
+          php-version: ${{ matrix.php }}
-          key: "php-build-generic-${{ matrix.php }}-${{ matrix.image }}-${{ hashFiles('./tests/gh-actions/build.sh') }}"
+          install-path: "./bin"
-
-      - name: Kill build on PHP build cache miss (should never happen)
-        if: steps.php-build-cache.outputs.cache-hit != 'true'
-        run: exit 1
-
-      - name: Install cached PHP's dependencies
-        if: steps.php-build-cache.outputs.cache-hit == 'true'
-        run: ./tests/gh-actions/install-dependencies.sh
-
-      - name: Prefix PHP to PATH
-        run: echo "$(pwd)/bin/php7/bin" >> $GITHUB_PATH
 
       - name: Install Composer
         run: curl -sS https://getcomposer.org/installer | php

resources/pocketmine.yml

@@ -108,7 +108,7 @@ player:
   verify-xuid: true
 
 level-settings:
-  #The default format that levels will use when created
+  #The default format that worlds will use when created
   default-format: leveldb
 
 chunk-sending:
@@ -176,7 +176,7 @@ aliases:
   #savestop: [save-all, stop]
 
 worlds:
-  #These settings will override the generator set in server.properties and allows loading multiple levels
+  #These settings will override the generator set in server.properties and allows loading multiple worlds
   #Example:
   #world:
   # seed: 404

tests/gh-actions/build.sh

@@ -1,62 +0,0 @@
-VERSION="$1"
-
-sudo apt update && sudo apt install -y \
-	re2c \
-	libtool \
-	libtool-bin \
-	zlib1g-dev \
-	libcurl4-openssl-dev \
-	libxml2-dev \
-	libyaml-dev \
-	libgmp-dev \
-	libzip-dev \
-	libssl-dev
-
-INSTALL_DIR="$(pwd)/bin/php7"
-
-export CFLAGS="$CFLAGS -march=x86-64"
-export CXXFLAGS="$CXXFLAGS -march=x86-64"
-
-function build_leveldb {
-	local LEVELDB_VERSION="$1"
-	echo "Building LevelDB"
-	rm -rf "./leveldb-mcpe" || true
-	rm -rf "./leveldb-mcpe-build" || true
-	mkdir "./leveldb-mcpe"
-	curl -fsSL "https://github.com/pmmp/leveldb/archive/$LEVELDB_VERSION.tar.gz" | tar -zx
-	mv "./leveldb-$LEVELDB_VERSION" leveldb-mcpe-build
-	cd leveldb-mcpe-build
-	CFLAGS="-fPIC" CXXFLAGS="-fPIC" cmake . \
-		-DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \
-		-DCMAKE_PREFIX_PATH="$INSTALL_DIR" \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DLEVELDB_BUILD_TESTS=OFF \
-		-DLEVELDB_BUILD_BENCHMARKS=OFF \
-		-DLEVELDB_SNAPPY=OFF \
-		-DLEVELDB_ZSTD=OFF \
-		-DLEVELDB_TCMALLOC=OFF \
-		-DCMAKE_BUILD_TYPE=Release
-	make -j4 install
-	cd ..
-}
-build_leveldb 84348b9b826cc280cde659185695d2170b54824c
-
-rm -rf php-build
-git clone https://github.com/pmmp/php-build.git
-cd php-build
-./install-dependencies.sh
-echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition
-echo '"leveldb",,"https://github.com/pmmp/php-leveldb.git",,"--with-leveldb='$INSTALL_DIR'","extension",' >> share/php-build/extension/definition
-echo '"chunkutils2",,"https://github.com/pmmp/ext-chunkutils2.git",,,"extension",' >> share/php-build/extension/definition
-echo '"morton",,"https://github.com/pmmp/ext-morton.git",,,"extension",' >> share/php-build/extension/definition
-PHP_BUILD_INSTALL_EXTENSION="\
-pthreads=@4.0.0 \
-yaml=2.2.1 \
-leveldb=@60763a09bf5c7a10376d16e25b078b99a35c5c37 \
-chunkutils2=@0.3.1 \
-morton=@0.1.2 \
-igbinary=3.2.1 \
-crypto=0.3.2 \
-" PHP_BUILD_ZTS_ENABLE=on PHP_BUILD_CONFIGURE_OPTS='--with-gmp' ./bin/php-build "$VERSION" "$INSTALL_DIR" || exit 1
-
-rm "$INSTALL_DIR/etc/conf.d/xdebug.ini" || true

tests/gh-actions/install-dependencies.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-sudo apt update && sudo apt install -y \
-	libzip5