diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java index 5e7318b92..41a386a95 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java @@ -135,15 +135,13 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { ArrayList> productsF = new ArrayList<>(); productsF.add(new Pair<>(type.primary1,12)); productsF.add(new Pair<>(type.primary2,6)); - productsF.add(new Pair<>(type.byproductAcid1,3)); - productsF.add(new Pair<>(type.byproductAcid2,3)); + productsF.add(new Pair<>(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type), 3)); recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_FIRST, type)), makeBedrockOreProduct(productsF)); ArrayList> productsS = new ArrayList<>(); productsS.add(new Pair<>(type.primary1,6)); productsS.add(new Pair<>(type.primary2,12)); - productsS.add(new Pair<>(type.byproductAcid2,3)); - productsS.add(new Pair<>(type.byproductAcid3,3)); + productsS.add(new Pair<>(ItemBedrockOreNew.make(BedrockOreGrade.CRUMBS, type),3)); recipes.put(new ComparableStack(ItemBedrockOreNew.make(BedrockOreGrade.PRIMARY_SECOND, type)), makeBedrockOreProduct(productsS)); diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java index 3e1d949de..4aaedb620 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java +++ b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java @@ -169,8 +169,11 @@ public class ItemBedrockOreNew extends Item { List billets = OreDictionary.getOres(frame.billet(), false); if(!billets.isEmpty()) return fromList(billets, amount); List ingots = OreDictionary.getOres(frame.ingot(), false); if(!ingots.isEmpty()) return fromList(ingots, amount); } + //Solely for recipe handling, to make the code more compact if(o instanceof ItemStack){ - return (ItemStack) o; + ItemStack stack = (ItemStack) o; + stack.stackSize = amount; + return stack; } return new ItemStack(ModItems.nothing); }