From 5a9dd423451356bfbfde50c2f1dae29a5cdce312 Mon Sep 17 00:00:00 2001
From: Nonoriri <imafoodus@gmail.com>
Date: Sun, 24 Nov 2013 02:28:04 -0500
Subject: [PATCH] Fixed dye colors being displayed incorrectly. Added high
 efficiency recipes for coloring wool (8 white wool around dye). Vanilla
 recipes for coloring wool disabled.

---
 BankEconomyMod/src/me/kaZep/Base/Main.java         | 14 ++++++++++++++
 .../src/me/kaZep/Base/PlayerListener.java          | 12 +++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/BankEconomyMod/src/me/kaZep/Base/Main.java b/BankEconomyMod/src/me/kaZep/Base/Main.java
index 5cecf51..9f523bf 100644
--- a/BankEconomyMod/src/me/kaZep/Base/Main.java
+++ b/BankEconomyMod/src/me/kaZep/Base/Main.java
@@ -23,6 +23,7 @@ import java.text.*;
 import me.kaZep.Commands.JobsDataInfo;
 import me.kaZep.Commands.commandBankEconomy;
 import net.milkbowl.vault.economy.Economy;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
@@ -64,6 +65,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.map.MapRenderer;
 import org.bukkit.map.MapView;
+import org.bukkit.material.MaterialData;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -431,6 +433,18 @@ public class Main extends JavaPlugin
     fireproof_wood_slab.setIngredient('b', Material.WOOD_STEP);
     Bukkit.addRecipe(fireproof_wood_slab);
     
+    // Add high efficiency recipes for wool
+    // White
+    ShapedRecipe woolRecipe;
+    
+    for (int i = 0; i < 16; i++) {
+	    woolRecipe = new ShapedRecipe(new ItemStack(Material.WOOL, 8, (short) i));
+	    woolRecipe.shape("aaa","aba", "aaa");
+	    woolRecipe.setIngredient('a', Material.WOOL);
+	    woolRecipe.setIngredient('b', new MaterialData(Material.INK_SACK, (byte) (15 - i)));
+	    Bukkit.addRecipe(woolRecipe);
+    }
+    
     // Add Recipes for Item cube crafting.
     ItemStack temp = new ItemStack(Material.CHEST);
     ItemMeta tempmeta = temp.getItemMeta();
diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
index 078f825..1a75e70 100644
--- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
+++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
@@ -4066,6 +4066,12 @@ implements Listener
 		// Disable melon crafting recipe
 		if (result.getResult().getType()==Material.MELON_BLOCK) {
 			result.setResult(new ItemStack(Material.AIR));
+			return;
+		}
+
+		if (result.getResult().getType()==Material.WOOL && result.getResult().getAmount() == 1) {
+			result.setResult(new ItemStack(Material.AIR));
+			return;
 		}
 
 		// Increase stairs recipe efficiency
@@ -12898,13 +12904,13 @@ implements Listener
 				color = "Light Blue";
 			}break;
 			case 13:{
-				color = "Green";
+				color = "Magenta";
 			}break;
 			case 14:{
-				color = "Red";
+				color = "Orange";
 			}break;
 			case 15:{
-				color = "Black";
+				color = "White";
 			}break;
 			}
 		} else {