aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java69
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java9
2 files changed, 43 insertions, 35 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 5cf4bc96d3..96edda9e66 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -17,14 +17,44 @@ public class CoalTar {
//Create Coal Tar
FluidUtils.generateFluidNonMolten("CoalTar", "Coal Tar", 450, new short[]{32, 32, 32, 100}, null, null);
+ //Pyrolyse
+ //Lignite Coal
+ GT_Values.RA.addPyrolyseRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
+ GT_Values.NF, //Fluid Input
+ 8,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+ FluidUtils.getFluidStack("fluid.coaltar", 800), //Fluid Output
+ 150*20,
+ 120);
+ //Coal
+ GT_Values.RA.addPyrolyseRecipe(
+ GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
+ GT_Values.NF, //Fluid Input
+ 8,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
+ FluidUtils.getFluidStack("fluid.coaltar", 2200), //Fluid Output
+ 120*20,
+ 240);
+ //Coal Coke
+ GT_Values.RA.addPyrolyseRecipe(
+ ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
+ GT_Values.NF, //Fluid Input
+ 8,
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
+ FluidUtils.getFluidStack("fluid.coaltar", 3400), //Fluid Output
+ 100*20,
+ 360);
+
+ //Coke Oven
//Create Coal Tar From Coal
CORE.RA.addCokeOvenRecipe(
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), //Input 1
GT_Values.NI, //Input 2
GT_Values.NF, //Fluid Input
- FluidUtils.getFluidStack("coaltar", 800), //Fluid Output
+ FluidUtils.getFluidStack("fluid.coaltar", 800), //Fluid Output
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
- 150*20, //Time in ticks
+ 150*10, //Time in ticks
120); //EU
//Create Coal Tar From Coal
@@ -32,9 +62,9 @@ public class CoalTar {
GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1
GT_Values.NI, //Input 2
GT_Values.NF, //Fluid Input
- FluidUtils.getFluidStack("coaltar", 2200), //Fluid Output
+ FluidUtils.getFluidStack("fluid.coaltar", 2200), //Fluid Output
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output
- 120*20, //Time in ticks
+ 120*10, //Time in ticks
240); //EU
//Create Coal Tar From Coal
@@ -42,36 +72,11 @@ public class CoalTar {
ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1
GT_Values.NI, //Input 2
GT_Values.NF, //Fluid Input
- FluidUtils.getFluidStack("coaltar", 3400), //Fluid Output
+ FluidUtils.getFluidStack("fluid.coaltar", 3400), //Fluid Output
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output
- 120*20, //Time in ticks
+ 120*10, //Time in ticks
360); //EU
-
-
- /*//Create Coal Tar From Coal
- GT_Values.RA.addBlastRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoal", 16),
- GT_Values.NI,
- GT_Values.NF,
- FluidUtils.getFluidStack("coaltar", 2200),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2),
- GT_Values.NI,
- 120*20,
- 240, //EU
- 2700); //Heat
-
- //Create Coal Tar From Coal
- GT_Values.RA.addBlastRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("gemCoke", 16),
- GT_Values.NI,
- GT_Values.NF,
- FluidUtils.getFluidStack("coaltar", 3400),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3),
- GT_Values.NI,
- 120*20,
- 360, //EU
- 3100); //Heat
-*/
+
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 993cd506ec..622b5d4b34 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -20,7 +20,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) {
try {
try {
- RECIPEHANDLER_CokeOven.debug1();
+ //RECIPEHANDLER_CokeOven.debug1();
if (((aInput1 == null) /*&& (aFluidInput == null)*/) || ((aOutput == null) || (aFluidOutput == null))) {
//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
Utils.LOG_WARNING("Something was null, returning false");
@@ -39,7 +39,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
} catch (final NullPointerException e){e.getStackTrace();}
try {
//RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
- if ((aFluidOutput == null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
+ if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
Utils.LOG_WARNING("Something was null, returning false");
return false;
@@ -48,9 +48,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
} catch (final NullPointerException e){e.getStackTrace();}
try {
//RECIPEHANDLER_CokeOven.debug4(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
- if (aFluidInput == null){
+ if (aFluidInput == null && aInput2 != null){
Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
}
+ else if (aFluidInput == null && aInput2 == null){
+ Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput}, null, null, null, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
+ }
else {
Recipe_GT.Gregtech_Recipe_Map.sCokeOvenRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
}
generated by cgit (git 2.46.0) at 2025-03-10 21:32:49 +0000