Fixes a handfull of recipe issues in FTB Beyond, closes #1021
(cherry picked from commit eef08aa)
This commit is contained in:
parent
4e47e2102e
commit
ae5b07d6bb
3 changed files with 23 additions and 20 deletions
|
@ -32,7 +32,7 @@ public class CentrifugeRecipe extends BaseRecipe {
|
||||||
|
|
||||||
boolean useOreDic = false;
|
boolean useOreDic = false;
|
||||||
|
|
||||||
public CentrifugeRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
public CentrifugeRecipe(Object input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||||
ItemStack output4, int tickTime, int euPerTick) {
|
ItemStack output4, int tickTime, int euPerTick) {
|
||||||
super(Reference.centrifugeRecipe, tickTime, euPerTick);
|
super(Reference.centrifugeRecipe, tickTime, euPerTick);
|
||||||
if (input1 != null)
|
if (input1 != null)
|
||||||
|
@ -49,7 +49,7 @@ public class CentrifugeRecipe extends BaseRecipe {
|
||||||
addOutput(output4);
|
addOutput(output4);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CentrifugeRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
public CentrifugeRecipe(Object input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||||
ItemStack output4, int tickTime, int euPerTick, boolean useOreDic) {
|
ItemStack output4, int tickTime, int euPerTick, boolean useOreDic) {
|
||||||
this(input1, input2, output1, output2, output3, output4, tickTime, euPerTick);
|
this(input1, input2, output1, output2, output3, output4, tickTime, euPerTick);
|
||||||
this.useOreDic = useOreDic;
|
this.useOreDic = useOreDic;
|
||||||
|
|
|
@ -327,11 +327,12 @@ public class ModRecipes {
|
||||||
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
|
ItemParts.getPartByName("NaKCoolantSimple"), 'W',
|
||||||
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
|
IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
|
||||||
"circuitBasic");
|
"circuitBasic");
|
||||||
}
|
|
||||||
|
|
||||||
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G',
|
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("transformer"), "GGG", "WTW", "GCG", 'G',
|
||||||
"blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C',
|
"blockGlass", 'W', IC2Duplicates.CABLE_IGOLD.getStackBasedOnConfig(), 'C',
|
||||||
"circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig());
|
"circuitBasic", 'T', IC2Duplicates.MVT.getStackBasedOnConfig());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P',
|
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P',
|
||||||
"plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
|
"plankWood", 'W', IC2Duplicates.CABLE_ICOPPER.getStackBasedOnConfig(), 'C',
|
||||||
|
@ -361,7 +362,7 @@ public class ModRecipes {
|
||||||
|
|
||||||
CraftingHelper
|
CraftingHelper
|
||||||
.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "ADA", "DID", "ADA", 'I', "ingotIridium",
|
.addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "ADA", "DID", "ADA", 'I', "ingotIridium",
|
||||||
'A', ItemParts.getPartByName("advancedCircuit"), 'D', ItemParts.getPartByName("dataStorageCircuit"));
|
'A', "circuitAdvanced", 'D', ItemParts.getPartByName("dataStorageCircuit"));
|
||||||
|
|
||||||
CraftingHelper
|
CraftingHelper
|
||||||
.addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DSD", "DDD",
|
.addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DSD", "DDD",
|
||||||
|
|
|
@ -102,7 +102,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
register(getMaterial("red_garnet", 16, Type.DUST), 3000, getMaterial("pyrope", 3, Type.DUST), getMaterial("almandine", 5, Type.DUST), getMaterial("spessartine", 8, Type.DUST));
|
register(getMaterial("red_garnet", 16, Type.DUST), 3000, getMaterial("pyrope", 3, Type.DUST), getMaterial("almandine", 5, Type.DUST), getMaterial("spessartine", 8, Type.DUST));
|
||||||
register(getMaterial("yellow_garnet", 16, Type.DUST), 3500, getMaterial("andradite", 5, Type.DUST), getMaterial("grossular", 8, Type.DUST), getMaterial("uvarovite", 3, Type.DUST));
|
register(getMaterial("yellow_garnet", 16, Type.DUST), 3500, getMaterial("andradite", 5, Type.DUST), getMaterial("grossular", 8, Type.DUST), getMaterial("uvarovite", 3, Type.DUST));
|
||||||
register(getMaterial("dark_ashes", 2, Type.DUST), 240, getMaterial("ashes", 2, Type.DUST));
|
register(getMaterial("dark_ashes", 2, Type.DUST), 240, getMaterial("ashes", 2, Type.DUST));
|
||||||
register(getMaterial("marble", 8, Type.DUST), 1040, getMaterial("magnesium", Type.DUST), getMaterial("calcite", 7, Type.DUST));
|
register("dustMarble", 1040, getMaterial("magnesium", Type.DUST), getMaterial("calcite", 7, Type.DUST));
|
||||||
register(getMaterial("basalt", 16, Type.DUST), 2040, getMaterial("peridot", Type.DUST), getMaterial("calcite", 3, Type.DUST), getMaterial("flint", 8, Type.DUST), getMaterial("dark_ashes", 4, Type.DUST));
|
register(getMaterial("basalt", 16, Type.DUST), 2040, getMaterial("peridot", Type.DUST), getMaterial("calcite", 3, Type.DUST), getMaterial("flint", 8, Type.DUST), getMaterial("dark_ashes", 4, Type.DUST));
|
||||||
register(getMaterial("hydrogen", 4, Type.CELL), 3000, getMaterial("deuterium", Type.CELL));
|
register(getMaterial("hydrogen", 4, Type.CELL), 3000, getMaterial("deuterium", Type.CELL));
|
||||||
register(getMaterial("deuterium", 4, Type.CELL), 3000, getMaterial("tritium", Type.CELL));
|
register(getMaterial("deuterium", 4, Type.CELL), 3000, getMaterial("tritium", Type.CELL));
|
||||||
|
@ -111,7 +111,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
register(getMaterial("sulfur", Type.CELL), 40, getMaterial("sulfur", Type.DUST));
|
register(getMaterial("sulfur", Type.CELL), 40, getMaterial("sulfur", Type.DUST));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void register(ItemStack input, int ticks, boolean oreDict, ItemStack... outputs) {
|
static void register(Object input, int ticks, boolean oreDict, ItemStack... outputs) {
|
||||||
ItemStack output1;
|
ItemStack output1;
|
||||||
ItemStack output2 = null;
|
ItemStack output2 = null;
|
||||||
ItemStack output3 = null;
|
ItemStack output3 = null;
|
||||||
|
@ -143,8 +143,9 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.getItem() instanceof DynamicCell) {
|
if(input instanceof ItemStack){
|
||||||
int inputCount = input.getCount();
|
if (((ItemStack) input).getItem() instanceof DynamicCell) {
|
||||||
|
int inputCount = ((ItemStack) input).stackSize;
|
||||||
if (cellCount < inputCount) {
|
if (cellCount < inputCount) {
|
||||||
if (output2 == null) {
|
if (output2 == null) {
|
||||||
output2 = DynamicCell.getEmptyCell(inputCount - cellCount);
|
output2 = DynamicCell.getEmptyCell(inputCount - cellCount);
|
||||||
|
@ -157,6 +158,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
cellCount -= inputCount;
|
cellCount -= inputCount;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (cellCount < 0) {
|
if (cellCount < 0) {
|
||||||
cellCount = 0;
|
cellCount = 0;
|
||||||
|
@ -171,7 +173,7 @@ public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
RecipeHandler.addRecipe(new CentrifugeRecipe(input, cells, output1, output2, output3, output4, ticks, 5, oreDict));
|
RecipeHandler.addRecipe(new CentrifugeRecipe(input, cells, output1, output2, output3, output4, ticks, 5, oreDict));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void register(ItemStack input, int ticks, ItemStack... outputs) {
|
static void register(Object input, int ticks, ItemStack... outputs) {
|
||||||
register(input, ticks, true, outputs);
|
register(input, ticks, true, outputs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue