diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index e458e4f..f93fd1a 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -2,21 +2,22 @@ package singulariteam.eternalsingularity.proxy; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.crafting.Grinder; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.oredict.ShapelessOreRecipe; import singulariteam.eternalsingularity.EternalSingularityItem; import singulariteam.eternalsingularity.EternalSingularityMod; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import static fox.spiteful.avaritia.Config.craftingOnly; public class CommonProxy { - final List classList = new ArrayList<>(); + public static final ShapelessOreRecipe eternalSingularityRecipe = new ShapelessOreRecipe(EternalSingularityItem.instance); + private static final Set classSet = new HashSet<>(); public CommonProxy() {} @@ -31,7 +32,7 @@ public class CommonProxy }, "here is the absolute class name of the Item Classes that must be removed from Infinity Catalyst recipe and inserted into Eternal Singularity.")); for (final String className : classNameList) { try { - classList.add(Class.forName(className)); + classSet.add(Class.forName(className)); } catch (ClassNotFoundException e) { EternalSingularityMod.logger.warn("Couldn't find " + className); } @@ -45,6 +46,16 @@ public class CommonProxy { if (craftingOnly) return; - Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance, 1)); + for (final Iterator catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext();) { + final Object input = catalystRecipeIterator.next(); + if (!(input instanceof ItemStack)) + continue; + final Item item = ((ItemStack) input).getItem(); + if (item != null && classSet.contains(item.getClass())) { + catalystRecipeIterator.remove(); + eternalSingularityRecipe.getInput().add(((ItemStack) input).copy()); + } + } + Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance)); } } \ No newline at end of file