Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Enchantment Name Support - EnchantCommand #2009

Merged
merged 4 commits into from
Oct 1, 2016
Merged

Enchantment Name Support - EnchantCommand #2009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d512f9
Enchantment Name Support - EnchantCommand
Oct 1, 2016
e2cd735
Update EnchantCommand.php
Oct 1, 2016
3037b09
Update Enchantment.php
Oct 1, 2016
084e462
Conform to PocketMine code styling
dktapps Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/pocketmine/command/defaults/EnchantCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,16 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
return true;
}

$enchantId = (int) $args[1];
$enchantId = $args[1];
$enchantLevel = isset($args[2]) ? (int) $args[2] : 1;

$enchantment = Enchantment::getEnchantment($enchantId);
if($enchantment->getId() === Enchantment::TYPE_INVALID){
$sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$enchantId]));
$enchantment = Enchantment::getEnchantmentByName($enchantId);
if($enchantment->getId() === Enchantment::TYPE_INVALID){
$sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$enchantment->getId()]));
return true;
}
}

$enchantment->setLevel($enchantLevel);
Expand All @@ -88,4 +91,4 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
self::broadcastCommandMessage($sender, new TranslationContainer("%commands.enchant.success"));
return true;
}
}
}
23 changes: 20 additions & 3 deletions src/pocketmine/item/enchantment/Enchantment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,28 @@ public static function getEnchantment($id){
return new Enchantment(self::TYPE_INVALID, "unknown", 0, 0, 0);
}

public static function getEffectByName($name){
public static function getEnchantmentByName($name){
if(defined(Enchantment::class . "::TYPE_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_" . strtoupper($name)));
}
return null;
else if(defined(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_MINING_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_MINING_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_BOW_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_BOW_" . strtoupper($name)));
}
else if(defined(Enchantment::class . "::TYPE_FISHING_" . strtoupper($name))){
return self::getEnchantment(constant(Enchantment::class . "::TYPE_FISHING_" . strtoupper($name)));
}
else{
return new Enchantment(self::TYPE_INVALID, "unknown", 0, 0, 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^^

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I was just about to commit that, I'm squashing commits right now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
}

public static function getEnchantAbility(Item $item){
Expand Down Expand Up @@ -369,4 +386,4 @@ public static function getRandomName(){
}
return implode(" ", $set);
}
}
}