From 2bed1e81ac1d5aa6b32b9c59af30d078a6864256 Mon Sep 17 00:00:00 2001
From: Pahimar <pahimar@gmail.com>
Date: Sun, 22 May 2016 23:28:30 -0400
Subject: [PATCH] Closes #1055

---
 .../java/com/pahimar/ee3/handler/WorldEventHandler.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java b/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java
index e039b018..ba510b0d 100644
--- a/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/WorldEventHandler.java
@@ -23,7 +23,12 @@ public class WorldEventHandler {
             AludelRecipeManager.registerRecipes();
 
             long startTime = System.nanoTime();
-            EnergyValueRegistry.INSTANCE.compute();
+            if (ConfigurationHandler.Settings.regenerateEnergyValuesWhen.equalsIgnoreCase("As Needed")) {
+                EnergyValueRegistry.INSTANCE.load();
+            }
+            else {
+                EnergyValueRegistry.INSTANCE.compute();
+            }
             LogHelper.info(EnergyValueRegistry.ENERGY_VALUE_MARKER, "Energy value system initialized {} values after {} ms", EnergyValueRegistry.INSTANCE.getEnergyValues().size(), (System.nanoTime() - startTime) / 100000);
             hasInitilialized = true;