Enchantment Name Support - EnchantCommand (#2009)

* Enchantment Name Support - EnchantCommand * Enchantment Name Support 1/2 * Enchantment Name Support 2/2 * Update EnchantCommand.php * Update Enchantment.php * Conform to PocketMine code styling
iTXTech · Oct 1, 2016 · 6ccefae · 6ccefae
1 parent 1a4abbc
commit 6ccefae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/src/pocketmine/command/defaults/EnchantCommand.php b/src/pocketmine/command/defaults/EnchantCommand.php
@@ -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]));
-			return true;
+			$enchantment = Enchantment::getEnchantmentByName($enchantId);
+			if($enchantment->getId() === Enchantment::TYPE_INVALID){
+	    		$sender->sendMessage(new TranslationContainer("commands.enchant.notFound", [$enchantment->getId()]));
+				return true;
+			}
 		}
 
 		$enchantment->setLevel($enchantLevel);
@@ -88,4 +91,4 @@ public function execute(CommandSender $sender, $currentAlias, array $args){
 		self::broadcastCommandMessage($sender, new TranslationContainer("%commands.enchant.success"));
 		return true;
 	}
-}
+}
diff --git a/src/pocketmine/item/enchantment/Enchantment.php b/src/pocketmine/item/enchantment/Enchantment.php
@@ -180,11 +180,22 @@ 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;
+		}elseif(defined(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name))){
+			return self::getEnchantment(constant(Enchantment::class . "::TYPE_WEAPON_" . strtoupper($name))); 
+		}elseif(defined(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name))){
+			return self::getEnchantment(constant(Enchantment::class . "::TYPE_ARMOR_" . strtoupper($name))); 
+		}elseif(defined(Enchantment::class . "::TYPE_MINING_" . strtoupper($name))){
+			return self::getEnchantment(constant(Enchantment::class . "::TYPE_MINING_" . strtoupper($name))); 
+		}elseif(defined(Enchantment::class . "::TYPE_BOW_" . strtoupper($name))){
+			return self::getEnchantment(constant(Enchantment::class . "::TYPE_BOW_" . strtoupper($name))); 
+		}elseif(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);
+	    }
 	}
 
 	public static function getEnchantAbility(Item $item){
@@ -369,4 +380,4 @@ public static function getRandomName(){
 		}
 		return implode(" ", $set);
 	}
-}
+}