From a9ac5e55417cf4f50b68d1b29a86deaef2041303 Mon Sep 17 00:00:00 2001 From: Infernus Date: Thu, 2 Nov 2017 01:18:01 +0530 Subject: [PATCH 1/5] Update Kit.php --- src/Infernus101/KitUI/Kit.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Infernus101/KitUI/Kit.php b/src/Infernus101/KitUI/Kit.php index 132171f..5862401 100644 --- a/src/Infernus101/KitUI/Kit.php +++ b/src/Infernus101/KitUI/Kit.php @@ -9,6 +9,8 @@ use pocketmine\utils\TextFormat; use pocketmine\Player; +use PiggyCustomEnchants\CustomEnchants\CustomEnchants; + class Kit{ public $pl; @@ -98,6 +100,9 @@ public function loadItem(int $id = 0, int $damage = 0, int $count = 1, string $n foreach($enchantments as $key => $name_level){ if($key % 2 === 0){ //Name expected $ench = Enchantment::getEnchantmentByName($name_level); + if ($ench === null){ + $ench = CustomEnchants::getEnchantByName((string) $name_level); + } }else{ //Level expected if(isset($ench) and $ench !== null){ $item->addEnchantment($ench->setLevel($name_level)); From f0bc7e5f9315c50b2c3812e514d389012b41c2c6 Mon Sep 17 00:00:00 2001 From: Infernus Date: Thu, 2 Nov 2017 01:20:15 +0530 Subject: [PATCH 2/5] Update Main.php - Support CEs --- src/Infernus101/KitUI/Main.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Infernus101/KitUI/Main.php b/src/Infernus101/KitUI/Main.php index cac018d..8014df0 100644 --- a/src/Infernus101/KitUI/Main.php +++ b/src/Infernus101/KitUI/Main.php @@ -38,6 +38,10 @@ public function onEnable(){ $this->language = new LangManager($this); $this->getServer()->getPluginManager()->registerEvents(new PlayerEvents($this), $this); $this->getServer()->getScheduler()->scheduleDelayedRepeatingTask(new CoolDownTask($this), 1200, 1200); + $customEnchants = $this->getServer()->getPluginManager()->getPlugin("PiggyCustomEnchants"); + if ($customEnchants !== null) { + $this->getServer()->getLogger()->info(TextFormat::GREEN . "[KitUI] Using PiggyCustomEnchants!"); + } $allKits = yaml_parse_file($this->getDataFolder()."kits.yml"); foreach($allKits as $name => $data){ $this->kits[$name] = new Kit($this, $data, $name); From 99a8fb4244f66c2a55a56263fd33830db44271af Mon Sep 17 00:00:00 2001 From: Infernus Date: Thu, 2 Nov 2017 01:22:22 +0530 Subject: [PATCH 3/5] Add ce support in Kit.php --- src/Infernus101/KitUI/Kit.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Infernus101/KitUI/Kit.php b/src/Infernus101/KitUI/Kit.php index 5862401..3c282e0 100644 --- a/src/Infernus101/KitUI/Kit.php +++ b/src/Infernus101/KitUI/Kit.php @@ -10,6 +10,7 @@ use pocketmine\Player; use PiggyCustomEnchants\CustomEnchants\CustomEnchants; +use pocketmine\Server; class Kit{ @@ -97,6 +98,7 @@ public function loadItem(int $id = 0, int $damage = 0, int $count = 1, string $n if(strtolower($name) !== "default"){ $item->setCustomName($name); } + $ench = null; foreach($enchantments as $key => $name_level){ if($key % 2 === 0){ //Name expected $ench = Enchantment::getEnchantmentByName($name_level); @@ -105,7 +107,12 @@ public function loadItem(int $id = 0, int $damage = 0, int $count = 1, string $n } }else{ //Level expected if(isset($ench) and $ench !== null){ - $item->addEnchantment($ench->setLevel($name_level)); + if($ench instanceof CustomEnchants){ + $customEnchants = Server::getInstance()->getPluginManager()->getPlugin("PiggyCustomEnchants"); + $customEnchants->addEnchantment($item, $ench,(int) $name_level); + }else { + $item->addEnchantment($ench->setLevel((int) $name_level)); + } } } } From 41e535da17d6cb1f3ed8753a24cee7909e9899ff Mon Sep 17 00:00:00 2001 From: Infernus Date: Thu, 2 Nov 2017 01:25:03 +0530 Subject: [PATCH 4/5] Update Kit.php --- src/Infernus101/KitUI/Kit.php | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Infernus101/KitUI/Kit.php b/src/Infernus101/KitUI/Kit.php index 3c282e0..8f2b360 100644 --- a/src/Infernus101/KitUI/Kit.php +++ b/src/Infernus101/KitUI/Kit.php @@ -98,21 +98,18 @@ public function loadItem(int $id = 0, int $damage = 0, int $count = 1, string $n if(strtolower($name) !== "default"){ $item->setCustomName($name); } - $ench = null; + $ench = null; foreach($enchantments as $key => $name_level){ if($key % 2 === 0){ //Name expected - $ench = Enchantment::getEnchantmentByName($name_level); - if ($ench === null){ - $ench = CustomEnchants::getEnchantByName((string) $name_level); - } - }else{ //Level expected - if(isset($ench) and $ench !== null){ - if($ench instanceof CustomEnchants){ - $customEnchants = Server::getInstance()->getPluginManager()->getPlugin("PiggyCustomEnchants"); - $customEnchants->addEnchantment($item, $ench,(int) $name_level); - }else { - $item->addEnchantment($ench->setLevel((int) $name_level)); - } + $ench = Enchantment::getEnchantmentByName((string) $name_level); + if($ench === null){ + $ench = CustomEnchants::getEnchantByName((string) $name_level); + } + }elseif($ench !== null){ + if($this->ak->piggyEnchants !== null && $ench instanceof CustomEnchants){ + $this->ak->piggyEnchants->addEnchantment($item, $ench->getName(), (int) $name_level); + }else{ + $item->addEnchantment($ench->setLevel((int) $name_level)); } } } From d113a6bced6c634b7234ed0c138fd7cb856bf9aa Mon Sep 17 00:00:00 2001 From: Infernus Date: Thu, 2 Nov 2017 01:26:42 +0530 Subject: [PATCH 5/5] Update Main.php --- src/Infernus101/KitUI/Main.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Infernus101/KitUI/Main.php b/src/Infernus101/KitUI/Main.php index 8014df0..e9d0226 100644 --- a/src/Infernus101/KitUI/Main.php +++ b/src/Infernus101/KitUI/Main.php @@ -15,12 +15,14 @@ use pocketmine\network\mcpe\protocol\ModalFormRequestPacket; use pocketmine\utils\Config; use pocketmine\utils\TextFormat; +use PiggyCustomEnchants; class Main extends PluginBase implements Listener { public $kits = []; public $kitused = []; public $language; + public $piggyEnchants; public function onEnable(){ @mkdir($this->getDataFolder()."timer/"); @@ -38,7 +40,7 @@ public function onEnable(){ $this->language = new LangManager($this); $this->getServer()->getPluginManager()->registerEvents(new PlayerEvents($this), $this); $this->getServer()->getScheduler()->scheduleDelayedRepeatingTask(new CoolDownTask($this), 1200, 1200); - $customEnchants = $this->getServer()->getPluginManager()->getPlugin("PiggyCustomEnchants"); + $this->piggyEnchants = $this->getServer()->getPluginManager()->getPlugin("PiggyCustomEnchants"); if ($customEnchants !== null) { $this->getServer()->getLogger()->info(TextFormat::GREEN . "[KitUI] Using PiggyCustomEnchants!"); }