diff options
author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-12-13 19:17:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-13 19:17:47 +0100 |
commit | 8e31958980db32e755bfd6c0428c97ec1e2e08d3 (patch) | |
tree | 2d45df2dbbae55ca08660467c07a3c0f0772cb8d /src/main/java/gregtech/loaders | |
parent | 423b3ad8efa2de64d24d4bca2d0c1be438a69d8c (diff) | |
parent | b1c2cbe93528fe38ac6ded6eb181fd776a015823 (diff) | |
download | GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.tar.gz GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.tar.bz2 GT5-Unofficial-8e31958980db32e755bfd6c0428c97ec1e2e08d3.zip |
Merge pull request #777 from Dimach/unstable
Fixed #767
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r-- | src/main/java/gregtech/loaders/load/GT_FuelLoader.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index ad6853baf0..a2504c7bfd 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -11,14 +11,9 @@ import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
-import ic2.core.Ic2Items;
-import ic2.core.item.ItemFluidCell;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
public class GT_FuelLoader
implements Runnable {
@@ -39,13 +34,7 @@ public class GT_FuelLoader GT_Values.RA.addFuel(new ItemStack(Items.ghast_tear, 1), null, 50, 5);
GT_Values.RA.addFuel(new ItemStack(Blocks.beacon, 1), null, Materials.NetherStar.mFuelPower * 2, Materials.NetherStar.mFuelType);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1), null, 250, 1);
- if(!GregTech_API.mIC2Classic){
- GT_Values.RA.addFuel(ItemFluidCell.getUniversalFluidCell(new FluidStack(ItemList.sRocketFuel,1000)), Ic2Items.FluidCell.copy(), 250, 1);
- }
if(GregTech_API.mMagneticraft){
- Fluid tFluid = FluidRegistry.getFluid("naturalgas");
- if(tFluid!=null)
- GT_Values.RA.addFuel(ItemFluidCell.getUniversalFluidCell(new FluidStack(tFluid,1000)), Ic2Items.FluidCell.copy(), 250, 1);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("Magneticraft", "item.bucket_light_oil", 1), null, 256, 0);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("Magneticraft", "item.bucket_heavy_oil", 1), null, 192, 3);
}
|