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

Move the default energy values to the init package

Browse source
This commit is contained in:
Pahimar 2014-06-22 14:02:15 -04:00
parent 1a0627eed5
commit c101a8f85e
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
View file

@ -1,6 +1,7 @@
package com.pahimar.ee3.exchange;
import com.google.common.collect.ImmutableSortedMap;
import com.pahimar.ee3.init.EnergyValues;
import com.pahimar.ee3.recipe.RecipeRegistry;
import com.pahimar.ee3.util.EnergyValueHelper;
import com.pahimar.ee3.util.LogHelper;
@ -39,7 +40,7 @@ public class EnergyValueRegistry
/*
* Default values
*/
Map<WrappedStack, EnergyValue> defaultValuesMap = EnergyDefaultValues.getDefaultValueMap();
Map<WrappedStack, EnergyValue> defaultValuesMap = EnergyValues.getValueMap();
for (WrappedStack keyStack : defaultValuesMap.keySet())
{
EnergyValue factoredExchangeEnergyValue = null;

22
src/main/java/com/pahimar/ee3/exchange/EnergyDefaultValues.java → src/main/java/com/pahimar/ee3/init/EnergyValues.java
View file

@ -1,6 +1,8 @@
package com.pahimar.ee3.exchange;
package com.pahimar.ee3.init;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.exchange.EnergyValue;
import com.pahimar.ee3.exchange.OreStack;
import com.pahimar.ee3.exchange.WrappedStack;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@ -10,29 +12,29 @@ import net.minecraftforge.oredict.OreDictionary;
import java.util.HashMap;
import java.util.Map;
public class EnergyDefaultValues
public class EnergyValues
{
private static EnergyDefaultValues energyDefaultValues = null;
private static EnergyValues energyValues = null;
private Map<WrappedStack, EnergyValue> valueMap;
private EnergyDefaultValues()
private EnergyValues()
{
valueMap = new HashMap<WrappedStack, EnergyValue>();
}
private static void lazyInit()
{
if (energyDefaultValues == null)
if (energyValues == null)
{
energyDefaultValues = new EnergyDefaultValues();
energyDefaultValues.init();
energyValues = new EnergyValues();
energyValues.init();
}
}
public static Map<WrappedStack, EnergyValue> getDefaultValueMap()
public static Map<WrappedStack, EnergyValue> getValueMap()
{
lazyInit();
return energyDefaultValues.valueMap;
return energyValues.valueMap;
}
private void init()