Anvilcraft
/
equivalent-exchange-3
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Didn't even think to deprecated Enum entries - doh

This commit is contained in:
pahimar 2015-06-10 07:47:22 -04:00
parent a196413c20
commit b59fe4f64b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java
View File

@ -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
}
}

8
src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
View File

@ -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)
{