diff --git a/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java b/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java index d0558233..115b2041 100644 --- a/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java +++ b/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java @@ -226,4 +226,8 @@ public class AddonIndustrialCraft2 return null; } + + /*** + * TODO Investigate ways to scope out IC2 recipes and auto-add them + */ } diff --git a/src/main/java/com/pahimar/ee3/api/OreStack.java b/src/main/java/com/pahimar/ee3/api/OreStack.java index 4f0cfb7a..51f643bc 100644 --- a/src/main/java/com/pahimar/ee3/api/OreStack.java +++ b/src/main/java/com/pahimar/ee3/api/OreStack.java @@ -76,11 +76,12 @@ public class OreStack implements Comparable * * @return The OreStack that was encoded as json, or null if a valid OreStack could not be decoded from given String */ + @SuppressWarnings("unused") public static OreStack createFromJson(String jsonOreStack) { try { - return (OreStack) gsonSerializer.fromJson(jsonOreStack, OreStack.class); + return gsonSerializer.fromJson(jsonOreStack, OreStack.class); } catch (JsonSyntaxException exception) { @@ -99,6 +100,7 @@ public class OreStack implements Comparable * * @return Json serialized String of this OreStack */ + @SuppressWarnings("unused") public String toJson() { return gsonSerializer.toJson(this); diff --git a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java index f51f5f33..eaee76e3 100644 --- a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java +++ b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java @@ -126,6 +126,6 @@ public class RecipeMapping implements JsonSerializer, JsonDeseria @Override public String toString() { - return String.format("Output: %s, Input: %s", outputWrappedStack, inputWrappedStacks); + return String.format("RecipeMapping[Output: %s, Input: %s]", outputWrappedStack, inputWrappedStacks); } } diff --git a/src/main/java/com/pahimar/ee3/api/StackValueMapping.java b/src/main/java/com/pahimar/ee3/api/StackValueMapping.java index 3a2b17f2..d48028b2 100644 --- a/src/main/java/com/pahimar/ee3/api/StackValueMapping.java +++ b/src/main/java/com/pahimar/ee3/api/StackValueMapping.java @@ -93,7 +93,7 @@ public class StackValueMapping implements JsonSerializer, Jso emcValue = new EmcValue().deserialize(jsonStackValueMapping.get("emcValue").getAsJsonObject(), type, context); } - if (wrappedStack instanceof WrappedStack && emcValue instanceof EmcValue) + if (wrappedStack != null && emcValue != null) { return new StackValueMapping(wrappedStack, emcValue); } diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValue.java b/src/main/java/com/pahimar/ee3/emc/EmcValue.java index 06b249bd..c23551e1 100644 --- a/src/main/java/com/pahimar/ee3/emc/EmcValue.java +++ b/src/main/java/com/pahimar/ee3/emc/EmcValue.java @@ -1,6 +1,7 @@ package com.pahimar.ee3.emc; import com.google.gson.*; +import com.pahimar.ee3.helper.LogHelper; import com.pahimar.ee3.lib.Compare; import java.lang.reflect.Type; @@ -17,7 +18,6 @@ import java.util.List; */ public class EmcValue implements Comparable, JsonDeserializer, JsonSerializer { - // Gson serializer for serializing to/deserializing from json private static final Gson gsonSerializer = (new GsonBuilder()).registerTypeAdapter(EmcValue.class, new EmcValue()).create(); @@ -25,44 +25,37 @@ public class EmcValue implements Comparable, JsonDeserializer, JsonDeserializer, JsonDeserializer collateComponents(List uncollatedComponents) { - Integer[] componentCount = new Integer[EmcType.TYPES.length]; for (EmcComponent emcComponent : uncollatedComponents) @@ -245,7 +240,6 @@ public class EmcValue implements Comparable, JsonDeserializer, JsonDeserializer alchemicalDustStacks = new ArrayList(); + for (int meta = 0; meta < ALCHEMICAL_DUST_NAMES.length; meta++) + { + alchemicalDustStacks.add(new ItemStack(ModItems.alchemicalDust, 1, meta)); + } + return alchemicalDustStacks; } } diff --git a/src/main/java/com/pahimar/ee3/item/ModItems.java b/src/main/java/com/pahimar/ee3/item/ModItems.java index 7c2ac6d5..e9668b89 100644 --- a/src/main/java/com/pahimar/ee3/item/ModItems.java +++ b/src/main/java/com/pahimar/ee3/item/ModItems.java @@ -17,13 +17,13 @@ import net.minecraft.item.ItemStack; public class ModItems { // Mod item instances - public static Item miniumShard; - public static Item inertStone; - public static Item miniumStone; - public static Item philStone; - public static Item alchemicalDust; - public static Item alchemicalBag; - public static Item alchemicalChalk; + public static ItemEE miniumShard; + public static ItemEE inertStone; + public static ItemEE miniumStone; + public static ItemEE philStone; + public static ItemEE alchemicalDust; + public static ItemEE alchemicalBag; + public static ItemEE alchemicalChalk; public static void init() { diff --git a/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java b/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java index 9bf38f0c..d09d3dde 100644 --- a/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java +++ b/src/main/java/com/pahimar/ee3/recipe/CalcinationManager.java @@ -2,6 +2,9 @@ package com.pahimar.ee3.recipe; import com.pahimar.ee3.emc.EmcRegistry; import com.pahimar.ee3.emc.EmcValue; +import com.pahimar.ee3.helper.ItemHelper; +import com.pahimar.ee3.helper.LogHelper; +import com.pahimar.ee3.item.ModItems; import net.minecraft.item.ItemStack; import java.util.ArrayList; @@ -24,7 +27,11 @@ public class CalcinationManager if (emcValue != null) { - // TODO The magic happens here + // TODO Get EmcValue of itemStack, add it list of EmcValues of the different dusts, sort it, determine position, and determine result from that + for (ItemStack alchemicalDustStack : ModItems.alchemicalDust.getSubTypes()) + { + LogHelper.debug(ItemHelper.toString(alchemicalDustStack)); + } } return calcinationResults;