Get rid of virions

NetherGamesMC · Mar 27, 2024 · f016b39 · f016b39
1 parent 0e5067d
commit f016b39
Show file tree

Hide file tree

Showing 5 changed files with 1,345 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,24 +11,17 @@ jobs:
     steps:
       - name: Startup
         uses: actions/checkout@v3
-      - name: Checkout PharBuilder
-        uses: actions/checkout@v3
-        with:
-          repository: NetherGamesMC/PharBuilder
-          token: ${{ secrets.ng_token }}
-          path: PharBuilder
-          ref: pm5
       - name: Download PHP Release
-        uses: dsaltares/fetch-gh-release-asset@1.1.0
+        uses: dsaltares/fetch-gh-release-asset@1.1.1
         with:
-          file: Linux.zip
+          file: PHP-Linux-x86_64-PM5.tar.gz
           repo: NetherGamesMC/php-build-scripts
-          version: "tags/8.2-pm5"
+          version: "tags/php-8.3-latest"
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Unpack PHP Release
-        run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz
+        run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz
       - name: Download pharbuilder-rs
-        uses: dsaltares/fetch-gh-release-asset@1.1.0
+        uses: dsaltares/fetch-gh-release-asset@1.1.1
         with:
           file: pharbuilder
           repo: NetherGamesMC/pharbuilder-rs
@@ -37,12 +30,10 @@ jobs:
         run: |
           echo Building...
           chmod +x pharbuilder
-          ./pharbuilder -i . -o PharBuilder/BlockLagFix.phar
-          echo Injecting Virions...
-          ./bin/php7/bin/php -dphar.readonly=0 PharBuilder/SimplePacketHandler.phar PharBuilder/BlockLagFix.phar
+          ./pharbuilder -i . -o ./BlockLagFix.phar
           echo Build completed!
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
           name: BlockLagFix
-          path: PharBuilder/BlockLagFix.phar
+          path: BlockLagFix.phar
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -12,21 +12,14 @@ jobs:
       - name: Startup
         uses: actions/checkout@v3
       - name: Download PHP Release
-        uses: dsaltares/fetch-gh-release-asset@1.1.0
+        uses: dsaltares/fetch-gh-release-asset@1.1.1
         with:
-          file: Linux.zip
+          file: PHP-Linux-x86_64-PM5.tar.gz
           repo: NetherGamesMC/php-build-scripts
-          version: "tags/8.2-pm5"
+          version: "tags/php-8.3-latest"
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Unpack PHP Release
-        run: unzip Linux.zip && tar -xzvf PHP_Linux-x86_64.tar.gz
-      - name: Checkout PharBuilder
-        uses: actions/checkout@v3
-        with:
-          repository: NetherGamesMC/PharBuilder
-          token: ${{ secrets.ng_token }}
-          path: PharBuilder
-          ref: pm5
+        run: tar -xzvf PHP-Linux-x86_64-PM5.tar.gz
       - name: Download Composer
         run: curl -o composer.phar "https://getcomposer.org/composer-stable.phar"
       - name: Add Composer GitHub access token

diff --git a/composer.json b/composer.json
@@ -7,16 +7,26 @@
   "require-dev": {
     "phpstan/phpstan": "^1.2.0",
     "phpstan/phpstan-strict-rules": "^1.0",
-    "phpstan/extension-installer": "^1.0"
+    "phpstan/extension-installer": "^1.0",
+    "nethergamesmc/pocketmine-mp": "dev-stable"
   },
   "autoload": {
     "psr-0": {
       "JavierLeon9966\\BlockLagFix\\": "src"
     }
   },
+  "replace": {
+    "pocketmine/pocketmine-mp": "*"
+  },
+  "repositories": [
+    { "type": "vcs", "url": "git@github.com:NetherGamesMC/PocketMine-MP.git" }
+  ],
   "config": {
     "allow-plugins": {
       "phpstan/extension-installer": true
     }
+  },
+  "require": {
+    "muqsit/simple-packet-handler": "dev-pm5"
   }
 }