ShoppingCartReloaded

From cdb798236f7ab52961e47e893d7dbf1c3fd58e62 Mon Sep 17 00:00:00 2001
From: MegaFlary
Date: Tue, 12 Jan 2016 20:24:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=B0=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B5=D0=B4=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scala/me/limito/bukkit/shopcart/items/CartItemInfo.scala   | 10 ++++++++--
 .../scala/me/limito/bukkit/shopcart/items/CartItemItem.scala   |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemInfo.scala b/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemInfo.scala
index 373efcf..0c02730 100644
--- a/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemInfo.scala
+++ b/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemInfo.scala
@@ -3,6 +3,7 @@ package me.limito.bukkit.shopcart.items
 import me.limito.bukkit.shopcart.ShoppingCartReloaded
 import java.util.logging.Level
 import me.limito.bukkit.shopcart.optional.nbt.NBTTag
+import org.bukkit.Material
 import scala.collection.mutable
 import org.bukkit.enchantments.Enchantment
 import scala.util.matching.Regex
@@ -104,9 +105,9 @@ class CartItemInfo(var id: Long,
     val Array(main, nameAndLoreString @ _*) = mainAndNameWithLore.split("@", 2)
     val nameAndLore = nameAndLoreString.headOption.map(parseNameAndLore)

-    val Array(id, meta @ _*) = main.split(":", 2)
+    val Array(material, meta @ _*) = main.split(":", 2)

-    new CartItemItem(id.toInt, if (meta.isEmpty) 0 else meta.head.toShort, amount, enchantments, parseNBT, nameAndLore)
+    new CartItemItem(parseMaterial(material), if (meta.isEmpty) 0 else meta.head.toShort, amount, enchantments, parseNBT, nameAndLore)
   }

   private def parseNameAndLore(s: String): NameAndLore = {
@@ -116,6 +117,11 @@ class CartItemInfo(var id: Long,
     NameAndLore(name, lore)
   }

+  private def parseMaterial(item: String): Material = Material.matchMaterial(item) match {
+    case m if m != null => m
+    case null => Material.getMaterial(item.toInt)
+  }
+
   private def deescapeNameAndLore(escaped: String) = escaped.replaceAll("\\\\\\\\", Regex.quoteReplacement("\\")).replaceAll("\\\\@", Regex.quoteReplacement("@"))

   private def nameAndLoreDelimIndex(nameAndLore: String): Int = {
diff --git a/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemItem.scala b/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemItem.scala
index ad2d5cd..b15fe45 100644
--- a/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemItem.scala
+++ b/shoppingcart/src/main/scala/me/limito/bukkit/shopcart/items/CartItemItem.scala
@@ -12,7 +12,7 @@ import org.bukkit.Material

 case class NameAndLore(name: String, lore: String)

-class CartItemItem(val itemId: Int, val itemMeta: Short, val amount: Int, val enchantments: Array[LeveledEnchantment], val nbtTag: NBTTag, val nameAndLoreOption: Option[NameAndLore]) extends CartItem {
+class CartItemItem(val material: Material, val itemMeta: Short, val amount: Int, val enchantments: Array[LeveledEnchantment], val nbtTag: NBTTag, val nameAndLoreOption: Option[NameAndLore]) extends CartItem {
   def giveToPlayer(player: Player):Int = giveToPlayer(player, amount)

   def giveToPlayer(player: Player, amount: Int):Int = {
@@ -23,7 +23,6 @@ class CartItemItem(val itemId: Int, val itemMeta: Short, val amount: Int, val en
   }

   private def stackToGive: Option[ItemStack] = {
-    val material = Material.getMaterial(itemId)
     if (material != null) {
       val bstack = wrapInCraftStack(new ItemStack(material, 1, itemMeta))
       val stack = if (nbtTag != null) ShoppingCartReloaded.instance.nbtHelper.placeTag(nbtTag, bstack) else bstack
@@ -46,7 +45,7 @@ class CartItemItem(val itemId: Int, val itemMeta: Short, val amount: Int, val en
   }

   def getLocalizedName(lang: Lang): String = {
-    val name = lang.getItemName(itemId, itemMeta)
+    val name = lang.getItemName(material.getId, itemMeta)
     if (enchantments != null)
       name + " " + lang.formatEnchantments(enchantments)
     else
--
2.7.1.windows.1