Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix compatibility with Artifice

Browse source
This commit is contained in:
asiekierka 2015-01-28 14:00:42 +01:00
parent 9c6a38eb6e
commit 173e068ed8
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/buildcraft/BuildCraftEnergy.java
View file

@ -266,8 +266,12 @@ public class BuildCraftEnergy extends BuildCraftMod {
} }
// BucketHandler ensures empty buckets fill with the correct liquid. // BucketHandler ensures empty buckets fill with the correct liquid.
BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil); if (blockOil != null) {
BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel); BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil);
}
if (blockFuel != null) {
BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel);
}
MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
BuildcraftRecipeRegistry.refinery.addRecipe("buildcraft:fuel", new FluidStack(fluidOil, 1), new FluidStack( BuildcraftRecipeRegistry.refinery.addRecipe("buildcraft:fuel", new FluidStack(fluidOil, 1), new FluidStack(
@ -369,9 +373,15 @@ public class BuildCraftEnergy extends BuildCraftMod {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void textureHook(TextureStitchEvent.Post event) { public void textureHook(TextureStitchEvent.Post event) {
if (event.map.getTextureType() == 0) { if (event.map.getTextureType() == 0) {
buildcraftFluidOil.setIcons(blockOil.getBlockTextureFromSide(1), blockOil.getBlockTextureFromSide(2)); if (buildcraftFluidOil != null) {
buildcraftFluidFuel.setIcons(blockFuel.getBlockTextureFromSide(1), blockFuel.getBlockTextureFromSide(2)); buildcraftFluidOil.setIcons(blockOil.getBlockTextureFromSide(1), blockOil.getBlockTextureFromSide(2));
buildcraftFluidRedPlasma.setIcons(blockRedPlasma.getBlockTextureFromSide(1), blockRedPlasma.getBlockTextureFromSide(2)); }
if (buildcraftFluidFuel != null) {
buildcraftFluidFuel.setIcons(blockFuel.getBlockTextureFromSide(1), blockFuel.getBlockTextureFromSide(2));
}
if (buildcraftFluidRedPlasma != null) {
buildcraftFluidRedPlasma.setIcons(blockRedPlasma.getBlockTextureFromSide(1), blockRedPlasma.getBlockTextureFromSide(2));
}
} }
} }