diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/RecipeArmorDye.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/RecipeArmorDye.java')
-rw-r--r-- | src/main/java/net/minecraft/server/RecipeArmorDye.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/RecipeArmorDye.java b/src/main/java/net/minecraft/server/RecipeArmorDye.java index 0663e120..13bb7082 100644 --- a/src/main/java/net/minecraft/server/RecipeArmorDye.java +++ b/src/main/java/net/minecraft/server/RecipeArmorDye.java @@ -6,7 +6,7 @@ public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // Cra // CraftBukkit start - Delegate to new parent class with bogus info public RecipeArmorDye() { - super(new ItemStack(Item.LEATHER_HELMET, 0, 0), java.util.Arrays.asList(new ItemStack(Item.INK_SACK, 0, 5))); + super(new ItemStack(Items.LEATHER_HELMET, 0, 0), java.util.Arrays.asList(new ItemStack(Items.INK_SACK, 0, 5))); } // CraftBukkit end @@ -21,13 +21,13 @@ public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // Cra if (itemstack1.getItem() instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor) itemstack1.getItem(); - if (itemarmor.d() != EnumArmorMaterial.CLOTH || itemstack != null) { + if (itemarmor.m_() != EnumArmorMaterial.CLOTH || itemstack != null) { return false; } itemstack = itemstack1; } else { - if (itemstack1.id != Item.INK_SACK.id) { + if (itemstack1.getItem() != Items.INK_SACK) { return false; } @@ -58,13 +58,13 @@ public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // Cra if (itemstack1 != null) { if (itemstack1.getItem() instanceof ItemArmor) { itemarmor = (ItemArmor) itemstack1.getItem(); - if (itemarmor.d() != EnumArmorMaterial.CLOTH || itemstack != null) { + if (itemarmor.m_() != EnumArmorMaterial.CLOTH || itemstack != null) { return null; } itemstack = itemstack1.cloneItemStack(); itemstack.count = 1; - if (itemarmor.a(itemstack1)) { + if (itemarmor.c_(itemstack1)) { l = itemarmor.b(itemstack); f = (float) (l >> 16 & 255) / 255.0F; f1 = (float) (l >> 8 & 255) / 255.0F; @@ -77,11 +77,11 @@ public class RecipeArmorDye extends ShapelessRecipes implements IRecipe { // Cra ++j; } } else { - if (itemstack1.id != Item.INK_SACK.id) { + if (itemstack1.getItem() != Items.INK_SACK) { return null; } - float[] afloat = EntitySheep.bp[BlockCloth.j_(itemstack1.getData())]; + float[] afloat = EntitySheep.bp[BlockCloth.b(itemstack1.getData())]; int j1 = (int) (afloat[0] * 255.0F); int k1 = (int) (afloat[1] * 255.0F); |