#635 NEI showing invalid recipes for the Allot Smelter

This commit is contained in:
CrazyPants committed 2014-05-02 18:12:33 +08:00
1 parent 2110caeb45
commit ce361a7b92
4 files changed
+6 -22

No files matched your search

@@ -22,7 +22,6 @@ public class MachineRecipes {
public static void addRecipes() {
//Common ingredients
ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal());
ItemStack silicon = new ItemStack(EnderIO.itemMaterial, 4, Material.SILICON.ordinal());
ItemStack capacitor = new ItemStack(itemBasicCapacitor, 1, 0);
ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal());
ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
@@ -12,10 +12,7 @@ import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace;
import crazypants.enderio.ModObject;
import crazypants.enderio.crafting.IEnderIoRecipe;
import crazypants.enderio.crafting.IRecipeInput;
import crazypants.enderio.crafting.IRecipeOutput;
import crazypants.enderio.crafting.impl.EnderIoRecipe;
import crazypants.enderio.crafting.impl.RecipeOutput;
import crazypants.enderio.machine.IMachineRecipe;
import crazypants.enderio.machine.MachineRecipeInput;
import crazypants.enderio.machine.recipe.RecipeInput;
@@ -165,18 +162,9 @@ public class VanillaSmeltingRecipe implements IMachineRecipe {
return Collections.emptyList();
}
List<IEnderIoRecipe> result = new ArrayList<IEnderIoRecipe>();
// Map<List<Integer>, ItemStack> metaList = FurnaceRecipes.smelting().getMetaSmeltingList();
// for (Entry<List<Integer>, ItemStack> entry : metaList.entrySet()) {
// List<Integer> idMeta = entry.getKey();
// IRecipeInput input = new crazypants.enderio.crafting.impl.RecipeInput(new ItemStack(idMeta.get(0), 1, idMeta.get(1)), false);
// IRecipeOutput output = new RecipeOutput(entry.getValue());
// result.add(new EnderIoRecipe(IEnderIoRecipe.ALLOY_SMELTER_ID, MJ_PER_ITEM, input, output));
// }
Map<Integer, ItemStack> sl = FurnaceRecipes.smelting().getSmeltingList();
for (Entry<Integer, ItemStack> entry : sl.entrySet()) {
IRecipeInput input = new crazypants.enderio.crafting.impl.RecipeInput(new ItemStack(entry.getValue().getItem(), 1, 0), false);
IRecipeOutput output = new RecipeOutput(entry.getValue());
result.add(new EnderIoRecipe(IEnderIoRecipe.ALLOY_SMELTER_ID, MJ_PER_ITEM, input, output));
Map<ItemStack, ItemStack> metaList = FurnaceRecipes.smelting().getSmeltingList();
for (Entry<ItemStack, ItemStack> entry : metaList.entrySet()) {
result.add(new EnderIoRecipe(IEnderIoRecipe.ALLOY_SMELTER_ID, MJ_PER_ITEM, entry.getKey(), entry.getValue()));
}
return result;
}
@@ -45,7 +45,6 @@ public class MaterialRecipes {
ItemStack conduitBinder = new ItemStack(EnderIO.itemMaterial, 4, Material.CONDUIT_BINDER.ordinal());
ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
ItemStack binderComposite = new ItemStack(EnderIO.itemMaterial, 1, Material.BINDER_COMPOSITE.ordinal());
ItemStack industrialBinder = new ItemStack(EnderIO.itemMaterial, 1, Material.CONDUIT_BINDER.ordinal());
ItemStack fusedQuartzFrame = new ItemStack(EnderIO.itemFusedQuartzFrame, 1, 0);
ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal());
@@ -74,10 +74,8 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
{
List<IEnderIoRecipe> recipes = RecipeReigistry.instance.getRecipesForCrafter(IEnderIoRecipe.ALLOY_SMELTER_ID);
for (IEnderIoRecipe recipe : recipes) {
for (IRecipeOutput output : recipe.getOutputs()) {
AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getRequiredEnergy(), recipe.getInputs(), output.getItem());
arecipes.add(res);
}
AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getRequiredEnergy(), recipe.getInputs(), recipe.getOutputs().get(0).getItem());
arecipes.add(res);
}
} else {
super.loadCraftingRecipes(outputId, results);
@@ -90,7 +88,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler {
List<IEnderIoRecipe> recipes = RecipeReigistry.instance.getRecipesForCrafter(IEnderIoRecipe.ALLOY_SMELTER_ID);
for (IEnderIoRecipe recipe : recipes) {
if (recipe.isInput(ingredient)) {
if(recipe.isInput(ingredient)) {
for (IRecipeOutput output : recipe.getOutputs()) {
AlloySmelterRecipe res = new AlloySmelterRecipe(recipe.getRequiredEnergy(), recipe.getInputs(), output.getItem());
res.setIngredientPermutation(res.input, ingredient);