diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_PostLoad.java | 102 |
1 files changed, 60 insertions, 42 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index b17653129a..3e2a074148 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -5,7 +5,10 @@ import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.GalaxySpace; +import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct; import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; @@ -117,48 +120,63 @@ public class GT_PostLoad { for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry .getRegisteredFluidContainerData()) { if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) { - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( - true, - new ItemStack[] { iLData0 }, - new ItemStack[] { iSData0 }, - null, - new FluidStack[] { Materials.Water.getFluid(250L) }, - null, - 4, - 1, - 0); - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( - true, - new ItemStack[] { iSData0 }, - new ItemStack[] { iLData0 }, - null, - null, - null, - 4, - 1, - 0); - } else { - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( - true, - new ItemStack[] { tData.emptyContainer }, - new ItemStack[] { tData.filledContainer }, - null, - new FluidStack[] { tData.fluid }, - null, - tData.fluid.amount / 62, - 1, - 0); - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe( - true, - new ItemStack[] { tData.filledContainer }, - new ItemStack[] { GT_Utility.getContainerItem(tData.filledContainer, true) }, - null, - null, - new FluidStack[] { tData.fluid }, - tData.fluid.amount / 62, - 1, - 0); - } + GT_Values.RA.stdBuilder() + .itemInputs(iLData0) + .itemOutputs(iSData0) + .fluidInputs(Materials.Water.getFluid(250L)) + .duration(4 * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(iSData0) + .itemOutputs(iLData0) + .duration(4 * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + } else if (IguanaTweaksTinkerConstruct.isModLoaded() && tData.emptyContainer.isItemEqual( + Objects.requireNonNull( + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0)))) { + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0)) + .itemOutputs(tData.filledContainer) + .fluidInputs(tData.fluid) + .duration((tData.fluid.amount / 62) * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tData.filledContainer) + .itemOutputs( + GT_ModHandler.getModItem(IguanaTweaksTinkerConstruct.ID, "clayBucketFired", 1L, 0)) + .fluidOutputs(tData.fluid) + .duration((tData.fluid.amount / 62) * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + } else { + GT_Values.RA.stdBuilder() + .itemInputs(tData.emptyContainer) + .itemOutputs(tData.filledContainer) + .fluidInputs(tData.fluid) + .duration((tData.fluid.amount / 62) * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + if (GT_Utility.getContainerItem(tData.filledContainer, true) == null) { + GT_Values.RA.stdBuilder() + .itemInputs(tData.filledContainer) + .fluidOutputs(tData.fluid) + .duration((tData.fluid.amount / 62) * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + } else { + GT_Values.RA.stdBuilder() + .itemInputs(tData.filledContainer) + .itemOutputs(GT_Utility.getContainerItem(tData.filledContainer, true)) + .fluidOutputs(tData.fluid) + .duration((tData.fluid.amount / 62) * TICKS) + .eut(1) + .addTo(sFluidCannerRecipes); + } + } } } |