aboutsummaryrefslogtreecommitdiff
path: root/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-05-15 13:07:19 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-05-15 13:07:19 +1000
commit83abafec38764fd6f562ce5320fc446ddaad6ff6 (patch)
tree742e274310177bfc56ad7f76145b2227a50bfa66 /src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
parent6d4c465858fe1a199628de86edff1152f97faa52 (diff)
downloadGT5-Unofficial-83abafec38764fd6f562ce5320fc446ddaad6ff6.tar.gz
GT5-Unofficial-83abafec38764fd6f562ce5320fc446ddaad6ff6.tar.bz2
GT5-Unofficial-83abafec38764fd6f562ce5320fc446ddaad6ff6.zip
Should be loading recipes, but getting nullpoints on #20 of RECIPES_GREGTECH.java
Diffstat (limited to 'src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java')
-rw-r--r--src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java b/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
index 6b4b4c7122..e81080aaa2 100644
--- a/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
+++ b/src/Java/miscutil/gregtech/common/GregtechRecipeAdder.java
@@ -1,7 +1,6 @@
package miscutil.gregtech.common;
import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Recipe;
import miscutil.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
import miscutil.gregtech.api.util.GregtechRecipe;
import net.minecraft.item.ItemStack;
@@ -9,26 +8,27 @@ import net.minecraftforge.fluids.FluidStack;
public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
- @Override
+ /*@Override
public boolean addCokeOvenRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
- /*if (bInput1 == null || aOutput1 == null || bOutput1 == null || aDuration < 1 || aEUt < 1) {
+ if (bInput1 == null || aOutput1 == null || bOutput1 == null || aDuration < 1 || aEUt < 1) {
return false;
- }*/
+ }
GregtechRecipe.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(aOptimize, aInputs, aOutputs, aSpecial, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
return true;
- }
+ }*/
- public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration) {
+ @Override
+ public boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt) {
if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aFluidOutput == null))) {
return false;
}
- if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aOutput, aDuration)) <= 0)) {
+ if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) {
return false;
}
- if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
+ if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
return false;
}
- GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, 30, 0);
+ GregtechRecipe.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
return true;
}
}