1 files changed, 32 insertions, 4 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/EMC.java b/src/main/java/lv/enes/mc/eris_alchemy/EMC.java
index e34d28f..3ff33ca 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/EMC.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/EMC.java
@@ -16,6 +16,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import vazkii.patchouli.common.item.PatchouliItems;
 
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -62,6 +63,11 @@ public class EMC {
         private static final EMC defaultInstance = new EMC(null);
         private static final Map<Level, EMC> instances = Collections.synchronizedMap(new WeakHashMap<>());
 
+        private static final DecimalFormat formatter = new DecimalFormat("0");
+        static {
+                formatter.setMaximumFractionDigits(1);
+        }
+
         public static EMC getInstance(Level world) {
                 if (world == null) {
                         return defaultInstance;
@@ -76,6 +82,10 @@ public class EMC {
                 return instance;
         }
 
+        public static String formatEmc(double value) {
+                return formatter.format(value);
+        }
+
         private final Map<Item, Double> data;
 
         private EMC(@Nullable Level world) {
@@ -91,10 +101,9 @@ public class EMC {
                                                 .forEach(holder -> data.putIfAbsent(holder.value().asItem(), emcValue))
                 );
 
-                ErisAlchemy.LOGGER.info("Getting recipes...");
+                ErisAlchemy.LOGGER.info("Calculating EMC values...");
                 var recipes = getRecipes(world);
                 var configured = new HashSet<>(data.keySet());
-                ErisAlchemy.LOGGER.info("Calculating EMC values...");
                 BuiltInRegistries.ITEM.forEach(item -> {
                         configEmc(recipes, configured, item);
                         if (world != null && !data.containsKey(item)) {
@@ -103,11 +112,30 @@ public class EMC {
                 });
         }
 
-        public OptionalDouble get(Item item) {
+        public OptionalDouble get(ItemStack stack) {
+                if (stack.isEmpty()) {
+                        return OptionalDouble.empty();
+                }
+
+                var item = stack.getItem();
                 var value = data.get(item);
                 if (value == null || value <= 0) {
                         return OptionalDouble.empty();
                 }
+
+                EmcStorage storage = null;
+                if (item instanceof EmcStorage emcStorage) {
+                        storage = emcStorage;
+                } else if (item instanceof BlockItem blockItem) {
+                        if (blockItem.getBlock() instanceof EmcStorage emcStorage) {
+                                storage = emcStorage;
+                        }
+                }
+
+                if (storage != null) {
+                        value += storage.getStoredEmc(stack);
+                }
+
                 return OptionalDouble.of(value);
         }
 
@@ -134,7 +162,7 @@ public class EMC {
         }
 
         private OptionalDouble configEmc(List<SimplifiedRecipe> recipes, Set<Item> configured, Item item) {
-                var res = get(item);
+                var res = get(item.getDefaultInstance());
                 if (res.isPresent() || configured.contains(item)) {
                         return res;
                 }