Work towards https://github.com/TechReborn/TechReborn/issues/1614 still need to move all the other recipes that need it to use the ore dict

This commit is contained in:
modmuss50 2018-10-07 21:20:18 +01:00
parent 0dae241e38
commit 66e60655bf
2 changed files with 8 additions and 4 deletions

View file

@ -29,6 +29,7 @@ import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.recipes.IRecipeInput;
import techreborn.api.recipe.BaseRecipe; import techreborn.api.recipe.BaseRecipe;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@ -57,6 +58,8 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> implements IRecipe
} }
} else if (input instanceof String) { } else if (input instanceof String) {
inputs.add(OreDictionary.getOres((String) input)); inputs.add(OreDictionary.getOres((String) input));
} else if (input instanceof IRecipeInput){
inputs.add(((IRecipeInput) input).getAllStacks());
} }
} }
for (ItemStack input : baseRecipe.getOutputs()) { for (ItemStack input : baseRecipe.getOutputs()) {

View file

@ -28,6 +28,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
import reborncore.common.recipes.OreRecipeInput;
import reborncore.common.util.OreUtil; import reborncore.common.util.OreUtil;
import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.api.recipe.machines.AlloySmelterRecipe;
import techreborn.items.ingredients.ItemDusts; import techreborn.items.ingredients.ItemDusts;
@ -42,16 +43,16 @@ public class AlloySmelterRecipes extends RecipeMethods {
public static void init() { public static void init() {
// Bronze // Bronze
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("tin", 1), new AlloySmelterRecipe(new OreRecipeInput("ingotCopper", 3), "ingotTin",
ItemIngots.getIngotByName("bronze", 4), 200, 16)); ItemIngots.getIngotByName("bronze", 4), 200, 16));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("tin", 1), new AlloySmelterRecipe(new OreRecipeInput("ingotCopper", 3), "dustTin",
ItemIngots.getIngotByName("bronze", 4), 200, 16)); ItemIngots.getIngotByName("bronze", 4), 200, 16));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemIngots.getIngotByName("tin", 1), new AlloySmelterRecipe(new OreRecipeInput("dustCopper", 3), "ingotTin",
ItemIngots.getIngotByName("bronze", 4), 200, 16)); ItemIngots.getIngotByName("bronze", 4), 200, 16));
RecipeHandler.addRecipe( RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemDusts.getDustByName("copper", 3), ItemDusts.getDustByName("tin", 1), new AlloySmelterRecipe(new OreRecipeInput("dustCopper", 3), "dustTin",
ItemIngots.getIngotByName("bronze", 4), 200, 16)); ItemIngots.getIngotByName("bronze", 4), 200, 16));
// Electrum // Electrum