Update CraftBukkit to Minecraft 1.4.6

1 files changed, 0 insertions, 123 deletions

diff --git a/src/main/java/net/minecraft/server/RecipesArmorDye.java b/src/main/java/net/minecraft/server/RecipesArmorDye.java
deleted file mode 100644
index 22d8d328..00000000
--- a/src/main/java/net/minecraft/server/RecipesArmorDye.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package net.minecraft.server;
-
-import java.util.ArrayList;
-
-public class RecipesArmorDye extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
-
-    // CraftBukkit start - delegate to new parent class with bogus info
-    public RecipesArmorDye() {
-        super(new ItemStack(Item.LEATHER_HELMET, 0, 0), java.util.Arrays.asList(new ItemStack(Item.INK_SACK, 0, 5)));
-    }
-    // CraftBukkit end
-
-    public boolean a(InventoryCrafting inventorycrafting, World world) {
-        ItemStack itemstack = null;
-        ArrayList arraylist = new ArrayList();
-
-        for (int i = 0; i < inventorycrafting.getSize(); ++i) {
-            ItemStack itemstack1 = inventorycrafting.getItem(i);
-
-            if (itemstack1 != null) {
-                if (itemstack1.getItem() instanceof ItemArmor) {
-                    ItemArmor itemarmor = (ItemArmor) itemstack1.getItem();
-
-                    if (itemarmor.d() != EnumArmorMaterial.CLOTH || itemstack != null) {
-                        return false;
-                    }
-
-                    itemstack = itemstack1;
-                } else {
-                    if (itemstack1.id != Item.INK_SACK.id) {
-                        return false;
-                    }
-
-                    arraylist.add(itemstack1);
-                }
-            }
-        }
-
-        return itemstack != null && !arraylist.isEmpty();
-    }
-
-    public ItemStack a(InventoryCrafting inventorycrafting) {
-        ItemStack itemstack = null;
-        int[] aint = new int[3];
-        int i = 0;
-        int j = 0;
-        ItemArmor itemarmor = null;
-
-        int k;
-        int l;
-        float f;
-        float f1;
-        int i1;
-
-        for (k = 0; k < inventorycrafting.getSize(); ++k) {
-            ItemStack itemstack1 = inventorycrafting.getItem(k);
-
-            if (itemstack1 != null) {
-                if (itemstack1.getItem() instanceof ItemArmor) {
-                    itemarmor = (ItemArmor) itemstack1.getItem();
-                    if (itemarmor.d() != EnumArmorMaterial.CLOTH || itemstack != null) {
-                        return null;
-                    }
-
-                    itemstack = itemstack1.cloneItemStack();
-                    if (itemarmor.b_(itemstack1)) {
-                        l = itemarmor.b(itemstack);
-                        f = (float) (l >> 16 & 255) / 255.0F;
-                        f1 = (float) (l >> 8 & 255) / 255.0F;
-                        float f2 = (float) (l & 255) / 255.0F;
-
-                        i = (int) ((float) i + Math.max(f, Math.max(f1, f2)) * 255.0F);
-                        aint[0] = (int) ((float) aint[0] + f * 255.0F);
-                        aint[1] = (int) ((float) aint[1] + f1 * 255.0F);
-                        aint[2] = (int) ((float) aint[2] + f2 * 255.0F);
-                        ++j;
-                    }
-                } else {
-                    if (itemstack1.id != Item.INK_SACK.id) {
-                        return null;
-                    }
-
-                    float[] afloat = EntitySheep.d[BlockCloth.e_(itemstack1.getData())];
-                    int j1 = (int) (afloat[0] * 255.0F);
-                    int k1 = (int) (afloat[1] * 255.0F);
-
-                    i1 = (int) (afloat[2] * 255.0F);
-                    i += Math.max(j1, Math.max(k1, i1));
-                    aint[0] += j1;
-                    aint[1] += k1;
-                    aint[2] += i1;
-                    ++j;
-                }
-            }
-        }
-
-        if (itemarmor == null) {
-            return null;
-        } else {
-            k = aint[0] / j;
-            int l1 = aint[1] / j;
-
-            l = aint[2] / j;
-            f = (float) i / (float) j;
-            f1 = (float) Math.max(k, Math.max(l1, l));
-            k = (int) ((float) k * f / f1);
-            l1 = (int) ((float) l1 * f / f1);
-            l = (int) ((float) l * f / f1);
-            i1 = (k << 8) + l1;
-            i1 = (i1 << 8) + l;
-            itemarmor.b(itemstack, i1);
-            return itemstack;
-        }
-    }
-
-    public int a() {
-        return 10;
-    }
-
-    public ItemStack b() {
-        return null;
-    }
-}