Merge upstream and probably introduce a zillion errors

This commit is contained in:
Vincent Lee committed 2015-12-14 16:38:07 -06:00
commit 5211ed9149
164 files changed
+5198 -2141

No files matched your search

@@ -78,6 +78,12 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
return p_149692_1_ & 7;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon func_149888_a(boolean top, int index) {
return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[index & 7];
}
@Override
public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) {
p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_);