From 6dee38c4e1b664ff81123d94b905d26907025565 Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Sat, 21 Dec 2013 22:03:32 -0500
Subject: [PATCH] Some more work on the CalcinationManager

---
 .../com/pahimar/ee3/EquivalentExchange3.java  |  2 -
 .../java/com/pahimar/ee3/emc/EmcValue.java    |  4 +-
 .../com/pahimar/ee3/emc/EmcValuesDefault.java |  2 +-
 .../pahimar/ee3/item/ItemAlchemicalDust.java  | 10 +--
 .../ee3/recipe/CalcinationManager.java        | 69 +++++++++++++++++--
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
index 8e70e0de..e94f2587 100644
--- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
+++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
@@ -6,7 +6,6 @@ import com.pahimar.ee3.command.CommandHandler;
 import com.pahimar.ee3.configuration.ConfigurationHandler;
 import com.pahimar.ee3.creativetab.CreativeTabEE3;
 import com.pahimar.ee3.handler.*;
-import com.pahimar.ee3.helper.DebugHelper;
 import com.pahimar.ee3.helper.FluidHelper;
 import com.pahimar.ee3.helper.LogHelper;
 import com.pahimar.ee3.helper.VersionHelper;
@@ -164,7 +163,6 @@ public class EquivalentExchange3
     public void postInit(FMLPostInitializationEvent event)
     {
         // NOOP
-        DebugHelper.printEmcValueToStackMappings();
     }
 
     @EventHandler
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValue.java b/src/main/java/com/pahimar/ee3/emc/EmcValue.java
index 7a19fb47..72759491 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcValue.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcValue.java
@@ -259,13 +259,13 @@ public class EmcValue implements Comparable<EmcValue>, JsonDeserializer<EmcValue
 
             for (EmcType emcType : EmcType.TYPES)
             {
-                if (Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]) != 0)
+                if (Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]) != Compare.EQUALS)
                 {
                     return Float.compare(first[emcType.ordinal()], second[emcType.ordinal()]);
                 }
             }
 
-            return 0;
+            return Compare.EQUALS;
         }
         else
         {
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java b/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
index 67a67d44..f637531f 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
@@ -184,7 +184,7 @@ public class EmcValuesDefault
         valueMap.put(new WrappedStack(Item.netherQuartz), new EmcValue(256));
         
         /* Equivalent Exchange 3 */
-        valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 0)), new EmcValue(0.001f));
+        valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 0)), new EmcValue(1));
         valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 1)), new EmcValue(256));
         valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 2)), new EmcValue(2048));
         valueMap.put(new WrappedStack(new ItemStack(ModItems.alchemicalDust, 1, 3)), new EmcValue(8192));
diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
index ff6ac49e..6622bf78 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
@@ -24,7 +24,7 @@ import java.util.List;
  */
 public class ItemAlchemicalDust extends ItemEE
 {
-    public static final String[] ALCHEMICAL_DUST_NAMES = {"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
+    public static final String[] ALCHEMICAL_DUST_NAMES = {"Ash", "Verdant", "Azure", "Minium", "Amaranthine", "Iridescent"};
     public static final EmcValue[] DEFAULT_EMC_VALUES = {
             new EmcValue(1),
             new EmcValue(256),
@@ -91,19 +91,19 @@ public class ItemAlchemicalDust extends ItemEE
             }
             case 1:
             {
-                return EnumChatFormatting.WHITE + super.getItemDisplayName(itemStack);
+                return EnumChatFormatting.GREEN + super.getItemDisplayName(itemStack);
             }
             case 2:
             {
-                return EnumChatFormatting.GREEN + super.getItemDisplayName(itemStack);
+                return EnumChatFormatting.BLUE + super.getItemDisplayName(itemStack);
             }
             case 3:
             {
-                return EnumChatFormatting.BLUE + super.getItemDisplayName(itemStack);
+                return EnumChatFormatting.RED + super.getItemDisplayName(itemStack);
             }
             case 4:
             {
-                return EnumChatFormatting.DARK_PURPLE + super.getItemDisplayName(itemStack);
+                return EnumChatFormatting.LIGHT_PURPLE + super.getItemDisplayName(itemStack);
             }
             case 5:
             {
diff --git a/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java b/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java
index ef85d1c5..9d900242 100644
--- a/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java
+++ b/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java
@@ -2,6 +2,7 @@ package com.pahimar.ee3.recipe;
 
 import com.pahimar.ee3.emc.EmcRegistry;
 import com.pahimar.ee3.emc.EmcValue;
+import com.pahimar.ee3.helper.LogHelper;
 import com.pahimar.ee3.item.ModItems;
 import com.pahimar.ee3.lib.Compare;
 import net.minecraft.item.ItemStack;
@@ -21,9 +22,9 @@ public class CalcinationManager
 {
     // Helper stacks
     private static ItemStack ASH_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 0);
-    private static ItemStack MINIUM_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 1);
-    private static ItemStack VERDANT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 2);
-    private static ItemStack AZURE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 3);
+    private static ItemStack VERDANT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 1);
+    private static ItemStack AZURE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 2);
+    private static ItemStack MINIUM_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 3);
     private static ItemStack AMARANTHINE_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 4);
     private static ItemStack IRIDESCENT_DUST_STACK = new ItemStack(ModItems.alchemicalDust.itemID, 1, 5);
 
@@ -36,19 +37,73 @@ public class CalcinationManager
         EmcValue emcValue = EmcRegistry.getInstance().getEmcValue(itemStack);
 
         EmcValue ashEmcValue = EmcRegistry.getInstance().getEmcValue(ASH_DUST_STACK);
-        EmcValue miniumEmcValue = EmcRegistry.getInstance().getEmcValue(MINIUM_DUST_STACK);
         EmcValue verdantEmcValue = EmcRegistry.getInstance().getEmcValue(VERDANT_DUST_STACK);
         EmcValue azureEmcValue = EmcRegistry.getInstance().getEmcValue(AZURE_DUST_STACK);
+        EmcValue miniumEmcValue = EmcRegistry.getInstance().getEmcValue(MINIUM_DUST_STACK);
         EmcValue amarathineEmcValue = EmcRegistry.getInstance().getEmcValue(AMARANTHINE_DUST_STACK);
         EmcValue iridescentEmcValue = EmcRegistry.getInstance().getEmcValue(IRIDESCENT_DUST_STACK);
 
         if (emcValue != null)
         {
-            if (Float.compare(emcValue.getValue(), ashEmcValue.getValue()) <= Compare.EQUALS)
+            if (emcValue.compareTo(ashEmcValue) < Compare.EQUALS)
             {
-
+                LogHelper.debug("1");
+            }
+            else if (emcValue.equals(ashEmcValue))
+            {
+                LogHelper.debug("1");
+                calcinationResults.add(ASH_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(ashEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(verdantEmcValue) == Compare.LESSER_THAN)
+            {
+                LogHelper.debug("1,2");
+            }
+            else if (emcValue.equals(verdantEmcValue))
+            {
+                LogHelper.debug("2");
+                calcinationResults.add(VERDANT_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(verdantEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(azureEmcValue) == Compare.LESSER_THAN)
+            {
+                LogHelper.debug("2,3");
+            }
+            else if (emcValue.equals(azureEmcValue))
+            {
+                LogHelper.debug("3");
+                calcinationResults.add(AZURE_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(azureEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(miniumEmcValue) == Compare.LESSER_THAN)
+            {
+                LogHelper.debug("3,4");
+            }
+            else if (emcValue.equals(miniumEmcValue))
+            {
+                LogHelper.debug("4");
+                calcinationResults.add(MINIUM_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(miniumEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(amarathineEmcValue) == Compare.LESSER_THAN)
+            {
+                LogHelper.debug("4,5");
+            }
+            else if (emcValue.equals(amarathineEmcValue))
+            {
+                LogHelper.debug("5");
+                calcinationResults.add(AMARANTHINE_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(amarathineEmcValue) == Compare.GREATER_THAN && emcValue.compareTo(iridescentEmcValue) == Compare.LESSER_THAN)
+            {
+                LogHelper.debug("5,6");
+            }
+            else if (emcValue.equals(iridescentEmcValue))
+            {
+                LogHelper.debug("6");
+                calcinationResults.add(IRIDESCENT_DUST_STACK.copy());
+            }
+            else if (emcValue.compareTo(iridescentEmcValue) == Compare.GREATER_THAN)
+            {
+                LogHelper.debug("6");
+                calcinationResults.add(IRIDESCENT_DUST_STACK.copy());
             }
-            else if
         }
         else
         {