From 26bd0dc2c5f68ff9402c428cce8b8936880ae7a4 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Fri, 26 Oct 2018 01:44:42 +0100 Subject: % More .08 Compatibility. --- src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java | 4 ++-- src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java | 5 +++-- src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java | 15 +++++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java index 1fb629976a..3da3c18836 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -136,7 +136,7 @@ public class CoalTar { private static void recipeEthylBenzineFuelsIntoHeavyFuel() { - GT_Values.RA.addChemicalRecipe( + CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellFuel", 9), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), null, @@ -144,7 +144,7 @@ public class CoalTar { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11), 100, CORE.GTNH ? 1000 : 500); - GT_Values.RA.addChemicalRecipe( + CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2), null, diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 4f2bf877f1..1d45dec183 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -5,6 +5,7 @@ import net.minecraft.init.Items; import gregtech.api.enums.GT_Values; import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -48,7 +49,7 @@ public class NuclearChem { } private static void chemReator_CreateMutagen() { - GT_Values.RA.addChemicalRecipe( + CORE.RA.addChemicalRecipe( CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(Items.nether_star, 2), FluidUtils.getMobEssence(5000), @@ -59,7 +60,7 @@ public class NuclearChem { } private static void chemReactor_MutagenWithEggs() { - GT_Values.RA.addChemicalRecipe( + CORE.RA.addChemicalRecipe( CI.getNumberedCircuit(20), ItemUtils.getSimpleStack(Items.egg, 2), FluidUtils.getFluidStack(GeneticMutagen, 500), diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 6b1a006098..7b5a90a64e 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -155,17 +155,20 @@ public class RocketFuels { FluidStack fuelA = FluidUtils.getFluidStack("diesel", 400); FluidStack fuelB = FluidUtils.getFluidStack("fuel", 400); if (fuelA != null){ - GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); + //GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); + GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); } - if (fuelA == null && fuelB != null){ - GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); + if (fuelA == null && fuelB != null){ + //GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); + GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); } } public static void createRP1(){ FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 100); if (fuelA != null){ - GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(RP1, 25), 400, 120, false); + //GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(RP1, 25), 400, 120, false); + GT_Values.RA.addDistilleryRecipe(CI.getNumberedCircuit(23), fuelA, FluidUtils.getFluidStack(RP1, 50), 400, 120, false); } } @@ -279,13 +282,13 @@ public class RocketFuels { } private static void createUnsymmetricalDimethylhydrazine() { - GT_Values.RA.addChemicalRecipe( + CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("cellHydrazine", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellFormaldehyde", 2), FluidUtils.getFluidStack("hydrogen", 4000), FluidUtils.getFluidStack(Unsymmetrical_Dimethylhydrazine, 1000), - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 2), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 20*60); } -- cgit