Allow using ore dict entries in CraftTweaker Closes #1396
This commit is contained in:
parent
d948db1b7f
commit
3b914e658c
26 changed files with 38 additions and 38 deletions
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class AlloySmelterRecipe extends BaseRecipe {
|
||||
|
||||
public AlloySmelterRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
public AlloySmelterRecipe(Object input1, Object input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
super(Reference.ALLOY_SMELTER_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
addInput(input1);
|
||||
|
|
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class AssemblingMachineRecipe extends BaseRecipe {
|
||||
|
||||
public AssemblingMachineRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
public AssemblingMachineRecipe(Object input1, Object input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
super(Reference.ASSEMBLING_MACHINE_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
addInput(input1);
|
||||
|
|
|
@ -32,7 +32,7 @@ public class BlastFurnaceRecipe extends BaseRecipe {
|
|||
|
||||
public int neededHeat;
|
||||
|
||||
public BlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tickTime,
|
||||
public BlastFurnaceRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2, int tickTime,
|
||||
int euPerTick, int neededHeat) {
|
||||
super(Reference.BLAST_FURNACE_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
|
|
|
@ -32,7 +32,7 @@ public class CentrifugeRecipe extends BaseRecipe {
|
|||
|
||||
boolean useOreDic = false;
|
||||
|
||||
public CentrifugeRecipe(Object input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||
public CentrifugeRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||
ItemStack output4, int tickTime, int euPerTick) {
|
||||
super(Reference.CENTRIFUGE_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
|
@ -49,7 +49,7 @@ public class CentrifugeRecipe extends BaseRecipe {
|
|||
addOutput(output4);
|
||||
}
|
||||
|
||||
public CentrifugeRecipe(Object input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||
public CentrifugeRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2, ItemStack output3,
|
||||
ItemStack output4, int tickTime, int euPerTick, boolean useOreDic) {
|
||||
this(input1, input2, output1, output2, output3, output4, tickTime, euPerTick);
|
||||
this.useOreDic = useOreDic;
|
||||
|
|
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class ChemicalReactorRecipe extends BaseRecipe {
|
||||
|
||||
public ChemicalReactorRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
public ChemicalReactorRecipe(Object input1, Object input2, ItemStack output1, int tickTime, int euPerTick) {
|
||||
super(Reference.CHEMICAL_REACTOR_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
addInput(input1);
|
||||
|
|
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class CompressorRecipe extends BaseRecipe {
|
||||
|
||||
public CompressorRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
|
||||
public CompressorRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick) {
|
||||
super(Reference.COMPRESSOR_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
addInput(input1);
|
||||
|
|
|
@ -46,7 +46,7 @@ public class DistillationTowerRecipe extends BaseRecipe {
|
|||
* @param tickTime Number of ticks for recipe to complete
|
||||
* @param euPerTick Amount of EU consumed per tick
|
||||
*/
|
||||
public DistillationTowerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2,
|
||||
public DistillationTowerRecipe(Object inputCells, Object input2, ItemStack output1, ItemStack output2,
|
||||
ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
|
||||
super(Reference.DISTILLATION_TOWER_RECIPE, tickTime, euPerTick);
|
||||
if (inputCells != null)
|
||||
|
@ -63,7 +63,7 @@ public class DistillationTowerRecipe extends BaseRecipe {
|
|||
addOutput(output4);
|
||||
}
|
||||
|
||||
public DistillationTowerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2,
|
||||
public DistillationTowerRecipe(Object inputCells, Object input2, ItemStack output1, ItemStack output2,
|
||||
ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean oreDict) {
|
||||
this(inputCells, input2, output1, output2, output3, output4, tickTime, euPerTick);
|
||||
this.useOreDictionary = oreDict;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class GrinderRecipe extends BaseRecipe {
|
|||
|
||||
public boolean useOreDict = true;
|
||||
|
||||
public GrinderRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
|
||||
public GrinderRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick) {
|
||||
super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
|
||||
if (input1 != null)
|
||||
addInput(input1);
|
||||
|
@ -40,7 +40,7 @@ public class GrinderRecipe extends BaseRecipe {
|
|||
addOutput(output1);
|
||||
}
|
||||
|
||||
public GrinderRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick, boolean useOreDict) {
|
||||
public GrinderRecipe(Object input1, ItemStack output1, int tickTime, int euPerTick, boolean useOreDict) {
|
||||
super(Reference.GRINDER_RECIPE, tickTime, euPerTick / 10); //Done to buff energy usage to be more in line with ic2
|
||||
this.useOreDict = useOreDict;
|
||||
if (input1 != null)
|
||||
|
|
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class ImplosionCompressorRecipe extends BaseRecipe {
|
||||
|
||||
public ImplosionCompressorRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2,
|
||||
public ImplosionCompressorRecipe(Object input1, Object input2, ItemStack output1, ItemStack output2,
|
||||
int tickTime, int euPerTick) {
|
||||
super(Reference.IMPLOSION_COMPRESSOR_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
|
|
|
@ -32,7 +32,7 @@ public class IndustrialElectrolyzerRecipe extends BaseRecipe {
|
|||
|
||||
private boolean useOreDictionary = true;
|
||||
|
||||
public IndustrialElectrolyzerRecipe(ItemStack inputCells, ItemStack input2, ItemStack output1, ItemStack output2,
|
||||
public IndustrialElectrolyzerRecipe(Object inputCells, Object input2, ItemStack output1, ItemStack output2,
|
||||
ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
|
||||
super(Reference.INDUSTRIAL_ELECTROLYZER_RECIPE, tickTime, euPerTick);
|
||||
if (inputCells != null)
|
||||
|
|
|
@ -34,7 +34,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
|
|||
public FluidStack fluidStack;
|
||||
boolean useOreDic = true;
|
||||
|
||||
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
|
||||
public IndustrialGrinderRecipe(Object input1, FluidStack fluidStack, ItemStack output1,
|
||||
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) {
|
||||
super(Reference.INDUSTRIAL_GRINDER_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
|
@ -50,7 +50,7 @@ public class IndustrialGrinderRecipe extends BaseRecipe {
|
|||
this.fluidStack = fluidStack;
|
||||
}
|
||||
|
||||
public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
|
||||
public IndustrialGrinderRecipe(Object input1, FluidStack fluidStack, ItemStack output1,
|
||||
ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean useOreDict) {
|
||||
this(input1, fluidStack, output1, output2, output3, output4, tickTime, euPerTick);
|
||||
this.useOreDic = useOreDict;
|
||||
|
|
|
@ -48,7 +48,7 @@ public class IndustrialSawmillRecipe extends BaseRecipe {
|
|||
this.fluidStack = fluidStack;
|
||||
}
|
||||
|
||||
public IndustrialSawmillRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1,
|
||||
public IndustrialSawmillRecipe(Object input1, FluidStack fluidStack, ItemStack output1,
|
||||
ItemStack output2, ItemStack output3, int tickTime, int euPerTick, boolean canUseOreDict) {
|
||||
super(Reference.INDUSTRIAL_SAWMILL_RECIPE, tickTime, euPerTick);
|
||||
if (input1 != null)
|
||||
|
|
|
@ -30,7 +30,7 @@ import techreborn.api.recipe.BaseRecipe;
|
|||
|
||||
public class VacuumFreezerRecipe extends BaseRecipe {
|
||||
|
||||
public VacuumFreezerRecipe(ItemStack input, ItemStack output, int tickTime, int euPerTick) {
|
||||
public VacuumFreezerRecipe(Object input, ItemStack output, int tickTime, int euPerTick) {
|
||||
super(Reference.VACUUM_FREEZER_RECIPE, tickTime, euPerTick);
|
||||
if (input != null)
|
||||
addInput(input);
|
||||
|
|
|
@ -42,8 +42,8 @@ public class CTAlloySmelter extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
AlloySmelterRecipe r = new AlloySmelterRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTAssemblingMachine extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
AssemblingMachineRecipe r = new AssemblingMachineRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTBlastFurnace extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int ticktime, int euTick, int neededHeat) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
BlastFurnaceRecipe r = new BlastFurnaceRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), ticktime, euTick, neededHeat);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTCentrifuge extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
CentrifugeRecipe r = new CentrifugeRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTChemicalReactor extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
ChemicalReactorRecipe r = new ChemicalReactorRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ public class CTCompressor extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IIngredient input1, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
CompressorRecipe r = new CompressorRecipe(oInput1, CraftTweakerCompat.toStack(output1), ticktime, euTick);
|
||||
addRecipe(r);
|
||||
}
|
||||
|
|
|
@ -42,8 +42,8 @@ public class CTDistillationTower extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
DistillationTowerRecipe r = new DistillationTowerRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ public class CTGrinder extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output, IIngredient input1, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
|
||||
GrinderRecipe r = new GrinderRecipe(oInput1, CraftTweakerCompat.toStack(output), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTImplosionCompressor extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
ImplosionCompressorRecipe r = new ImplosionCompressorRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@ public class CTIndustrialElectrolyzer extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient cells, IIngredient input2, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(cells);
|
||||
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(cells);
|
||||
Object oInput2 = CraftTweakerCompat.toObject(input2);
|
||||
|
||||
IndustrialElectrolyzerRecipe r = new IndustrialElectrolyzerRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ public class CTIndustrialGrinder extends CTGeneric {
|
|||
*/
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, ILiquidStack fluid, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
|
||||
// There is only one input slot in Industrial Grinder
|
||||
//ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
|
||||
|
|
|
@ -55,7 +55,7 @@ public class CTIndustrialSawmill extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IIngredient input1, ILiquidStack fluid, int ticktime, int euTick, boolean useOreDic) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input1);
|
||||
|
||||
FluidStack fluidStack = null;
|
||||
if (fluid != null) {
|
||||
|
|
|
@ -38,7 +38,7 @@ public class CTVacuumFreezer extends CTGeneric {
|
|||
|
||||
@ZenMethod
|
||||
public static void addRecipe(IItemStack output, IIngredient input, int ticktime, int euTick) {
|
||||
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input);
|
||||
Object oInput1 = CraftTweakerCompat.toObject(input);
|
||||
|
||||
VacuumFreezerRecipe r = new VacuumFreezerRecipe(oInput1, CraftTweakerCompat.toStack(output), ticktime, euTick);
|
||||
addRecipe(r);
|
||||
|
|
Loading…
Reference in a new issue