aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gregtech/api/util/Recipe_GT.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-12-31 18:45:41 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-12-31 18:45:41 +1000
commitdb83ad0447c2711c1a4cc3610cc6ebac5c91c1b4 (patch)
tree644c83683d73c361e8d392df5f9378a4bb2ace5d /src/Java/gregtech/api/util/Recipe_GT.java
parent59cdc42e440a8b6cd1e4519659a12030348a29db (diff)
downloadGT5-Unofficial-db83ad0447c2711c1a4cc3610cc6ebac5c91c1b4.tar.gz
GT5-Unofficial-db83ad0447c2711c1a4cc3610cc6ebac5c91c1b4.tar.bz2
GT5-Unofficial-db83ad0447c2711c1a4cc3610cc6ebac5c91c1b4.zip
+ Gave Fission Fuels their own NEI handler, which allows 9 input fluids.
% Moved Fission Fuel recipe map to it's own class, specially for the NEI handler. ^ Updated CodeChickenCore-1.7.10-1.0.6.44-dev.jar to CodeChickenCore-1.7.10-1.0.7.47-dev.jar. ^ Updated CodeChickenLib-1.7.10-1.1.3.136-dev.jar to CodeChickenLib-1.7.10-1.1.3.140-dev.jar. ^ Updated NotEnoughItems-1.7.10-1.0.4.107-dev.jar to NotEnoughItems-1.7.10-1.0.5.120-dev.jar.
Diffstat (limited to 'src/Java/gregtech/api/util/Recipe_GT.java')
-rw-r--r--src/Java/gregtech/api/util/Recipe_GT.java20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index c020b7eeb9..f0b80f084a 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -133,7 +133,7 @@ public class Recipe_GT extends GT_Recipe{
int aDuration, int aEUt) {
this(true, null, null, null, null, new FluidStack[]{aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}, new FluidStack[]{aOutput1, aOutput2}, Math.max(aDuration, 1), aEUt, 0);
if (mInputs.length > 1) {
- Gregtech_Recipe_Map.sFissionFuelProcessing.addRecipe(this);
+ CustomRecipeMap.sFissionFuelProcessing.addRecipe(this);
}
}
@@ -150,39 +150,47 @@ public class Recipe_GT extends GT_Recipe{
for (Gregtech_Recipe_Map tMapEntry : Gregtech_Recipe_Map.sMappings) tMapEntry.reInit();
}
+ @Override
public ItemStack getRepresentativeInput(int aIndex) {
if (aIndex < 0 || aIndex >= mInputs.length) return null;
return GT_Utility.copy(mInputs[aIndex]);
}
- public ItemStack getOutput(int aIndex) {
+ @Override
+ public ItemStack getOutput(int aIndex) {
if (aIndex < 0 || aIndex >= mOutputs.length) return null;
return GT_Utility.copy(mOutputs[aIndex]);
}
- public int getOutputChance(int aIndex) {
+ @Override
+ public int getOutputChance(int aIndex) {
if (aIndex < 0 || aIndex >= mChances.length) return 10000;
return mChances[aIndex];
}
- public FluidStack getRepresentativeFluidInput(int aIndex) {
+ @Override
+ public FluidStack getRepresentativeFluidInput(int aIndex) {
if (aIndex < 0 || aIndex >= mFluidInputs.length || mFluidInputs[aIndex] == null) return null;
return mFluidInputs[aIndex].copy();
}
- public FluidStack getFluidOutput(int aIndex) {
+ @Override
+ public FluidStack getFluidOutput(int aIndex) {
if (aIndex < 0 || aIndex >= mFluidOutputs.length || mFluidOutputs[aIndex] == null) return null;
return mFluidOutputs[aIndex].copy();
}
+ @Override
public GT_Recipe copy() {
return this.copy();
}
+ @Override
public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, FluidStack[] aFluidInputs, ItemStack... aInputs) {
return isRecipeInputEqual(aDecreaseStacksizeBySuccess, false, aFluidInputs, aInputs);
}
+ @Override
public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] aFluidInputs, ItemStack... aInputs) {
if (mFluidInputs.length > 0 && aFluidInputs == null) return false;
for (FluidStack tFluid : mFluidInputs)
@@ -253,7 +261,7 @@ public class Recipe_GT extends GT_Recipe{
//LFTR recipes
public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
//Fission Fuel Plant Recipes
- public static final GT_Recipe_Map sFissionFuelProcessing = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Fission Fuel Processing", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 9, 1, E, 1, E, true, true);
+ //public static final GT_Recipe_Map sFissionFuelProcessing = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.fissionfuel", "Fission Fuel Processing", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 9, 1, E, 1, E, true, true);
/**
* HashMap of Recipes based on their Items