diff options
5 files changed, 113 insertions, 125 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java index a488cd5838..5b9ab0bc40 100644 --- a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java @@ -2,7 +2,6 @@ package gtPlusPlus.core.handler; import cpw.mods.fml.common.IFuelHandler; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.Item; @@ -20,13 +19,13 @@ public class BurnableFuelHandler implements IFuelHandler{ int burnID = Item.getIdFromItem(temp.getValue().getItem()); //Utils.LOG_INFO("[Fuel Handler] ["+(aStackID == burnID)+"] Trying to look for a burnvalue for "+aStack.getDisplayName()+" | "+Modid+" | aStackID="+aStackID+" | burnID="+burnID); if (aStackID == burnID){ - Utils.LOG_INFO("[Fuel Handler] match found!"); + //Utils.LOG_INFO("[Fuel Handler] match found!"); int burn = temp.getKey(); ItemStack fuel = temp.getValue(); ItemStack testItem = ItemUtils.getSimpleStack(fuel, aStack.stackSize); if (aStack.isItemEqual(testItem)){ - Utils.LOG_INFO("[Fuel Handler] Found "+fuel.getDisplayName()+" with a burntime of "+burn); + //Utils.LOG_INFO("[Fuel Handler] Found "+fuel.getDisplayName()+" with a burntime of "+burn); return burn; } } diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java index 6e5b1bd976..66d542ef7c 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -15,10 +15,10 @@ public class CoalTar { //Create Coal Gas FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null); - - - - + + + + //Ethanol // v - Dehydrate cells to remove water //Create Ethylene @@ -75,7 +75,7 @@ public class CoalTar { FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null); createRecipes(); - + } @@ -83,7 +83,7 @@ public class CoalTar { recipeCreateEthylene(); recipeCreatebenzene(); recipeCreateEthylbenzene(); - + recipeCoalToCoalTar(); } @@ -97,7 +97,7 @@ public class CoalTar { }, 120*20, 80); - + CORE.RA.addDehydratorRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), FluidUtils.getFluidStack("bioethanol", 2000), @@ -119,65 +119,36 @@ public class CoalTar { public static void recipeCoalToCoalTar(){ - //Pyrolyse - //Lignite Coal - AddGregtechRecipe.PyrolyseOven( - 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 - AddGregtechRecipe.PyrolyseOven( - 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 - AddGregtechRecipe.PyrolyseOven( - 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("fluid.coaltar", 800), //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output - 150*10, //Time in ticks - 120); //EU - - //Create Coal Tar From Coal - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), //Input 1 - GT_Values.NI, //Input 2 - GT_Values.NF, //Fluid Input - FluidUtils.getFluidStack("fluid.coaltar", 2200), //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), //Item Output - 120*10, //Time in ticks - 240); //EU - - //Create Coal Tar From Coal - CORE.RA.addCokeOvenRecipe( - ItemUtils.getItemStack("Railcraft:fuel.coke", 16), //Input 1 - GT_Values.NI, //Input 2 - GT_Values.NF, //Fluid Input - FluidUtils.getFluidStack("fluid.coaltar", 3400), //Fluid Output - ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), //Item Output - 120*10, //Time in ticks - 360); //EU + //Lignite + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lignite, 16L), + 8, + GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), + FluidUtils.getFluidStack("fluid.coaltar", 800), + 90, + 60); + + //Coal + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + 8, + GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallDarkAsh", 2), + FluidUtils.getFluidStack("fluid.coaltar", 2200), + 60, + 120); + + //Coke + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 8), + 8, + GT_Values.NF, + ItemUtils.getItemStackOfAmountFromOreDict("dustSmallAsh", 3), + FluidUtils.getFluidStack("fluid.coaltar", 3400), + 30, + 240); + } diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 50f7f3cda3..86b4727a8e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -11,6 +11,7 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.fluid.FluidUtils; import gtPlusPlus.core.util.item.ItemUtils; +import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -48,58 +49,38 @@ public class RECIPES_GREGTECH { private static void cokeOvenRecipes(){ Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven."); - try { + //Wood to Charcoal + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 20L), + 20, + GT_ModHandler.getSteam(1000), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), + FluidUtils.getFluidStack("fluid.coalgas", 1440), + 60, + 30); - //GT Logs to Charcoal Recipe - //With Sulfuric Acid - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 5L), //Input 1 - ItemUtils.getGregtechCircuit(4), //Input 2 - Materials.SulfuricAcid.getFluid(20L), //Fluid Input - Materials.Creosote.getFluid(175L), //Fluid Output - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 8L), //Item Output - 800, //Time in ticks - 30); //EU - }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { + //Coal to Coke + AddGregtechRecipe.addCokeAndPyrolyseRecipes( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L), + 22, + GT_ModHandler.getSteam(1000), + ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 14), + FluidUtils.getFluidStack("fluid.coalgas", 2880), + 30, + 120); + + //Coke & Coal + CORE.RA.addCokeOvenRecipe( + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L), + ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 8), + GT_ModHandler.getSteam(1000), + FluidUtils.getFluidStack("fluid.coalgas", 4320), + ItemUtils.getItemStackOfAmountFromOreDict("gemCoalCoke", 14), + 60*20, + 240); - //Coal -> Coke Recipe - //With Sulfuric Acid - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 2L), //Input 1 - ItemUtils.getGregtechCircuit(5), //Input 2 - Materials.SulfuricAcid.getFluid(60L), //Fluid Input - Materials.Creosote.getFluid(250L), //Fluid Output - ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 2), //Item Output - 600, //Time in ticks - 120); //EU - }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { - //GT Logs to Charcoal Recipe - //Without Sulfuric Acid - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.log, Materials.Wood, 20L), //Input 1 - ItemUtils.getGregtechCircuit(2), //Input 2 - FluidUtils.getFluidStack("oxygen", 1000), //Fluid Input - FluidUtils.getFluidStack("fluid.coalgas", 1440), //Fluid Output - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L), //Item Output - 1200, //Time in ticks - 30); //EU - }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} - try { - //Coal -> Coke Recipe - //Make Coal Gas - CORE.RA.addCokeOvenRecipe( - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 10L), //Input 1 - ItemUtils.getGregtechCircuit(3), //Input 2 - GT_ModHandler.getSteam(1000), //Fluid Input - FluidUtils.getFluidStack("fluid.coalgas", 1440), //Fluid Output - ItemUtils.getSimpleStack(ModItems.itemCoalCoke, 10), //Item Output - 900, //Time in ticks - 120); //EU - }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} } private static void matterFabRecipes(){ @@ -488,7 +469,7 @@ public class RECIPES_GREGTECH { GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0])); } - + private static void fluidExtractorRecipes(){ GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(Items.ender_pearl), null, FluidUtils.getFluidStack("ender", 250), 10000, 100, 30); } @@ -539,7 +520,7 @@ public class RECIPES_GREGTECH { GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 144*5), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*5), null, 3000, 500); //GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000); GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", 30), 1200, 60); - } + } private static void chemicalReactorRecipes(){ GT_Values.RA.addChemicalRecipe( @@ -615,7 +596,7 @@ public class RECIPES_GREGTECH { 120*20, 30); } - + private static void compressorRecipes(){ GT_ModHandler.addCompressionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSmallClay", 4), ItemUtils.getItemStackOfAmountFromOreDict("plateClay", 1)); } diff --git a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java index 98dfbf1f96..ee9f8813f0 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java +++ b/src/Java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java @@ -5,10 +5,46 @@ import java.lang.reflect.Method; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.internal.IGT_RecipeAdder; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.item.ItemUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public final class AddGregtechRecipe { + + public static boolean addCokeAndPyrolyseRecipes( + ItemStack input1, int circuitNumber, + FluidStack inputFluid1, + ItemStack output1, + FluidStack outputFluid1, + int timeInSeconds, + int euTick + ){ + //Seconds Conversion + int TIME = timeInSeconds*20; + CORE.RA.addCokeOvenRecipe( + input1, + ItemUtils.getGregtechCircuit(circuitNumber), + inputFluid1, + outputFluid1, + output1, + TIME, + euTick); + PyrolyseOven( + input1, + inputFluid1, + circuitNumber, + output1, + outputFluid1, + TIME, + euTick); + + + return false; + } + + + public static boolean PyrolyseOven(final ItemStack p0, final FluidStack p1, final int p2, final ItemStack p3, final FluidStack p4, final int p5, final int p6){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java index 622b5d4b34..12e7bb9bfc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java @@ -23,7 +23,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { //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"); + Utils.LOG_INFO("Something was null, returning false"); return false; } @@ -32,7 +32,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { //RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, 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"); + Utils.LOG_INFO("Something was null, returning false"); return false; } @@ -41,7 +41,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { //RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); 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"); + Utils.LOG_INFO("Something was null, returning false"); return false; } @@ -57,16 +57,17 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder { 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); } - //RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); + RECIPEHANDLER_CokeOven.debug5(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); return true; } catch (final NullPointerException e){ + Utils.LOG_INFO("Something was null, returning false"); return false; } } catch (final Throwable e){ 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("Failed."); + Utils.LOG_INFO("Failed."); e.getStackTrace(); return false; } |