diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index c00cc8f64..5f984b3ce 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -58,7 +58,10 @@ public class FuelHandler public FuelGas(IFuel bcFuel) { burnTicks = bcFuel.getTotalBurningTime() / Fluid.BUCKET_VOLUME; - energyPerTick = bcFuel.getPowerPerCycle() / MjAPI.MJ; + + // getPowerPerCycle returns value in 1 BuildCraft micro MJ + // 1 BuildCraft MJ equals 20 RF + energyPerTick = bcFuel.getPowerPerCycle() / (double) MjAPI.MJ * 20 * general.FROM_RF; } } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 23fa9e84c..c1127992a 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -102,13 +102,13 @@ public class MekanismGenerators implements IModule { for(IFuel s : BuildcraftFuelRegistry.fuel.getFuels()) { - if(!(s.getFluid() == null || GasRegistry.containsGas(s.getFluid().getFluid().getName()))) + if(s.getFluid() != null && !GasRegistry.containsGas(s.getFluid().getFluid().getName())) { GasRegistry.register(new Gas(s.getFluid().getFluid())); } } - BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), 240 * MjAPI.MJ, 40 * Fluid.BUCKET_VOLUME); + BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (int)(240 * general.TO_RF / 20 * MjAPI.MJ), 40 * Fluid.BUCKET_VOLUME); } //Update the config-dependent recipes after the recipes have actually been added in the first place