From b59fe4f64bcdcf4595e7ccb639d873d581c471ae Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Wed, 10 Jun 2015 07:47:22 -0400
Subject: [PATCH] Didn't even think to deprecated Enum entries - doh

---
 .../ee3/api/exchange/EnergyValueRegistryProxy.java  | 13 +++++++++++++
 .../pahimar/ee3/exchange/EnergyValueRegistry.java   |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java
index cf61d154..82c47d3d 100644
--- a/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java
+++ b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java
@@ -177,9 +177,22 @@ public final class EnergyValueRegistryProxy
 
     public enum Phase
     {
+        /**
+         * @Deprecated Use PRE_CALCULATION instead
+         */
+        @Deprecated PRE_ASSIGNMENT,
+
         PRE_CALCULATION,
+
+        /**
+         * @Deprecated Use POST_CALCULATION instead
+         */
+        @Deprecated POST_ASSIGNMENT,
+
         POST_CALCULATION,
+
         RUNTIME,
+
         ALL
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
index 2d9cf787..51df1939 100644
--- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
@@ -137,11 +137,11 @@ public class EnergyValueRegistry implements JsonSerializer<EnergyValueRegistry>,
 
     public EnergyValue getEnergyValue(EnergyValueRegistryProxy.Phase phase, Object object, boolean strict)
     {
-        if (phase == EnergyValueRegistryProxy.Phase.PRE_CALCULATION)
+        if (phase == EnergyValueRegistryProxy.Phase.PRE_ASSIGNMENT || phase == EnergyValueRegistryProxy.Phase.PRE_CALCULATION)
         {
             return getEnergyValueFromMap(preCalculationMappings, object, strict);
         }
-        else if (phase == EnergyValueRegistryProxy.Phase.POST_CALCULATION)
+        else if (phase == EnergyValueRegistryProxy.Phase.POST_ASSIGNMENT || phase == EnergyValueRegistryProxy.Phase.POST_CALCULATION)
         {
             return getEnergyValueFromMap(postCalculationMappings, object, strict);
         }
@@ -832,14 +832,14 @@ public class EnergyValueRegistry implements JsonSerializer<EnergyValueRegistry>,
     public void dumpEnergyValueRegistryToLog(EnergyValueRegistryProxy.Phase phase)
     {
         LogHelper.info(String.format("BEGIN DUMPING %s ENERGY VALUE MAPPINGS", phase));
-        if (phase == EnergyValueRegistryProxy.Phase.PRE_CALCULATION)
+        if (phase == EnergyValueRegistryProxy.Phase.PRE_ASSIGNMENT || phase == EnergyValueRegistryProxy.Phase.PRE_CALCULATION)
         {
             for (WrappedStack wrappedStack : this.preCalculationMappings.keySet())
             {
                 LogHelper.info(String.format("- Object: %s, Value: %s", wrappedStack, EnergyValueRegistry.getInstance().getStackValueMap().get(wrappedStack)));
             }
         }
-        else if (phase == EnergyValueRegistryProxy.Phase.POST_CALCULATION)
+        else if (phase == EnergyValueRegistryProxy.Phase.POST_ASSIGNMENT || phase == EnergyValueRegistryProxy.Phase.POST_CALCULATION)
         {
             if (this.postCalculationMappings != null)
             {