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

Merge pull request #3181 from smbarbour/7.1.x

Browse source 
Add support for nether wart harvesting
This commit is contained in:
Adrian Siekierka 2016-01-10 08:59:49 +01:00
commit ff48e13d87
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/buildcraft/core/crops/CropHandlerPlantable.java
View file

@ -7,6 +7,7 @@ import net.minecraft.block.BlockCrops;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.BlockMelon;
import net.minecraft.block.BlockMushroom;
import net.minecraft.block.BlockNetherWart;
import net.minecraft.block.BlockTallGrass;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@ -72,6 +73,8 @@ public class CropHandlerPlantable implements ICropHandler {
return true;
} else if (block instanceof BlockCrops) {
return meta == 7;
} else if (block instanceof BlockNetherWart) {
return meta == 3;
} else if (block instanceof IPlantable) {
if (y > 0 && blockAccess.getBlock(x, y - 1, z) == block) {
return true;

2
common/buildcraft/factory/render/RenderTank.java
View file

@ -36,7 +36,7 @@ public class RenderTank extends TileEntitySpecialRenderer {
// Workaround: The colorRenderCache from the server tile from getServerTile(...) does not get synced properly
int color;
if(tank.getWorldObj().isRemote) {
if (tank.getWorldObj().isRemote) {
color = tank.tank.colorRenderCache;
} else {
color = liquid.getFluid().getColor(liquid);

4
common/buildcraft/transport/render/PipeTransportFluidsRenderer.java
View file

@ -184,7 +184,9 @@ public class PipeTransportFluidsRenderer extends PipeTransportRenderer<PipeTrans
return;
}
if(pipe.container == null) return;
if (pipe.container == null) {
return;
}
GL11.glPushMatrix();
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);