diff --git a/composer.json b/composer.json
index 5fc01e8d7..db5bacac7 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
       "pocketmine/snooze": "^0.1.0",
       "pocketmine/classloader": "^0.1.0",
       "pocketmine/log": "^0.1.0",
-      "daverandom/callback-validator": "dev-master",
+      "pocketmine/callback-validator": "^1.0.1",
       "adhocore/json-comment": "^0.1.0"
    },
    "require-dev": {
diff --git a/composer.lock b/composer.lock
index bf6afac4c..e436655f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0a965a0cd39d5b3dd7b0ee1f0abe009b",
+    "content-hash": "6dfad217828972922e86594a573c6c75",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -50,46 +50,6 @@
             ],
             "time": "2020-01-03T13:51:23+00:00"
         },
-        {
-            "name": "daverandom/callback-validator",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/DaveRandom/CallbackValidator.git",
-                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/DaveRandom/CallbackValidator/zipball/d87a08cddbc6099816ed01e50ce25cdfc43b542f",
-                "reference": "d87a08cddbc6099816ed01e50ce25cdfc43b542f",
-                "shasum": ""
-            },
-            "require": {
-                "ext-reflection": "*",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DaveRandom\\CallbackValidator\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Wright",
-                    "email": "cw@daverandom.com"
-                }
-            ],
-            "description": "Tools for validating callback signatures",
-            "time": "2017-04-03T15:22:41+00:00"
-        },
         {
             "name": "pocketmine/binaryutils",
             "version": "0.1.11",
@@ -124,6 +84,49 @@
             "description": "Classes and methods for conveniently handling binary data",
             "time": "2020-01-28T12:09:56+00:00"
         },
+        {
+            "name": "pocketmine/callback-validator",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/CallbackValidator.git",
+                "reference": "4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/CallbackValidator/zipball/4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a",
+                "reference": "4aef6bb25f97d0b830ba0b4f66834b1a9c86fc9a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-reflection": "*",
+                "php": ">=7.1"
+            },
+            "replace": {
+                "daverandom/callback-validator": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DaveRandom\\CallbackValidator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Wright",
+                    "email": "cw@daverandom.com"
+                }
+            ],
+            "description": "Fork of daverandom/callback-validator - Tools for validating callback signatures",
+            "time": "2020-03-17T12:04:22+00:00"
+        },
         {
             "name": "pocketmine/classloader",
             "version": "0.1.0",
@@ -471,6 +474,20 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpstan",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-03-16T15:27:38+00:00"
         },
         {
@@ -583,9 +600,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "daverandom/callback-validator": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -609,5 +624,6 @@
         "ext-zip": "*",
         "ext-zlib": ">=1.2.11"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }