diff --git a/src/Infernus101/KitUI/Kit.php b/src/Infernus101/KitUI/Kit.php index 132171f..8f2b360 100644 --- a/src/Infernus101/KitUI/Kit.php +++ b/src/Infernus101/KitUI/Kit.php @@ -9,6 +9,9 @@ use pocketmine\utils\TextFormat; use pocketmine\Player; +use PiggyCustomEnchants\CustomEnchants\CustomEnchants; +use pocketmine\Server; + class Kit{ public $pl; @@ -95,12 +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; foreach($enchantments as $key => $name_level){ if($key % 2 === 0){ //Name expected - $ench = Enchantment::getEnchantmentByName($name_level); - }else{ //Level expected - if(isset($ench) and $ench !== null){ - $item->addEnchantment($ench->setLevel($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)); } } } diff --git a/src/Infernus101/KitUI/Main.php b/src/Infernus101/KitUI/Main.php index cac018d..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,6 +40,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); + $this->piggyEnchants = $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);