Merge pull request #4523 from thommy101/issue-4513

[1.11] Update BuildCraft API to maven dependency
This commit is contained in:
Aidan authored and GitHub committed 2017-07-22 20:32:49 -07:00
commit dbb86e344d
238 files changed
+17 -9315

No files matched your search

@@ -1,5 +1,6 @@
package mekanism.generators.common;
import buildcraft.api.mj.MjAPI;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
@@ -102,13 +103,13 @@ public class MekanismGenerators implements IModule
{
for(IFuel s : BuildcraftFuelRegistry.fuel.getFuels())
{
if(!(s.getFluid() == null || GasRegistry.containsGas(s.getFluid().getName())))
if(s.getFluid() != null && !GasRegistry.containsGas(s.getFluid().getFluid().getName()))
{
GasRegistry.register(new Gas(s.getFluid()));
GasRegistry.register(new Gas(s.getFluid().getFluid()));
}
}
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (int)(240 * general.TO_RF), 40 * Fluid.BUCKET_VOLUME);
BuildcraftFuelRegistry.fuel.addFuel(MekanismFluids.Ethene.getFluid(), (long)(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