diff --git a/.poggit.yml b/.poggit.yml index 207cc68..6b9ec73 100644 --- a/.poggit.yml +++ b/.poggit.yml @@ -7,13 +7,13 @@ projects: path: "" libs: - src: Hebbinkpro/pmmp-webserver/pmmp-webserver - version: 0.4.2 + version: 0.5.3 - src: HimbeersaftLP/LibSkin/LibSkin - version: 2.0.1 + version: 2.1.1 - src: Paroxity/Commando/Commando - version: 3.1.0 + version: 3.3.0 - src: Muqsit/SimplePacketHandler/SimplePacketHandler - version: 0.1.3 + version: 0.1.5 lint: phpstan: false ... diff --git a/composer.json b/composer.json index 042f1c4..fc5b6c5 100644 --- a/composer.json +++ b/composer.json @@ -9,14 +9,14 @@ } ], "require": { - "hebbinkpro/pmmp-webserver": "^0.4.2", - "muqsit/simple-packet-handler": "dev-pm5" + "hebbinkpro/pmmp-webserver": "^0.5.3", + "muqsit/simple-packet-handler": "0.1.5" }, "require-dev": { "php": "^8.1", "pocketmine/pocketmine-mp": "^5.13.0", - "himbeer/libskin": "^2.0.1", - "paroxity/commando": "^3.1.0", + "himbeer/libskin": "^2.1.1", + "paroxity/commando": "^3.3.0", "phpstan/phpstan": "^1.10.3", "phpstan/phpstan-strict-rules": "^1.5.0", "phpstan/extension-installer": "^1.2.0" @@ -27,23 +27,11 @@ } }, "repositories": { - "libskin": { - "type": "package", - "package": { - "name": "himbeer/libskin", - "version": "2.0.1", - "source": { - "url": "https://github.com/HimbeersaftLP/LibSkin.git", - "type": "git", - "reference": "master" - } - } - }, "commando": { "type": "package", "package": { "name": "paroxity/commando", - "version": "3.1.0", + "version": "3.3.0", "source": { "url": "https://github.com/Paroxity/Commando.git", "type": "git", diff --git a/plugin.yml b/plugin.yml index dff92f8..fb22667 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,7 +1,7 @@ name: PocketMap main: Hebbinkpro\PocketMap\PocketMap -version: 0.6.2 -api: [ 5.20.0 ] +version: 0.6.3 +api: [ 5.36.0 ] load: STARTUP author: Hebbinkpro description: A dynamic world map for PocketMine-MP diff --git a/resources/resource_packs/README.md b/resources/resource_packs/README.md index 54e7b85..780f064 100644 --- a/resources/resource_packs/README.md +++ b/resources/resource_packs/README.md @@ -9,7 +9,7 @@ the [official bedrock-samples repository](https://github.com/Mojang/bedrock-samp ### Latest Version -**v1.21.60** +**v1.21.124** ## Custom Resource Packs - _Not Supported_ diff --git a/resources/resource_packs/v1.21.60.zip b/resources/resource_packs/v1.21.124.zip similarity index 58% rename from resources/resource_packs/v1.21.60.zip rename to resources/resource_packs/v1.21.124.zip index ed40322..6d353d5 100644 Binary files a/resources/resource_packs/v1.21.60.zip and b/resources/resource_packs/v1.21.124.zip differ diff --git a/src/Hebbinkpro/PocketMap/PocketMap.php b/src/Hebbinkpro/PocketMap/PocketMap.php index aedbf90..bb7bc06 100644 --- a/src/Hebbinkpro/PocketMap/PocketMap.php +++ b/src/Hebbinkpro/PocketMap/PocketMap.php @@ -57,7 +57,7 @@ class PocketMap extends PluginBase implements Listener public const CONFIG_VERSION = 1.7; public const WEB_VERSION = 1.2; - public const RESOURCE_PACK_NAME = "v1.21.60"; + public const RESOURCE_PACK_NAME = "v1.21.124"; public const TEXTURE_SIZE = 16; public const IGNORED_TEXTURES = [ @@ -425,7 +425,8 @@ private function createWebServer(): void } // create the web server - $serverInfo = new HttpServerInfo($webSettings->getString("address", "127.0.0.1"), $webSettings->getInt("port", 3000)); + $port = max(0, min(65535, $webSettings->getInt("port", 3000))); + $serverInfo = new HttpServerInfo($webSettings->getString("address", "127.0.0.1"), $port); $router = $serverInfo->getRouter(); diff --git a/src/Hebbinkpro/PocketMap/textures/model/BlockModels.php b/src/Hebbinkpro/PocketMap/textures/model/BlockModels.php index 6a725fa..c8087e5 100644 --- a/src/Hebbinkpro/PocketMap/textures/model/BlockModels.php +++ b/src/Hebbinkpro/PocketMap/textures/model/BlockModels.php @@ -22,6 +22,7 @@ use Hebbinkpro\PocketMap\utils\block\BlockUtils; use pocketmine\block\Block; use pocketmine\block\Button; +use pocketmine\block\Chain; use pocketmine\block\Crops; use pocketmine\block\Door; use pocketmine\block\DoublePlant; @@ -88,7 +89,7 @@ private function registerAll(): void $this->register(VanillaBlocks::CAVE_VINES(), new CrossModel()); $this->register(VanillaBlocks::FIRE(), new CrossModel()); $this->register(VanillaBlocks::SOUL_FIRE(), new CrossModel()); - $this->register(VanillaBlocks::CHAIN(), new CrossModel()); + $this->registerFromBlockType(Chain::class, new CrossModel());; $this->register(VanillaBlocks::BIG_DRIPLEAF_STEM(), new CrossModel()); $this->register(VanillaBlocks::BREWING_STAND(), new CrossModel()); $this->register(VanillaBlocks::COBWEB(), new CrossModel()); diff --git a/src/Hebbinkpro/PocketMap/utils/block/OldBlockTypeNames.php b/src/Hebbinkpro/PocketMap/utils/block/OldBlockTypeNames.php index d3ebd20..e318d5e 100644 --- a/src/Hebbinkpro/PocketMap/utils/block/OldBlockTypeNames.php +++ b/src/Hebbinkpro/PocketMap/utils/block/OldBlockTypeNames.php @@ -33,6 +33,8 @@ final class OldBlockTypeNames public const DOUBLE_WOODEN_SLAB = "minecraft:double_wooden_slab"; public const GRASS = "minecraft:grass"; + public const CHAIN = "minecraft:chain"; + /** * Get the type name of a block. * If the type name has an old type name, the old type name will be returned, @@ -64,6 +66,8 @@ public static function getTypeName(string $typeName): string BTN::GRASS_BLOCK => self::GRASS, + BTN::IRON_CHAIN => self::CHAIN, + default => $typeName }; }