From 182681e384a1f7e4b6944ad5c6eda0710fb1bff9 Mon Sep 17 00:00:00 2001
From: Wesley Wolfe <weswolf@aol.com>
Date: Sat, 5 Jan 2013 16:45:34 -0600
Subject: [PATCH] Update calls to DyeColor getData and getByData. Addresses
 BUKKIT-2786

These two methods are now deprecated and replaced by the strictly
equivalent calls using wool data.
---
 src/main/java/net/minecraft/server/ItemDye.java             | 2 +-
 src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java | 4 ++--
 src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java  | 4 ++--
 src/test/java/org/bukkit/DyeColorsTest.java                 | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index 75cbf7de25..b93421af64 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -188,7 +188,7 @@ public class ItemDye extends Item {
                     return false;
                 }
 
-                i = (byte) event.getColor().getData();
+                i = (byte) event.getColor().getWoolData();
                 // CraftBukkit end
 
                 entitysheep.setColor(i);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
index 46f8ef0a57..81b938a210 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
@@ -13,11 +13,11 @@ public class CraftSheep extends CraftAnimals implements Sheep {
     }
 
     public DyeColor getColor() {
-        return DyeColor.getByData((byte) getHandle().getColor());
+        return DyeColor.getByWoolData((byte) getHandle().getColor());
     }
 
     public void setColor(DyeColor color) {
-        getHandle().setColor(color.getData());
+        getHandle().setColor(color.getWoolData());
     }
 
     public boolean isSheared() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
index e266c98a92..3d0e7cb5b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
@@ -30,10 +30,10 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
     }
 
     public DyeColor getCollarColor() {
-        return DyeColor.getByData((byte) getHandle().getCollarColor());
+        return DyeColor.getByWoolData((byte) getHandle().getCollarColor());
     }
 
     public void setCollarColor(DyeColor color) {
-        getHandle().setCollarColor(color.getData());
+        getHandle().setCollarColor(color.getWoolData());
     }
 }
diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
index 8b2e8a7c0c..7d45d2ff5b 100644
--- a/src/test/java/org/bukkit/DyeColorsTest.java
+++ b/src/test/java/org/bukkit/DyeColorsTest.java
@@ -33,7 +33,7 @@ public class DyeColorsTest extends AbstractTestingBase {
     @Test
     public void checkColor() {
         Color color = dye.getColor();
-        float[] nmsColorArray = EntitySheep.d[dye.getData()];
+        float[] nmsColorArray = EntitySheep.d[dye.getWoolData()];
         Color nmsColor = Color.fromRGB((int) (nmsColorArray[0] * 255), (int) (nmsColorArray[1] * 255), (int) (nmsColorArray[2] * 255));
         assertThat(color, is(nmsColor));
     }
@@ -41,7 +41,7 @@ public class DyeColorsTest extends AbstractTestingBase {
     @Test
     public void checkFireworkColor() {
         Color color = dye.getFireworkColor();
-        int nmsColor = ItemDye.b[dye.getData()];
+        int nmsColor = ItemDye.b[dye.getWoolData()];
         assertThat(color, is(Color.fromRGB(nmsColor)));
     }
 }