From 93131b4d925951750d9636f50d84dc9f84772e81 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 26 Oct 2018 18:20:37 +0100
Subject: [PATCH] Rename some meta usages to variant

---
 src/pocketmine/item/Banner.php       | 4 ++--
 src/pocketmine/item/Bed.php          | 4 ++--
 src/pocketmine/item/Dye.php          | 4 ++--
 src/pocketmine/item/Item.php         | 6 +++---
 src/pocketmine/item/Potion.php       | 4 ++--
 src/pocketmine/item/SplashPotion.php | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pocketmine/item/Banner.php b/src/pocketmine/item/Banner.php
index 2fdf48daa..9dabb9306 100644
--- a/src/pocketmine/item/Banner.php
+++ b/src/pocketmine/item/Banner.php
@@ -37,8 +37,8 @@ class Banner extends Item{
 	public const TAG_PATTERN_COLOR = TileBanner::TAG_PATTERN_COLOR;
 	public const TAG_PATTERN_NAME = TileBanner::TAG_PATTERN_NAME;
 
-	public function __construct(int $meta){
-		parent::__construct(self::BANNER, $meta, "Banner");
+	public function __construct(int $variant){
+		parent::__construct(self::BANNER, $variant, "Banner");
 	}
 
 	public function getBlock() : Block{
diff --git a/src/pocketmine/item/Bed.php b/src/pocketmine/item/Bed.php
index 7fe88e3e3..c451a6acc 100644
--- a/src/pocketmine/item/Bed.php
+++ b/src/pocketmine/item/Bed.php
@@ -27,8 +27,8 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 
 class Bed extends Item{
-	public function __construct(int $meta){
-		parent::__construct(self::BED, $meta, "Bed");
+	public function __construct(int $variant){
+		parent::__construct(self::BED, $variant, "Bed");
 	}
 
 	public function getBlock() : Block{
diff --git a/src/pocketmine/item/Dye.php b/src/pocketmine/item/Dye.php
index 382c7a583..fb91e3f3d 100644
--- a/src/pocketmine/item/Dye.php
+++ b/src/pocketmine/item/Dye.php
@@ -27,8 +27,8 @@ use pocketmine\block\Block;
 use pocketmine\block\BlockFactory;
 
 class Dye extends Item{
-	public function __construct(int $meta){
-		parent::__construct(self::DYE, $meta, "Dye");
+	public function __construct(int $variant){
+		parent::__construct(self::DYE, $variant, "Dye");
 	}
 
 	public function getBlock() : Block{
diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 91a1aa06b..e92da3194 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -187,15 +187,15 @@ class Item implements ItemIds, \JsonSerializable{
 	 * purpose.
 	 *
 	 * @param int    $id
-	 * @param int    $meta
+	 * @param int    $variant
 	 * @param string $name
 	 */
-	public function __construct(int $id, int $meta = 0, string $name = "Unknown"){
+	public function __construct(int $id, int $variant = 0, string $name = "Unknown"){
 		if($id < -0x8000 or $id > 0x7fff){ //signed short range
 			throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
 		}
 		$this->id = $id;
-		$this->meta = $meta !== -1 ? $meta & 0x7FFF : -1;
+		$this->meta = $variant !== -1 ? $variant & 0x7FFF : -1;
 		$this->name = $name;
 	}
 
diff --git a/src/pocketmine/item/Potion.php b/src/pocketmine/item/Potion.php
index 6c925543e..bddab81e9 100644
--- a/src/pocketmine/item/Potion.php
+++ b/src/pocketmine/item/Potion.php
@@ -255,8 +255,8 @@ class Potion extends Item implements Consumable{
 		return [];
 	}
 
-	public function __construct(int $meta){
-		parent::__construct(self::POTION, $meta, "Potion");
+	public function __construct(int $variant){
+		parent::__construct(self::POTION, $variant, "Potion");
 	}
 
 	public function getMaxStackSize() : int{
diff --git a/src/pocketmine/item/SplashPotion.php b/src/pocketmine/item/SplashPotion.php
index 15293dd11..945b5f5e8 100644
--- a/src/pocketmine/item/SplashPotion.php
+++ b/src/pocketmine/item/SplashPotion.php
@@ -27,8 +27,8 @@ use pocketmine\nbt\tag\CompoundTag;
 
 class SplashPotion extends ProjectileItem{
 
-	public function __construct(int $meta){
-		parent::__construct(self::SPLASH_POTION, $meta, "Splash Potion");
+	public function __construct(int $variant){
+		parent::__construct(self::SPLASH_POTION, $variant, "Splash Potion");
 	}
 
 	public function getMaxStackSize() : int{