#1403, SPIGOT-4288, SPIGOT-6202: Add material rerouting in preparatio…

…n for the switch to ItemType and BlockType

This also moves the conversion from and to legacy material to the method
calls of legacy plugins, and no longer allows them directly in the
server.

This has the side effect of fixing some legacy plugin issues, such as
SPIGOT-4288, SPIGOT-6161. Also fixes legacy items sometimes not stacking
in inventory when using addItem, a client disconnect when using legacy
items in recipes and probably some more.

src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java

@@ -31,7 +31,7 @@ public static net.minecraft.world.item.ItemStack asNMSCopy(ItemStack original) {
             return net.minecraft.world.item.ItemStack.EMPTY;
         }
 
-        Item item = CraftMagicNumbers.getItem(original.getType(), original.getDurability());
+        Item item = CraftItemType.bukkitToMinecraft(original.getType());
 
         if (item == null) {
             return net.minecraft.world.item.ItemStack.EMPTY;

src/main/java/org/bukkit/craftbukkit/legacy/CraftEvil.java

@@ -11,7 +11,6 @@
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.craftbukkit.block.CraftBlock;
-import org.bukkit.craftbukkit.block.CraftBlockState;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
 
@@ -38,6 +37,15 @@ private CraftEvil() {
         //
     }
 
+    public static void setDurability(ItemStack itemStack, short durability) {
+        itemStack.setDurability(durability);
+        MaterialData materialData = CraftLegacy.toLegacyData(itemStack.getType(), true);
+
+        if (materialData.getItemType().getMaxDurability() <= 0) {
+            itemStack.setType(CraftLegacy.fromLegacy(new MaterialData(materialData.getItemType(), (byte) itemStack.getDurability()), true));
+        }
+    }
+
     public static int getBlockTypeIdAt(World world, int x, int y, int z) {
         return getId(world.getBlockAt(x, y, z).getType());
     }
@@ -46,14 +54,6 @@ public static int getBlockTypeIdAt(World world, Location location) {
         return getId(world.getBlockAt(location).getType());
     }
 
-    public static Material getType(Block block) {
-        return CraftLegacy.toLegacyMaterial(((CraftBlock) block).getNMS());
-    }
-
-    public static Material getType(BlockState block) {
-        return CraftLegacy.toLegacyMaterial(((CraftBlockState) block).getHandle());
-    }
-
     public static int getTypeId(Block block) {
         return getId(block.getType());
     }

src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java

@@ -67,10 +67,19 @@ public static Material toLegacy(Material material) {
     }
 
     public static MaterialData toLegacyData(Material material) {
+        return toLegacyData(material, false);
+    }
+
+    public static MaterialData toLegacyData(Material material, boolean itemPriority) {
         Preconditions.checkArgument(!material.isLegacy(), "toLegacy on legacy Material");
-        MaterialData mappedData;
+        MaterialData mappedData = null;
 
-        if (material.isBlock()) {
+        if (itemPriority) {
+            Item item = CraftMagicNumbers.getItem(material);
+            mappedData = itemToMaterial.get(item);
+        }
+
+        if (mappedData == null && material.isBlock()) {
             Block block = CraftMagicNumbers.getBlock(material);
             IBlockData blockData = block.defaultBlockState();
 
@@ -84,7 +93,7 @@ public static MaterialData toLegacyData(Material material) {
                     mappedData = itemToMaterial.get(block.asItem());
                 }
             }
-        } else {
+        } else if (!itemPriority) {
             Item item = CraftMagicNumbers.getItem(material);
             mappedData = itemToMaterial.get(item);
         }