From fad0f0512c3b7b5e7083288b82faff1058dd3683 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 09:28:54 +0900
Subject: [PATCH 1/9] =?UTF-8?q?examples=20pm4.0=E5=AF=BE=E5=BF=9Cdown?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/resourceexample/plugin.yml                      | 9 ++++++---
 .../src/pjz9n/resourceexample/ExampleForm.php            | 2 +-
 .../resourceexample/src/pjz9n/resourceexample/Main.php   | 2 +-
 resourcepacktools/plugin.yml                             | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/resourceexample/plugin.yml b/examples/resourceexample/plugin.yml
index d0675e8..de05214 100644
--- a/examples/resourceexample/plugin.yml
+++ b/examples/resourceexample/plugin.yml
@@ -1,8 +1,11 @@
 name: ResourceExample
 version: 1.0.0
 main: pjz9n\resourceexample\Main
-api: 3.0.0
+api: 4.0.0
 commands:
   resourceexample:
-    aliases:
-      - re
+    description: Manage ResourcePack
+    permission: resourceexample.command.resourceexample
+permissions:
+  resourceexample.command.resourceexample:
+    default: true
diff --git a/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php b/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
index 3eacc4b..162f631 100644
--- a/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
+++ b/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
@@ -24,7 +24,7 @@
 namespace pjz9n\resourceexample;
 
 use pocketmine\form\Form;
-use pocketmine\Player;
+use pocketmine\player\Player;
 
 class ExampleForm implements Form
 {
diff --git a/examples/resourceexample/src/pjz9n/resourceexample/Main.php b/examples/resourceexample/src/pjz9n/resourceexample/Main.php
index d4d9a83..9c22edc 100644
--- a/examples/resourceexample/src/pjz9n/resourceexample/Main.php
+++ b/examples/resourceexample/src/pjz9n/resourceexample/Main.php
@@ -28,7 +28,7 @@
 use pjz9n\resourcepacktools\ResourcePack;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\Player;
+use pocketmine\player\Player;
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
 
diff --git a/resourcepacktools/plugin.yml b/resourcepacktools/plugin.yml
index fcb9989..d0d1bbc 100644
--- a/resourcepacktools/plugin.yml
+++ b/resourcepacktools/plugin.yml
@@ -1,7 +1,7 @@
 name: ResourcePackToolsPlugin
 version: 2.2.0
 main: pjz9n\resourcepacktools\Main
-api: 3.0.0
+api: 4.0.0
 commands:
   resourcepack:
     description: Manage ResourcePack

From 8868543bbf835e144b34521ebed06e358d7e9b25 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 09:35:32 +0900
Subject: [PATCH 2/9] =?UTF-8?q?resourcepacktools=20pm4.0=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?down?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resourcepacktools/src/pjz9n/resourcepacktools/Main.php    | 8 ++++----
 .../resourcepacktools/generator/ResourcePackGenerator.php | 8 ++++----
 .../resourcepacktools/generator/SimpleResourcePack.php    | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
index 5583c24..dee0515 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
@@ -25,7 +25,7 @@
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\lang\BaseLang;
+use pocketmine\lang\Language;
 use pocketmine\plugin\PluginBase;
 use pocketmine\resourcepacks\ResourcePackException;
 use pocketmine\utils\TextFormat;
@@ -33,8 +33,8 @@
 
 class Main extends PluginBase
 {
-    /** @var BaseLang */
-    private $lang;
+    /** @var Language */
+    private Language $lang;
 
     public function onEnable(): void
     {
@@ -42,7 +42,7 @@ public function onEnable(): void
         $configLang = (string)$this->getConfig()->get("lang", "def");
         $lang = $configLang === "def" ? $this->getServer()->getLanguage()->getLang() : $configLang;
         $localePath = $this->getFile() . "resources/locale/";
-        $this->lang = new BaseLang($lang, $localePath, "eng");
+        $this->lang = new Language($lang, $localePath, "eng");
         $this->getLogger()->info($this->lang->translateString("language.selected", [$this->lang->getName()]));
     }
 
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
index d944bb2..18287f2 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
@@ -30,16 +30,16 @@
 class ResourcePackGenerator
 {
     /** @var Plugin */
-    private $plugin;
+    private Plugin $plugin;
 
     /** @var Manifest */
-    private $manifest;
+    private Manifest $manifest;
 
     /** @var string|null PluginResourceRelativePath */
-    private $packIcon;
+    private ?string $packIcon;
 
     /** @var string[] ResourcePackPath => PluginResourceRelativePath */
-    private $files;
+    private array $files;
 
     /**
      * @param Plugin $plugin
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
index 1564b15..02d4d20 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
@@ -28,7 +28,7 @@
 use pjz9n\resourcepacktools\manifest\Module;
 use pjz9n\resourcepacktools\manifest\Version;
 use pocketmine\plugin\Plugin;
-use pocketmine\utils\UUID;
+use Ramsey\Uuid\Uuid;
 
 class SimpleResourcePack extends ResourcePackGenerator
 {
@@ -43,14 +43,14 @@ public function __construct(Plugin $plugin, Version $version)
             new Header(
                 "Auto generated by ResourcePackTools.",
                 $plugin->getName() . " ResourcePack.",
-                UUID::fromData($plugin->getName(), "header")->toString(),
+                Uuid::uuid3("bc2a0bc9-e3a2-4702-9319-d4d3231dfdbc",$plugin->getName())->toString(),
                 $version
             ),
             [
                 new Module(
                     "Auto generated by ResourcePackTools.",
                     Module::TYPE_RESOURCES,
-                    UUID::fromData($plugin->getName(), "module")->toString(),
+                    Uuid::uuid3("891f5751-bb0e-47c6-91f0-fdc4e76949ef",$plugin->getName())->toString(),
                     $version
                 ),
             ]

From d4674821adeb2874f1c9c2152fbc18c8c9ebff7c Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 23:34:28 +0900
Subject: [PATCH 3/9] =?UTF-8?q?=E3=82=82=E3=81=A8=E3=81=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E3=81=AB=E8=BF=91=E3=81=8F=E3=81=AA=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F(=3F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjz9n/resourcepacktools/generator/SimpleResourcePack.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
index 02d4d20..9d037a3 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
@@ -43,14 +43,14 @@ public function __construct(Plugin $plugin, Version $version)
             new Header(
                 "Auto generated by ResourcePackTools.",
                 $plugin->getName() . " ResourcePack.",
-                Uuid::uuid3("bc2a0bc9-e3a2-4702-9319-d4d3231dfdbc",$plugin->getName())->toString(),
+                Uuid::fromBytes(md5($plugin->getName() . "header", true))->toString(),
                 $version
             ),
             [
                 new Module(
                     "Auto generated by ResourcePackTools.",
                     Module::TYPE_RESOURCES,
-                    Uuid::uuid3("891f5751-bb0e-47c6-91f0-fdc4e76949ef",$plugin->getName())->toString(),
+                    Uuid::fromBytes(md5($plugin->getName() . "module", true))->toString(),
                     $version
                 ),
             ]

From 7c7510f89905d687eea87af6259c908398707260 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 09:28:54 +0900
Subject: [PATCH 4/9] =?UTF-8?q?pm4=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/resourceexample/plugin.yml                      | 9 ++++++---
 .../src/pjz9n/resourceexample/ExampleForm.php            | 2 +-
 .../resourceexample/src/pjz9n/resourceexample/Main.php   | 2 +-
 resourcepacktools/plugin.yml                             | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/resourceexample/plugin.yml b/examples/resourceexample/plugin.yml
index d0675e8..de05214 100644
--- a/examples/resourceexample/plugin.yml
+++ b/examples/resourceexample/plugin.yml
@@ -1,8 +1,11 @@
 name: ResourceExample
 version: 1.0.0
 main: pjz9n\resourceexample\Main
-api: 3.0.0
+api: 4.0.0
 commands:
   resourceexample:
-    aliases:
-      - re
+    description: Manage ResourcePack
+    permission: resourceexample.command.resourceexample
+permissions:
+  resourceexample.command.resourceexample:
+    default: true
diff --git a/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php b/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
index 3eacc4b..162f631 100644
--- a/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
+++ b/examples/resourceexample/src/pjz9n/resourceexample/ExampleForm.php
@@ -24,7 +24,7 @@
 namespace pjz9n\resourceexample;
 
 use pocketmine\form\Form;
-use pocketmine\Player;
+use pocketmine\player\Player;
 
 class ExampleForm implements Form
 {
diff --git a/examples/resourceexample/src/pjz9n/resourceexample/Main.php b/examples/resourceexample/src/pjz9n/resourceexample/Main.php
index d4d9a83..9c22edc 100644
--- a/examples/resourceexample/src/pjz9n/resourceexample/Main.php
+++ b/examples/resourceexample/src/pjz9n/resourceexample/Main.php
@@ -28,7 +28,7 @@
 use pjz9n\resourcepacktools\ResourcePack;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\Player;
+use pocketmine\player\Player;
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
 
diff --git a/resourcepacktools/plugin.yml b/resourcepacktools/plugin.yml
index fcb9989..d0d1bbc 100644
--- a/resourcepacktools/plugin.yml
+++ b/resourcepacktools/plugin.yml
@@ -1,7 +1,7 @@
 name: ResourcePackToolsPlugin
 version: 2.2.0
 main: pjz9n\resourcepacktools\Main
-api: 3.0.0
+api: 4.0.0
 commands:
   resourcepack:
     description: Manage ResourcePack

From 755df4c8d48f780d349648c77cf061ea61a5de98 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 09:35:32 +0900
Subject: [PATCH 5/9] =?UTF-8?q?pm4=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resourcepacktools/src/pjz9n/resourcepacktools/Main.php    | 8 ++++----
 .../resourcepacktools/generator/ResourcePackGenerator.php | 8 ++++----
 .../resourcepacktools/generator/SimpleResourcePack.php    | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
index 5583c24..dee0515 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
@@ -25,7 +25,7 @@
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\lang\BaseLang;
+use pocketmine\lang\Language;
 use pocketmine\plugin\PluginBase;
 use pocketmine\resourcepacks\ResourcePackException;
 use pocketmine\utils\TextFormat;
@@ -33,8 +33,8 @@
 
 class Main extends PluginBase
 {
-    /** @var BaseLang */
-    private $lang;
+    /** @var Language */
+    private Language $lang;
 
     public function onEnable(): void
     {
@@ -42,7 +42,7 @@ public function onEnable(): void
         $configLang = (string)$this->getConfig()->get("lang", "def");
         $lang = $configLang === "def" ? $this->getServer()->getLanguage()->getLang() : $configLang;
         $localePath = $this->getFile() . "resources/locale/";
-        $this->lang = new BaseLang($lang, $localePath, "eng");
+        $this->lang = new Language($lang, $localePath, "eng");
         $this->getLogger()->info($this->lang->translateString("language.selected", [$this->lang->getName()]));
     }
 
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
index d944bb2..18287f2 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
@@ -30,16 +30,16 @@
 class ResourcePackGenerator
 {
     /** @var Plugin */
-    private $plugin;
+    private Plugin $plugin;
 
     /** @var Manifest */
-    private $manifest;
+    private Manifest $manifest;
 
     /** @var string|null PluginResourceRelativePath */
-    private $packIcon;
+    private ?string $packIcon;
 
     /** @var string[] ResourcePackPath => PluginResourceRelativePath */
-    private $files;
+    private array $files;
 
     /**
      * @param Plugin $plugin
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
index 1564b15..02d4d20 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
@@ -28,7 +28,7 @@
 use pjz9n\resourcepacktools\manifest\Module;
 use pjz9n\resourcepacktools\manifest\Version;
 use pocketmine\plugin\Plugin;
-use pocketmine\utils\UUID;
+use Ramsey\Uuid\Uuid;
 
 class SimpleResourcePack extends ResourcePackGenerator
 {
@@ -43,14 +43,14 @@ public function __construct(Plugin $plugin, Version $version)
             new Header(
                 "Auto generated by ResourcePackTools.",
                 $plugin->getName() . " ResourcePack.",
-                UUID::fromData($plugin->getName(), "header")->toString(),
+                Uuid::uuid3("bc2a0bc9-e3a2-4702-9319-d4d3231dfdbc",$plugin->getName())->toString(),
                 $version
             ),
             [
                 new Module(
                     "Auto generated by ResourcePackTools.",
                     Module::TYPE_RESOURCES,
-                    UUID::fromData($plugin->getName(), "module")->toString(),
+                    Uuid::uuid3("891f5751-bb0e-47c6-91f0-fdc4e76949ef",$plugin->getName())->toString(),
                     $version
                 ),
             ]

From 9ed78910f307c0a5a654bc5e7d2eef83a6bd56c2 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Thu, 2 Jun 2022 23:34:28 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=E3=82=82=E3=81=A8=E3=81=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E3=81=AB=E8=BF=91=E3=81=8F=E3=81=AA=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F(=3F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjz9n/resourcepacktools/generator/SimpleResourcePack.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
index 02d4d20..9d037a3 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
@@ -43,14 +43,14 @@ public function __construct(Plugin $plugin, Version $version)
             new Header(
                 "Auto generated by ResourcePackTools.",
                 $plugin->getName() . " ResourcePack.",
-                Uuid::uuid3("bc2a0bc9-e3a2-4702-9319-d4d3231dfdbc",$plugin->getName())->toString(),
+                Uuid::fromBytes(md5($plugin->getName() . "header", true))->toString(),
                 $version
             ),
             [
                 new Module(
                     "Auto generated by ResourcePackTools.",
                     Module::TYPE_RESOURCES,
-                    Uuid::uuid3("891f5751-bb0e-47c6-91f0-fdc4e76949ef",$plugin->getName())->toString(),
+                    Uuid::fromBytes(md5($plugin->getName() . "module", true))->toString(),
                     $version
                 ),
             ]

From fc45e17838474f85091a3f2329042a59074baba8 Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Tue, 7 Jun 2022 02:59:14 +0900
Subject: [PATCH 7/9] =?UTF-8?q?virion.yml=E3=81=AEapi=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E5=A4=89=E3=81=88=E5=BF=98=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resourcepacktools/virion.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resourcepacktools/virion.yml b/resourcepacktools/virion.yml
index b9491f6..62ba34c 100644
--- a/resourcepacktools/virion.yml
+++ b/resourcepacktools/virion.yml
@@ -1,4 +1,4 @@
 name: ResourcePackTools
 version: 2.2.0
 antigen: pjz9n\resourcepacktools
-api: 3.0.0
+api: 4.0.0

From 6dfda97b0222cdaf168dcf403a3c9bb867dc739d Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Wed, 8 Jun 2022 00:53:05 +0900
Subject: [PATCH 8/9] =?UTF-8?q?lint:=20Call=20to=20an=20undefined=20method?=
 =?UTF-8?q?=20pocketmine\resourcepacks\ResourcePack::getPath()=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resourcepacktools/resources/locale/eng.ini    |  1 +
 resourcepacktools/resources/locale/jpn.ini    |  1 +
 .../src/pjz9n/resourcepacktools/Main.php      | 24 ++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/resourcepacktools/resources/locale/eng.ini b/resourcepacktools/resources/locale/eng.ini
index d519ee1..a6cedc0 100644
--- a/resourcepacktools/resources/locale/eng.ini
+++ b/resourcepacktools/resources/locale/eng.ini
@@ -6,3 +6,4 @@ command.validate.onlynumeric = Only numeric can be used as arguments.
 resourcepack.notfound = ResourcePack does not exist.
 resourcepack.register.success = The ResourcePack ({%0}) was registered successfully.
 resourcepack.unregister.success = The ResourcePack ({%0}) was unregistered successfully.
+resourcepack.unknown = "not supported."
diff --git a/resourcepacktools/resources/locale/jpn.ini b/resourcepacktools/resources/locale/jpn.ini
index 42fe283..7e51b2c 100644
--- a/resourcepacktools/resources/locale/jpn.ini
+++ b/resourcepacktools/resources/locale/jpn.ini
@@ -6,3 +6,4 @@ command.validate.onlynumeric = 引数には数字のみ使用できます。
 resourcepack.notfound = リソースパックが存在しません。
 resourcepack.register.success = リソースパック ({%0}) の登録に成功しました。
 resourcepack.unregister.success = リソースパック ({%0}) の登録解除に成功しました。
+resourcepack.unknown = 非対応
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
index dee0515..bc0ea75 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/Main.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright (c) 2020 PJZ9n.
  *
@@ -27,17 +26,16 @@
 use pocketmine\command\CommandSender;
 use pocketmine\lang\Language;
 use pocketmine\plugin\PluginBase;
+use pocketmine\resourcepacks\ResourcePack as PMResourcePack;
 use pocketmine\resourcepacks\ResourcePackException;
+use pocketmine\resourcepacks\ZippedResourcePack;
 use pocketmine\utils\TextFormat;
-use pocketmine\resourcepacks\ResourcePack as PMResourcePack;
 
-class Main extends PluginBase
-{
+class Main extends PluginBase {
     /** @var Language */
     private Language $lang;
 
-    public function onEnable(): void
-    {
+    public function onEnable(): void {
         $this->saveDefaultConfig();
         $configLang = (string)$this->getConfig()->get("lang", "def");
         $lang = $configLang === "def" ? $this->getServer()->getLanguage()->getLang() : $configLang;
@@ -46,8 +44,7 @@ public function onEnable(): void
         $this->getLogger()->info($this->lang->translateString("language.selected", [$this->lang->getName()]));
     }
 
-    public function onCommand(CommandSender $sender, Command $command, string $label, array $args): bool
-    {
+    public function onCommand(CommandSender $sender, Command $command, string $label, array $args): bool {
         switch ($command) {//$command->__toString()
             case "resourcepack":
                 if (!isset($args[0])) return false;
@@ -116,7 +113,12 @@ public function onCommand(CommandSender $sender, Command $command, string $label
                                 //pack mode
                                 $list = [];
                                 foreach (ResourcePack::getPackList() as $index => $pack) {
+                                    if($pack instanceof ZippedResourcePack){
                                     $list[] = (string)$index . " => " . $pack->getPath();
+
+                                    }else{
+                                        $list[] = (string)$index . " => " . $this->lang->translateString("resourcepack.unknown");
+                                    }
                                 }
                                 if (count($list) < 1) {
                                     $sender->sendMessage(
@@ -132,7 +134,11 @@ public function onCommand(CommandSender $sender, Command $command, string $label
                                 //uuid mode
                                 $list = [];
                                 foreach (ResourcePack::getUuidList() as $uuid => $pack) {
-                                    $list[] = (string)$uuid . " => " . $pack->getPath();
+                                    if($pack instanceof ZippedResourcePack) {
+                                        $list[] = (string)$uuid . " => " . $pack->getPath();
+                                    }else{
+                                        $list[] = (string)$uuid . " => ". $this->lang->translateString("resourcepack.unknown");
+                                    }
                                 }
                                 if (count($list) < 1) {
                                     $sender->sendMessage(

From a0dcb6aacbb74709ba9a545753844b518e1a47ff Mon Sep 17 00:00:00 2001
From: tatchan <43107628+TATCHAN0825@users.noreply.github.com>
Date: Wed, 8 Jun 2022 01:38:10 +0900
Subject: [PATCH 9/9] =?UTF-8?q?lint:=20Call=20to=20an=20undefined=20method?=
 =?UTF-8?q?=20pocketmine\plugin\Plugin::getResource()=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/ResourcePackGenerator.php             | 13 +++++++------
 .../generator/SimpleResourcePack.php                |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
index 18287f2..c8aaaea 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/ResourcePackGenerator.php
@@ -25,12 +25,13 @@
 
 use pjz9n\resourcepacktools\manifest\Manifest;
 use pocketmine\plugin\Plugin;
+use pocketmine\plugin\PluginBase;
 use ZipArchive;
 
 class ResourcePackGenerator
 {
-    /** @var Plugin */
-    private Plugin $plugin;
+    /** @var PluginBase */
+    private PluginBase $plugin;
 
     /** @var Manifest */
     private Manifest $manifest;
@@ -42,10 +43,10 @@ class ResourcePackGenerator
     private array $files;
 
     /**
-     * @param Plugin $plugin
+     * @param PluginBase $plugin
      * @param Manifest $manifest
      */
-    public function __construct(Plugin $plugin, Manifest $manifest)
+    public function __construct(PluginBase $plugin, Manifest $manifest)
     {
         $this->plugin = $plugin;
         $this->manifest = $manifest;
@@ -121,9 +122,9 @@ public function generate(string $generateFilePath, bool $overwrite = true): void
     }
 
     /**
-     * @return Plugin
+     * @return PluginBase
      */
-    protected function getPlugin(): Plugin
+    protected function getPlugin(): PluginBase
     {
         return $this->plugin;
     }
diff --git a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
index 9d037a3..4c03f6f 100644
--- a/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
+++ b/resourcepacktools/src/pjz9n/resourcepacktools/generator/SimpleResourcePack.php
@@ -27,16 +27,16 @@
 use pjz9n\resourcepacktools\manifest\Manifest;
 use pjz9n\resourcepacktools\manifest\Module;
 use pjz9n\resourcepacktools\manifest\Version;
-use pocketmine\plugin\Plugin;
+use pocketmine\plugin\PluginBase;
 use Ramsey\Uuid\Uuid;
 
 class SimpleResourcePack extends ResourcePackGenerator
 {
     /**
-     * @param Plugin $plugin
+     * @param PluginBase $plugin
      * @param Version $version
      */
-    public function __construct(Plugin $plugin, Version $version)
+    public function __construct(PluginBase $plugin, Version $version)
     {
         //TODO: Can header and module versions be different?
         $manifest = new Manifest(