diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 19:41:28 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 19:41:28 +1000 |
| commit | 1a4337307986ff30a0ce6a28f0a32b3fe3796ad2 (patch) | |
| tree | bc460470dc759ecfa726ec124b65a7b3d0d6ecf4 /src/Java/gtPlusPlus | |
| parent | f036dc6d7398053945e1c9b6e2c55d1dbd614743 (diff) | |
| download | GT5-Unofficial-1a4337307986ff30a0ce6a28f0a32b3fe3796ad2.tar.gz GT5-Unofficial-1a4337307986ff30a0ce6a28f0a32b3fe3796ad2.tar.bz2 GT5-Unofficial-1a4337307986ff30a0ce6a28f0a32b3fe3796ad2.zip | |
$ Fixed canning/extraction recipe generation not working correctly. Fixes #317.
Diffstat (limited to 'src/Java/gtPlusPlus')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index e803b29d1c..7bc0eacd4f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -37,7 +37,7 @@ public class RecipeGen_FluidCanning extends RecipeGen_Base { //Used to store Fluid extraction state if (this.disableOptional) { GT_Values.RA.addFluidExtractionRecipe( - recipe.mInputs.length == 1 ? recipe.mInputs[0] : null, //Input + recipe.mInputs.length >= 1 ? recipe.mInputs[0] : null, //Input recipe.mInputs.length == 2 ? recipe.mInputs[1] : null, //Input 2 recipe.mFluidOutputs.length == 1 ? recipe.mFluidOutputs[0] : null, //Fluid Output recipe.mSpecialValue, //Chance diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java index 3344833ca8..e3aaa1ae2f 100644 --- a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java +++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java @@ -11,7 +11,6 @@ import gregtech.api.util.GT_OreDictUnificator; import cofh.lib.util.helpers.ItemHelper; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; import net.minecraftforge.fluids.FluidRegistry; @@ -34,7 +33,7 @@ public class TF_Gregtech_Recipes { //Gelid Cryotheum Logger.INFO("Adding Recipes for Gelid Cryotheum"); - MaterialGenerator.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 144), 10000, 200, 240); + GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 144), 10000, 200, 240); GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 144), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L), GT_Values.NI, GT_Values.NI, null, 400, 30); //Blizz Powder @@ -48,7 +47,7 @@ public class TF_Gregtech_Recipes { //Blazing Pyrotheum Logger.INFO("Adding Recipes for Blazing Pyrotheum"); - MaterialGenerator.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240); + GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240); ItemStack dustCoal = ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 1); |